IRCloggy #git 2010-01-14

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2010-01-14

→ haypo joined00:00
← d2dchat left00:00
← cannonball left00:00
← Haarg left00:01
haypo hi. i would like to share my git-svn repository between two computers (linux boxes) in my LAN. i installed git-daemon, and created the server myrepo.git directory using git clone --bare sourcedir serverdir/myrepo.git00:01
← __iron left00:01
haypo but if i clone the new respository, i loose the git-svn remote ref00:01
mugwump well, you should only be importing from one clone00:02
haypo should I use "git svn init" after clone the new repository?00:02
mugwump you would need to, yes00:02
but you also need to assemble the refs correctly00:02
eg, using git clone --mirror00:02
haypo i have: python.org (public svn repository, read only) --svn--> my server "git-svn" repo --git--> a client "git-svn" repo00:04
→ madewokherd joined00:04
haypo madewokherd: where should I "assemble the refs correctly"? in the "client" or "server" repo?00:05
mugwump ^^, not madewokherd sorry00:05
mugwump wherever it is you're running git svn init00:05
← ecwNick left00:05
→ pheaver joined00:06
haypo mugwump: my bare server repo has no remote ref. is it possible to set the git-svn remote trunk in this repo?00:07
→ Zephyrus__ joined00:07
mugwump if telling you that "git clone --mirror" of the repo you used for the git svn import doesn't help you, then you need to read the basics sections of the user manual more00:08
it's quite straightforward if you understand what refs are00:08
→ jasonn1234 joined00:09
→ Paraselene___ joined00:10
← xiong left00:10
← agile left00:12
→ hadees joined00:14
hadees how do you update a branch from origin that you already pulled local?00:14
→ seanh joined00:15
davr using git pull00:15
haypo mugwump: well, i don't really understand what i'm doing :)00:16
← Paraselene_ left00:16
Paraselene___ → Paraselene_00:16
← Paraselene_ left00:16
seanh I'm having a proble with git 1.5.4.3. Is this a bug? I make a bare clone with `git clone --bare`. Then I cd into the bare clone and give it a detached work tree (so it's no longer bare): `git config core.worktree /path/to/worktee` `git config core.bare false`. But when I do `git checkout -f` it says 'git-checkout cannot be used without a working tree'00:16
← gebi left00:17
→ acalbaza joined00:17
acalbaza trying to rebase from svn and ran into ... "00:17
"I cannot create a rebase-apply directory..."00:18
← Zephyrus left00:18
← rudi_s left00:19
→ DrAk0 joined00:19
→ puchu joined00:23
puchu hi00:23
how can i reset the last git commit -a -m "foo"? i didnt push it by now00:24
→ balint joined00:24
puchu or better how can i change "foo" .. i just want to change the text00:24
davr git commit --amend00:25
puchu davr thanks .. and how could i delete the last commit and let the source be as it is?00:27
seanh To answer my own question: it does seem to be a bug in git 1.5.4.3. I upgraded git to 1.6.6 and now the `git checkout -f` works00:28
ereslibre why could be gitweb missing repositories ? ¬¬00:28
davr puchu: git reset --soft <revision>. where <revision> points at the last good commit you want to keep00:29
ereslibre: maybe the repos are not in the folder where gitweb is looking? or maybe their permissions are set such that gitweb can't access them?00:29
puchu davr: thanks00:29
ereslibre davr: hmm strange, i have 4 on the same folder, and only 3 are listed. they all have the same permissions00:30
puchu davr but the source will stay the same compared to the source befor git reset --soft ?00:31
→ pingveno joined00:31
davr yeah --soft means dont touch any of my working files00:33
← jelmer left00:33
davr read the man page for the differences between soft/mixed/hard00:33
→ fusion joined00:34
← sagsousuke left00:34
← GodEater left00:34
fusion I worked on my project from another location and pushed to my remote location. how do I do a fetch/merge, since i've read git pull isn't a good way to do it.00:35
→ Tricon joined00:35
→ taufiqkh joined00:35
← christophsturm left00:36
← adamm left00:37
← seanh left00:37
davr git pull is basically just a shortcut to running git fetch and then git merge00:38
wereHamster fusion: can you describe your setup in a bit more detail? Which repos are involved, which ones are bare/non-bare, from where to where did you push?00:38
← fynn left00:39
fusion bare should be the remote repo, its only one branch (master?) on both sides. local was cloned so non-bare?00:40
maybe this will help: http://gist.github.com/27674000:41
wereHamster and your question is.. ?00:41
fusion I want to update my copy with the remote repo I think i've done git pull in the past but I'd rather learn it the right way00:42
wereHamster as davr said, pull = fetch+merge00:42
davr yea, the last lines seem to tell you what to do pretty clearly00:42
fusion I don't want to commit those changes though00:43
wereHamster so stash them00:43
← mnyon left00:43
wereHamster or use checkout to drop the changes in the file00:44
fusion how does stashing work, do I unstash them later or something?00:44
wereHamster fusion: man git-stash00:44
← DrAk0 left00:44
Gitbot fusion: the git-stash manpage can be found at http://git.or.cz/man/git-stash00:44
→ GodEater joined00:46
gmarquezWRS What do I have to do to UPGRADE Git from 1.6.1.3 to 1.6.6 if installed from source .tgz file?00:46
fusion so fetch, stash, merge, stash pop sound correct?00:46
wereHamster yes00:48
fusion I guess i'm trying to get the same behavior as "cvs update"00:48
davr gmarquezWRS: compile the new source, then install the new binaries over the old ones?00:48
kevlarman fusion: really you should be committing your changes to a different branch, and then rebasing that onto master00:48
gmarquezWRS davr, anything I can do to check where previous or current live? besides 'which git'?00:49
wereHamster maybe you should ask yourself if you really need the merge right now if you have a dirty working tree or if that can wait until you finish what you are working and commit the changes00:49
fusion: ^^^00:49
gmarquezWRS davr, currently git is installed in: /usr/local/git/bin/git00:49
davr gmarquezWRS: could be anywhere really, depends how you installed it last time00:49
← L_R_N left00:50
→ LRN joined00:50
davr if you used the default location last time, then theoretically using the default location this time should put it in the same place00:50
gmarquezWRS davr, someone else did that and I need to upgrade due to some missing features in old version00:50
fusion kevlarman, the project is really young right now so it seems pointless to create another branch so soon00:50
kevlarman fusion: a local branch00:50
gmarquezWRS davr, i know how to grab latest source, untar, build and install... but definately dont want 2 different git's installed00:50
kevlarman you don't have to push it00:50
gmarquezWRS: if you still have the old source, make uninstall should work iirc00:51
gmarquezWRS davr, I really just want to make sure I dont break anything since this is a highly used server for our corporation =)00:51
fusion kevlarman, I'll keep that in mind, I think stash will work good atm.00:51
thanks for the help00:51
gmarquezWRS kevlarman, oh yeah, I did find it in the old admin's home directory...00:52
← afowler left00:52
← benjy left00:53
kevlarman gmarquezWRS: and while you're at it, you should probably either use a package or make one yourself to make things easier for the next guy00:53
wereHamster gmarquezWRS: or isntall git into its own prefix00:54
← Alagar left00:56
gmarquezWRS I wouldn't think so but this server also uses Gerrit for Git-delevoper work-flow, I hope it doesnt break anything Gerrit-related...00:56
← mjf left00:56
gmarquezWRS hopefully gerrit would just use git and not full-path to git...00:57
→ hpatwork joined00:57
wereHamster does gerrit use git.git? I thought it was written completely in java00:57
gmarquezWRS its using jetty00:57
← balint left00:57
gmarquezWRS but i seriously dont know if it uses git.git (old admin)00:57
→ cloudhead joined00:58
← rettub left00:58
gmarquezWRS reason for upgrade is old version doesn't support 'git filter-branch' option00:58
← tfarina left00:59
← schierbeck left01:02
→ rettub joined01:03
← lightcap_ left01:03
→ scarabx joined01:07
→ Mage joined01:07
→ myselfhimself joined01:07
myselfhimself what's the git command to reset a repo's contents ?01:07
← patmaddox left01:07
myselfhimself the repo was initted from a git clone01:07
Mage git --reset01:07
myselfhimself I want to do like rm -rf * and svn up to get everything in the beginning stage01:07
ok01:07
Mage i think :p01:07
acalbaza is rebase the equiv of a merge?01:07
← carrus85 left01:08
killerchicken_ myselfhimself: you want "git checkout ."01:09
→ goplexian joined01:09
myselfhimself ok thanks01:09
← bcardarella left01:09
killerchicken_ acalbaza: no. Rebase reorders commits01:09
myselfhimself killerchicken_: ok perfect thanks01:10
thanks Mage too01:10
acalbaza killerchicken_: thanks01:10
killerchicken_ acalbaza: rebase doesn't exist in many other vcs that you might be used to01:10
Mage I use git extensions, so the actual commands are a little rusty for me :p01:10
acalbaza killerchicken_: but i may see merge conflicts as a result of a rebase, no?01:11
killerchicken_ yes01:11
← pingveno left01:12
killerchicken_ this happens when one of the commits that is moved so that it is now applied after another commit has a changeset that doesn't apply cleanly01:12
acalbaza still trying to get a handle on rebase... im working with sources from svn and rebased today after a day of commits to the svn repo. i hit a couple of conflicts that im trying to get my head around.01:14
← goplexian left01:15
← Ryback_ left01:15
← priidu left01:15
← MrPunkin left01:16
← pantsman left01:16
← GodEater left01:17
→ GodEater joined01:17
→ mnyon joined01:17
→ Kelly_zhou joined01:18
← myselfhimself left01:18
← amerine left01:20
← Mage left01:20
← brodyberg left01:22
← vbgunz__ left01:24
→ jelmer joined01:24
→ kelly_blue joined01:25
← kelly_blue left01:26
← Kelly_zhou left01:26
← sh1mmer left01:26
→ Kelly_zhou joined01:26
← rgr left01:28
→ rgr joined01:29
← dreiss left01:29
← GodEater left01:29
→ GodEater joined01:30
→ dgarr joined01:30
← intripoon left01:31
→ zehrique joined01:31
→ LiamH joined01:32
← rgr left01:32
→ rgr joined01:33
← GodEater left01:37
← puchu left01:38
← ctusar left01:38
← rgr left01:39
← Mage_Dude left01:39
→ GodEater joined01:39
→ rgr joined01:39
→ sh1mmer joined01:39
→ archis joined01:40
← haypo left01:40
← archis left01:41
← Zephyrus__ left01:41
→ tfarina joined01:42
→ katol joined01:42
← eletuchy left01:44
→ sh1m joined01:44
← GodEater left01:46
→ GodEater joined01:46
→ keystr0k joined01:46
← rgr left01:48
← tvw left01:48
← sh1mmer left01:48
sh1m → sh1mmer01:49
→ Mage_Dude joined01:49
→ rgr joined01:50
← rgr left01:50
→ rgr joined01:50
← GodEater left01:51
katol hello, I need to remove some commits from the history (or revert them) the problem is that they have already been pushed to the remote and one of them is a merge. how may i do that?01:52
davr katol: do you need to completely remove them from your history? or is simply undoing the changes enough?01:53
→ afowler joined01:54
davr the latter causes fewer issues, so I recommend that if possible01:54
man git-revert01:54
Gitbot davr: the git-revert manpage can be found at http://git.or.cz/man/git-revert01:54
katol undoing the changes is enough01:54
i tried that but i have some questions.. what is the parent number?01:55
killerchicken_ katol: http://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt might have ideas for undoing your merge..01:55
→ GodEater joined01:55
katol and since i need to undo multiple commits and not just one, should i git-revert multiple times?01:55
davr since it involves a merge, it's more complicated01:56
fully read that link that deadlypoultry just posted, it seems to explain it in detail01:56
katol sure, thank you :)01:57
→ flaguy48 joined01:58
← Mage_Dude left01:58
katol oh and another thing,01:58
what should git ci -a [branch "production"] do?01:58
→ Mage_Dude joined01:58
katol it is in my bash history but i really don't remember doing it01:58
and it was the responsible for the whole mess :\01:58
← ereslibre_desk left01:59
← srcerer left02:00
davr that does't look valid to me, the [branch "production"] part02:00
→ aliasre joined02:01
katol humm weird02:01
davr but "git ci -a" is probably an alias for "git commit -a" which means "commit all changed files to the currently checked out local branch"02:02
← aliasre left02:03
← ereslibre left02:04
→ sagsousuke joined02:04
→ EricInBNE joined02:05
← Mage_Dude left02:07
→ Mage_Dude joined02:07
← pkw left02:08
← rgr left02:08
→ rgr joined02:09
→ jrmuizel joined02:09
← justinweiss left02:10
← rgr left02:10
← carllerche left02:10
→ rgr joined02:10
mw → mw|out02:10
← keex left02:11
← rgr left02:11
→ rgr joined02:11
→ rich97 joined02:12
← godsflaw left02:13
→ dreiss joined02:13
← defectiv left02:13
← Mage_Dude left02:16
→ Mage_Dude joined02:16
← sumangurung left02:17
← jrmuizel left02:17
← dgarr left02:17
← orafu left02:18
→ jrmuizel joined02:18
→ orafu joined02:18
← rgr left02:19
→ rgr joined02:19
→ srcerer joined02:19
← katol left02:21
→ rchavik joined02:21
← spearce left02:22
← bentob0x left02:23
← jelmer left02:23
→ VVSiz_ joined02:24
← jrmuizel left02:25
→ katol joined02:25
→ remi joined02:25
→ Mage_Dude_ joined02:26
katol this think of parent-number during a revert is really confusing me.. what the hell is it?02:26
→ keex joined02:27
← Mage_Dude left02:27
→ aisipos joined02:27
cbreak katol: for merge commits02:29
I think02:29
they have several parents02:29
because they are merges02:29
katol yes but how are they numbered? i mean, how do i know who is the parent 1?02:29
cbreak hmm.02:30
← hyperair left02:30
← tfarina left02:31
→ aresnick joined02:32
→ vbgunz__ joined02:33
← Mage_Dude_ left02:34
→ Mage_Dude joined02:35
← GodEater left02:35
← keex left02:35
→ drubies joined02:40
← rgr left02:40
→ rgr joined02:40
← VVSiz left02:41
remi → remiprev02:43
← sagsousuke left02:43
remiprev → remi02:43
← rgr left02:43
← Mage_Dude left02:44
→ rgr joined02:44
→ Mage_Dude joined02:44
→ GodEater joined02:48
← bry left02:48
← rgr left02:49
← WALoeIII left02:49
→ rgr joined02:50
← rgr left02:51
→ rgr joined02:51
← rgr left02:52
→ rgr joined02:52
→ Mage_Dude_ joined02:53
← katol left02:57
← drubies left02:57
← sh1mmer left02:57
← rgr left02:58
→ Mage joined02:58
→ rgr joined02:59
← Mage_Dude left03:00
← tedoc2000 left03:02
← Mage_Dude_ left03:02
← agenteo left03:02
→ Mage_Dude joined03:02
→ jelmer joined03:02
→ crack_head_ joined03:03
crack_head_ is there a way to do a "commit -a" and "push" at the same time?03:03
offby1 don't think so03:04
← rgr left03:04
→ rgr joined03:05
→ hyperair joined03:05
jnl alias maybe? or hook? depending on what you want to do..03:05
loops crack_head_, that sounds like a really poor optimization. One of the real benefits of Git is that you get to calmly consider what you've committed before sharing it with remote repos.03:06
crack_head_ yeah...I guess an alias03:06
yeah...but if it's just something very quick and I don't need to consider it...I should be able to just push a change03:07
..the 2 step process can be overkill03:07
loops crack_head_, with Git you can commit 40 times in an hour, not worrying about what it looks like, being able to retreat quickly if you go down a dead-end programming wise.. clean it all up in the end before pushing out03:07
crack_head_ sure03:07
I understand how git works03:07
loops crack_head_, okie, well every situation is different, just thought i'd throw that out there for consideration03:08
crack_head_ right on03:08
→ qbproger joined03:09
crack_head_ I just have users that are SVN proponents and they are used to doing one command03:09
→ WALoeIII joined03:09
crack_head_ it would be nice to be able to tell them to do a command that did all in one shot like they're used to03:09
I would assume I'm not the first person to ask this question03:09
qbproger I have a question about creating patches in git... I'm doing "git format-patch HEAD..other_branch -o .." is there a way to make it create 1 patch file instead of 1 for each commit?03:10
← rgr left03:10
← afowler left03:10
← zehrique left03:10
→ rgr joined03:10
→ RaceCondition_ joined03:11
← whaley left03:11
loops crack_head_, i'd argue the more you make Git look like SVN, the less reason there is to convert to Git. Git is better as it is, even if it's uncomfortable transitioning away from those old models03:11
← RaceCondition left03:11
RaceCondition_ → RaceCondition03:11
→ Mage_Dude_ joined03:12
loops crack_head_, once a person realizes they can commit anything they want, in any ratty old shape, not worrying that others will see it, it's liberating, never go back to SVN after you "get it"03:12
← pheaver left03:13
← gdsx left03:13
→ gdsx joined03:13
← blaenk left03:14
← Mage_Dude left03:14
loops qbproger, you can use --stdout and redirect to a file03:15
qbproger loops: thanks03:15
crack_head_ eh...I don't really know if that argument is worth having. We could go back and forth on that and not get anywhere03:15
← Pistahh left03:15
→ pkw joined03:16
loops crack_head_, sure, in the end its a matter of opinion. But Git was created very purposefully to be used differently than cvs/svn03:17
→ eletuchy joined03:17
→ eldragon joined03:17
← project2501a left03:17
← GodEater left03:17
loops crack_head_, and as someone who had that aha! moment with Git, I can't imagine others wont feel the same way ;o)03:18
crack_head_ well..the concept is different, but that doesn't mean it was purposefully created to be different in use03:18
→ Pistahh joined03:19
← infogulch left03:19
loops crack_head_, no. Linus was very clear on this point. Git is designed to be used in a distributed manner. You commit to your local repo, not a remote repo. Sharing commits is a separate activity be design. It's meant to be used that way.03:20
crack_head_ right on03:20
→ DrAk0 joined03:21
loops crack_head_, of course all that is moot if it's not how you want to work :o)03:21
crack_head_ yep03:21
→ infogulch joined03:21
→ ericlee joined03:21
ericlee hi, will someone provide me some materials aout git-svn.03:22
crack_head_ git has tried to work with a lot of other systems...cvs and svn03:22
ericlee 'cause I'm a newbie on it.03:22
Actually I just know a little on git.03:22
crack_head_ http://jabber.digitaldarwin.com/wiki/index.php?title=Using_Git03:23
loops ericlee, http://git.or.cz/course/svn.html will give you an overview... feel free to ask specific questions here or on the mailing list03:23
→ GodEater joined03:23
crack_head_ ericlee..this is something I wrote up as my notes03:23
kevlarman crack_head_: i learned the hard way that that kind of thinking just leads to shooting yourself in the foot03:23
loops ericlee, actually, that's not a good URL for your question, one sec03:23
kevlarman repeatedly03:23
loops ericlee, maybe http://orestis.gr/blog/2008/08/23/git-svn-tutorial/ instead03:24
crack_head_ kevlarman: what do you mean?03:24
thinking like what?03:24
kevlarman crack_head_: i mean trying to use git as if it was svn, and thinking in svn terms03:24
crack_head_ no no no03:25
I'm talking about git-cvs-sever and git-svn03:25
s/sever/server03:25
→ cytrinox_ joined03:26
crack_head_ night everyone03:29
← JohnFlux left03:29
← crack_head_ left03:29
← vmiklos left03:30
→ m104 joined03:30
→ vmiklos joined03:30
← LiamH left03:30
→ jrmuizel joined03:30
← jrmuizel left03:30
→ adamm joined03:31
← rgr left03:32
→ rgr joined03:32
← aziz left03:33
tchan1 → tchan03:35
← parasti left03:37
← cytrinox left03:37
cytrinox_ → cytrinox03:37
→ ankit9 joined03:40
← Theravadan left03:41
← scarabx left03:42
← hyperair left03:44
→ JHMFC joined03:45
← mw|out left03:45
← dfr|work left03:45
← JHMFC left03:45
← hipe left03:46
→ hipe joined03:47
← Tricon left03:48
→ ruediger joined03:49
← vbgunz__ left03:50
← m104 left03:52
→ tjafk joined03:53
← eldragon left03:54
→ m104 joined03:54
→ ajonat joined04:00
← Twisted_Mentat left04:00
← tekky left04:03
← ruediger_ left04:03
→ Modius joined04:04
→ lightcap_ joined04:07
← tjaway left04:08
← r11t left04:08
→ tek joined04:14
← qbproger left04:15
← ajonat left04:16
→ lresende_ joined04:19
→ hyperair joined04:19
← lresende_ left04:20
← rchavik left04:23
→ sumangurung joined04:26
← m104 left04:26
← madewokherd left04:27
← numberGrey left04:32
→ numberGrey joined04:32
→ agenteo joined04:33
← lresende left04:35
→ Iff_ joined04:36
→ AndrewC joined04:37
AndrewC git newbie question: Accidentally pulled a Linux repository into my home directory. (Please point and laugh now...) Is there an easy way to get rid of the files this added without getting rid of the pre-existing files?04:39
bob2 if you remove the references to it (ie branches and tags), I think you can use fsck and prune to kill it04:40
or you could make a new repo (with blackjack, and hookers) and branch your homedir stuff in to it04:40
kevlarman AndrewC: something like rm `git ls-files`, but that's really dangerous, make sure it doesn't list anything with whitespace or anything you need first04:41
mugwump git rm -n \* might work04:42
(try it with and without the -n :))04:42
with the -n first of course04:42
AndrewC Or is my initial plan (ls -altr and remove the newest files/directories) the way to go. :)04:43
← Iff left04:43
kevlarman yeah do what mugwump says, that sounds a lot safer04:43
mugwump you can definitely use ls-files to get a list04:43
← numberGrey left04:43
→ numberGrey joined04:43
mugwump but a timestamp-based approach should be fine too... whatever you're comfortable with04:43
*this advice comes with ABSOLUTELY NO WARRANTY :)04:44
← kukks left04:44
← Bass10 left04:44
kevlarman git rm -n -r \* sounds the safest04:45
→ pheaver joined04:46
← ericlee left04:46
→ cenuij joined04:49
AndrewC Looks like git -n -r \* got rid of all the files, but left the directory hierarchy. Almost there. :)04:51
Well, without the -n it did.04:51
→ brodyberg joined04:53
AndrewC Thanks!04:53
← brodyberg left04:54
kevlarman AndrewC: for file in $(git ls-files --with-tree=HEAD); do rmdir $(dirname $file);done04:55
why do i feel like i shouldn't know that04:56
→ dwilliamii joined04:57
AndrewC Does git have a way similar to 'git rm' to get rid of directories?04:58
kevlarman git doesn't track directories04:58
but rmdir will never remove a non empty dir04:58
so that should be safe04:59
← jelmer left05:00
AndrewC Ok thanks. Tomorrow I'll have to give git another try, and see if I can use it without nearly hosing my home directory.05:00
→ agile joined05:01
← numberGrey left05:02
← AndrewC left05:02
→ rchavik joined05:02
jasonn1234 i have a file I want to edit locally and not be tracked... however it's currently being tracked by the repository. I've added it to .git/info/exclude, but as you know git still tracks it. How can I stop it from being tracked? If I "git rm" it, the deletion gets tracked! Uuugh. What's the right way to do this?05:02
kevlarman jasonn1234: git rm --cached05:03
→ sagsousuke joined05:03
← imajes left05:04
→ ingenious1 joined05:04
← aresnick left05:04
jasonn1234 kevlarman: I did that - but then git status shows that it tarcks the deletion. so if I "git commit -a" and then "git push" - it gets deleted from the remote repo...05:05
← killerchicken_ left05:06
→ fishey joined05:06
kevlarman isn't that what you asked for?05:06
→ killerchicken_ joined05:06
jasonn1234 kevlarman: what I want is just for it not to be tracked, but for the file to exist locally...05:07
kevlarman jasonn1234: wait, you're pushing into a non-bare repo?05:07
jasonn1234 kevlarman: yes05:07
← fishey left05:07
kevlarman jasonn1234: see faq non-bare05:07
Gitbot jasonn1234: Pushing to non-bare repositories is discouraged. See http://git.or.cz/gitwiki/GitFaq#non-bare05:07
kevlarman you shouldn't be doing that05:07
you *will* lose data at some point05:08
→ fishey joined05:09
offby1 jasonn1234: and in general, you probably want your file to be generated at "build time" from a template file that _is_ tracked05:09
the meaning of "build time" varies a lot depending on what kind of project it is05:10
jasonn1234 kevlarman: uuggh... the thing is that I need updates to show up on the dev server without having to access the dev server every time there is a commit and "git pull" it. So I've set it up with the post-update hook. Is there another / a better way to acheive that? It's for a web project...05:10
→ numberGrey1 joined05:10
→ |Rolenun| joined05:11
jasonn1234 offby1: that's a good idea.. I will do that05:11
kevlarman jasonn1234: post-update hook that causes a non-bare repo to pull from a bare repo is fine05:12
← numberGrey1 left05:12
→ numberGrey1 joined05:12
mugwump how overcomplicated05:12
jasonn1234 kevlarman: ahhh, cool. damn, I didn't know it did that. Thank you sir05:12
mugwump a post-update hook which just updates the working copy with the new changes also works05:12
the only reason it doesn't work is that nobody's bothered to implement it05:13
it's not fundamentally wrong05:13
kevlarman most people use a post-update hook that uses git archive|tar -x05:13
iirc05:13
mugwump it's not quite that simple, you need to deal with deletes too05:14
but the post-update hook on the faq deals with many cases like this05:14
offby1 I like the idea of "git archive".05:14
That way you know you've got the right files, and nothing but the right files (i.e., no .git directory)05:14
jasonn1234 is going to need to read up on the hooks documentation. I just wgetted the one recommended in the git documenattion...05:14
mugwump using checkout is much more efficient05:15
offby1 who knows what your web server's gonna do with that .git directory ...05:15
offby1 calls the /me police on jasonn123405:15
offby1 Pronoun agreement, son; pronoun agreement.05:15
jasonn1234 LOL05:15
offby1 mugwump: sure05:15
mugwump offby1: well, you can do that too05:15
offby1 heh05:15
mugwump your .git doesn't need to live under the webroot05:16
it starts crossing that hazy line between bare and non-bare then05:16
jasonn1234 offby1: jeez, you act as if we should be detail-oriented in this biz or something ... ;)05:16
offby1 mugwump: true true05:16
jasonn1234: it's spelled "Geez" !!1!!05:16
offby1 whistles innocently05:16
kevlarman offby1: you're making me tempted to write a grammar/spelling nazi ircbot05:17
← DrAk0 left05:17
jasonn1234 is outgunned. or is it out-gunned?05:17
offby1 kevlarman: what for? I'm always here05:17
kevlarman offby1: you can't be everywhere on freenode at once05:18
offby1 mua ha ha05:18
kevlarman i'll name it offby2 :P05:18
→ buzzomatic joined05:22
buzzomatic Hey, can anyone tell me how to disable core.filemode globally?05:22
← landfill left05:22
→ landfill joined05:22
← agenteo left05:22
kevlarman buzzomatic: git config --global?05:23
buzzomatic Doesn't work05:23
← schacon left05:23
buzzomatic Every time a repo is created core.filemode is set to true05:23
← tg left05:25
kevlarman buzzomatic: seems to work here05:28
→ tg` joined05:28
kevlarman at least looking in .git/config of a new repo05:28
← Rolenun left05:28
cenuij is there an other location i can save exclude/ignore patterns other than .gitignore?05:29
buzzomatic Not here: http://pastie.org/77758305:29
→ TheShahFactor joined05:29
cenuij nevermind, I found .git/info/exclude05:30
→ munichlinux joined05:31
offby1 buzzomatic: if you're using a Windows version of git, it's possible that it's doing that05:32
buzzomatic This is on Ubuntu 8.0405:32
← ingenious1 left05:32
offby1 cenuij: yes. note that .git/info/exclude isn't part of the repository, so it only affects you.05:32
← jasonn1234 left05:34
← juan_arandaalvar left05:34
cenuij offby1: ok perfect05:35
thanks05:35
offby1 bows05:36
→ sbailey85 joined05:38
← sbailey85 left05:40
← mnyon left05:42
→ mnyon joined05:45
← niki left05:47
→ ruxpin_ joined05:50
→ amerine joined05:52
Masanator → masa-06:00
← ruxpin left06:03
← pheaver left06:04
← mnyon left06:04
→ pheaver joined06:04
→ mnyon joined06:05
← ruediger left06:06
masa- is it somehow possible to add commits to the beginning of history, in other words, to create new git repo with older code than the original repo and then transfer the older repo commits on top of that?06:07
bob2 yeah06:07
make the new repo with the stuff, then rebase the old stuff on top06:08
masa- how do i rebase to a different repo?06:08
→ Saurabh_Shah_ joined06:11
→ bambule joined06:11
← BigMack84 left06:12
→ numberGrey joined06:13
← cloudhead left06:13
offby1 import the commits from that different repository into your repository first.06:14
← numberGrey1 left06:14
← rgr left06:17
← dreiss left06:20
← TheShahFactor left06:22
masa- is there a command for that, or can i just copu all the blobs and use the SHA1s from the old repo?06:22
← jailbox left06:23
← laj left06:23
|Rolenun| → Rolenun06:23
→ jailbox joined06:24
← mnyon left06:24
→ mnyon joined06:25
← ruxpin_ left06:25
→ ruxpin joined06:30
EricInBNE new version of egit on the update-site...but no apparent change06:31
→ hebz0rl joined06:32
→ prudhvi_ joined06:32
→ anno^da joined06:32
← wolog left06:32
← tro left06:34
→ tro joined06:34
← buzzomatic left06:37
← simplificator left06:37
← sumangurung left06:38
→ robinr joined06:38
rich97 → rich97|away06:39
→ Aldwuin joined06:40
→ dreiss joined06:41
→ project2501a joined06:41
RandalSchwartz Junio was in my "intro to git" talk tonight.06:42
so that makes it so that I've given this talk with both Linus and Junio in the audience.06:42
talk about pressure. :)06:42
I've also given a lecture on Perl6 with Larry in the audience. :)06:43
← mnyon left06:44
← prudhvi left06:44
→ ruxpin_ joined06:45
→ mnyon joined06:45
← Saurabh_Shah_ left06:47
→ ruxpin__ joined06:51
← jjuran left06:52
← Adlai left06:52
← anno^da left06:53
← robinr left06:53
← WALoeIII left06:55
← ruxpin left06:56
→ laj joined06:57
→ mdiep joined06:58
mdiep what's the correct way to mark a file as a binary file in a git repo?06:58
or don't I need to do anything?06:59
← celoserpa left06:59
_rane i think it's done automatically06:59
bob2 no need to do anything06:59
mdiep I was confused because github was showing me the contents of the binary file. but I guess that's an issue with github.07:00
→ celoserpa joined07:00
AAA_awright The only time it cares about binary is if you are using core.autocrlf iirc and it detects that automatically, otherwise it stores the exact content you tell it to07:00
← celoserpa left07:01
← numberGrey left07:01
→ numberGrey1 joined07:01
← mnyon left07:01
← aisipos left07:03
← ruxpin_ left07:03
→ red_songshu joined07:04
→ mnyon joined07:05
rich97|away → rich9707:05
→ nevyn_ joined07:06
← hyperair left07:06
← Mage_Dude_ left07:06
← mdiep left07:07
→ aisipos joined07:08
→ sde_antrix joined07:08
→ Dataforce` joined07:09
← rchavik left07:09
← Dataforce left07:10
Dataforce` → Dataforce07:10
← aisipos left07:10
← bambule left07:11
→ jjuran joined07:11
→ Mage_Dude joined07:11
→ aisipos joined07:12
→ BigMack83 joined07:15
→ anno^da joined07:16
← BigMack83 left07:16
← sde_antrix left07:16
← Dataforce left07:18
← RaceCondition left07:18
→ sde_antrix joined07:18
→ ruxpin joined07:18
← nevyn left07:19
← sagsousuke left07:19
→ Dataforce joined07:19
→ BigMack83 joined07:20
← hipe left07:20
→ hipe joined07:20
← Dataforce left07:22
← ruxpin__ left07:23
← mnyon left07:24
→ mnyon joined07:25
← red_songshu left07:26
johnjay_ → johnjay07:26
→ Twisted_Mentat joined07:26
→ hyperair joined07:29
→ d0ugal joined07:29
→ Dataforce joined07:29
→ ixti joined07:29
→ ruxpin_ joined07:31
→ wolog joined07:31
→ priidu joined07:34
← hyperair left07:34
→ psoo joined07:34
← kinabalu left07:35
→ eno joined07:36
→ thiago_home joined07:40
→ hyperair joined07:41
→ giallu joined07:42
← ruxpin left07:43
← mnyon left07:44
→ rseifert joined07:45
→ mnyon joined07:45
← eno__ left07:47
wereHamster masa-: you use git-fetch to transfer commits from one repo to another07:50
→ Fissure joined07:51
→ Jak_o_Shadows joined07:52
← pheaver left07:53
← disappearedng left07:54
← keystr0k left07:54
← MarcWeber left07:55
→ Zenopus joined07:56
→ bentob0x joined07:58
→ disappearedng joined07:58
← amerine left08:01
← Zenopus left08:01
← Iff_ left08:03
← mnyon left08:04
← marc_kdab left08:04
← Mage left08:05
← fishey left08:05
→ mnyon joined08:06
→ niki joined08:06
→ iff joined08:07
→ eggie5 joined08:07
eggie5 ello?08:07
← niki left08:08
← dreiss left08:08
← soenke left08:08
→ soenke_` joined08:09
eggie5 i accidently ran git rm . -r and it added all my files to the delete queue. I didn't commit yet but how can I undo this?08:09
→ jelmer joined08:09
← Rolenun left08:09
Grum eggie5: if you read git status it will tell you how to 'undo' the staging08:10
← BigMack83 left08:11
← eggie5 left08:12
→ BigMack83 joined08:13
← numberGrey1 left08:15
→ numberGrey joined08:15
→ snearch joined08:18
← snearch left08:19
→ snearch_ joined08:19
→ jessep joined08:20
← BigMack83 left08:20
← SunilThaha left08:20
→ sunil joined08:22
→ BigMack83 joined08:23
← mnyon left08:24
← priidu left08:24
← guardian left08:25
→ mnyon joined08:25
→ niki joined08:25
← BigMack83 left08:26
→ BigMack83 joined08:27
→ schmukkk joined08:28
← snearch_ left08:29
→ snearch_ joined08:29
← snearch_ left08:30
← thiago_home left08:31
→ Zenopus joined08:32
← BigMack83 left08:32
← kkoehne left08:32
→ marc_kdab joined08:33
→ jinzhu joined08:33
→ alpha joined08:34
→ Zenopus_ joined08:34
← Zenopus left08:34
→ BigMack83 joined08:34
← BigMack83 left08:34
Zenopus_ → Zenopus08:34
→ ph^ joined08:34
← alpha left08:35
→ alpha joined08:35
← alpha left08:35
VVSiz_ → VVSIZ08:37
→ mstsirkin joined08:37
← jjuran left08:38
→ kkoehne joined08:39
→ pantsman joined08:40
→ Tordmor joined08:42
→ zjason joined08:43
← taufiqkh left08:44
← mnyon left08:44
→ petrux joined08:44
← hgimenez left08:45
→ xiong joined08:45
→ mnyon joined08:45
→ BigMack83 joined08:46
→ sparta joined08:49
→ zoniq_ joined08:50
sparta how can i copy my remote origin:master branch to remote origin:release branch?08:51
→ Adlai joined08:52
← Tordmor left08:52
Ilari sparta: 'git fetch origin', 'git push origin origin/master:refs/heads/release' is one way.08:53
← simNIX left08:54
→ turrican72 joined08:55
← schmukkk left08:56
→ drubies joined08:58
→ robinsmidsrod1 joined08:59
← Zenopus left09:01
→ Zenopus joined09:01
→ guardian joined09:02
← lightcap_ left09:02
← Jak_o_Shadows left09:03
← mnyon left09:04
← turrican72 left09:04
← unreal left09:05
→ unreal joined09:05
→ mnyon joined09:05
nonken_afk → nonken09:07
sparta what does this error mean while tryng to copy master to release (both are remote branches) : ! [rejected] origin/master -> release (non-fast forward)09:11
error: failed to push some refs to 'ssh://<server_name>/u/<user>/dev/GIT'09:11
wereHamster sparta: faq non-ff09:12
Gitbot sparta: Your push would lose changes on the remote. See http://git.or.cz/gitwiki/GitFaq#non-ff09:12
Ilari sparta: release on origin has some commits master on origin doesn't have.09:12
sparta how to remove those commits?09:14
← robinsmidsrod left09:14
→ Zenopus_ joined09:15
← Zenopus left09:15
Zenopus_ → Zenopus09:15
wereHamster if you know what you are doing you can use push -f09:17
sparta ok09:19
_rane does git log -- path/to/file only list commits that *only* change the specific file or all commits that modify the file09:20
→ Zenopus_ joined09:20
← d-snp left09:20
Aides _rane: the latter09:20
the former would be much less useful09:20
_rane why am I getting limited amount of results, is there some hidden time constraint?09:20
← Zenopus left09:21
Zenopus_ → Zenopus09:21
Aides was the file moved or copied?09:21
_rane renamed, yeah09:21
bah09:21
Aides then use -M09:21
_rane no effect09:22
← mnyon left09:22
_rane weird09:22
← mithro left09:22
_rane I'll use it on the earlier name then09:23
← loops left09:23
→ d-snp joined09:24
→ JohnFlux_ joined09:24
JohnFlux_ Hey all09:25
how do I see the files that a commit changed?09:25
Aides JohnFlux_: git show <commit> --stat09:25
→ mnyon joined09:25
← BigMack83 left09:25
JohnFlux_ ah thanks09:25
→ Zenopus_ joined09:25
← Zenopus left09:26
→ galderz joined09:26
Zenopus_ → Zenopus09:26
JohnFlux_ hmm, I have a commit where the file was renamed then modified09:26
→ mastro joined09:26
JohnFlux_ but git doesn't notice that this happened09:26
any ideas?09:26
Aides how do you want it to notice?09:27
it should show that one file was removed, and another was added09:27
→ BigMack83 joined09:27
wereHamster git show -C -C -M ?09:27
_rane: git log --follow -- <path>09:29
← pantsman left09:29
→ tahseen joined09:31
tahseen hi09:31
→ Zenopus_ joined09:31
tahseen I wonder if I can see what changes I have made to resolve a conflict09:31
← BigMack83 left09:32
← Zenopus left09:32
Zenopus_ → Zenopus09:32
→ priidu joined09:32
wereHamster tahseen: git show <merge commit> ?09:33
JohnFlux_ wereHamster: was that to me?09:33
Aides: right, it shows one removed and other added09:33
Aides: which means "git diff" is useless09:33
Aides: I want to see what the modifications to the file were09:33
Aides JohnFlux_: try -C -C -M, as wereHamster told you09:34
wereHamster JohnFlux_: yes, sorry09:34
JohnFlux_ that doesn't help09:34
I think the file was changed too much09:34
wereHamster how much of the file was modified after the move?09:34
jelari → ambuli09:34
ambuli hi all09:34
JohnFlux_ wereHamster: I don't know, but quite a bit I think09:34
I'm going to ask the original person to split it into two commits09:35
one doing the move, the second to modify it09:35
→ Zenopus_ joined09:35
ambuli i cloned my project from remote repo. but i want the source code till the 10 commits below the latest. how can i update the local code to specific commit ?09:35
← Zenopus left09:36
Zenopus_ → Zenopus09:36
wereHamster ambuli: git checkout <commit>09:36
or git checkout -b thebranch <commit> if you want to create a branch starting at that point09:36
ambuli wereHamster, no i tried, but it tries to create a new branch.09:36
wereHamster what tries to create a new branch? checkout <commit> ?09:37
ambuli yes09:37
wereHamster, the second one works. :)09:38
thanks.09:38
wereHamster can you paste the output of that command?09:38
the second one does create a new branch btw..09:38
the first one doesn't (but detaches HEAD)09:38
← jds left09:40
← drubies left09:40
→ Zenopus_ joined09:41
← ringlej left09:42
← Zenopus left09:42
Zenopus_ → Zenopus09:42
sparta Remote branch(es) merged with 'git pull' while on branch releasetest_remote09:42
rich97 I'm kind of new to git. Is there a way to see how many snapshots I've taken?09:42
ambuli wereHamster, http://paste.pocoo.org/show/165310/09:42
→ Bennid joined09:43
→ tvw joined09:43
nonken → nonken_afk09:44
sparta how can i change the branch that is merged with release when I do a git pull ?09:44
wereHamster ambuli: I don't see anyting indicating that git would create a new branch..09:45
sparta i have : Remote branch(es) merged with 'git pull' while on branch release =>test_remote but I want it to be release itself as I renamed my local branch also to release...09:46
wereHamster rich97: git rev-list | wc -l09:46
rich97: we call the snapshots commits btw09:46
→ Axius joined09:46
wereHamster sparta: git config branch.release.merge ref/sheads/release09:47
tahseen wereHamster, I tried that but its not showing all the files or all the changes09:47
wereHamster refs/heads/release09:47
→ Zenopus_ joined09:47
tahseen I'm not even sure if it make sense actually though09:47
wereHamster tahseen: all the changes between what? Do you want to see everything that was merged?09:47
→ BigMack83 joined09:47
tahseen no09:47
rich97 wereHamster: Thanks :)09:48
tahseen let me try to explain :(09:48
← Zenopus left09:48
Zenopus_ → Zenopus09:48
nonken_afk → nonken09:48
tahseen what I would love to see is a sort of diff between the conflicted merge and my final version. Does it even make sense to ask that?09:49
Its primarily to check back/review if there was some mistake in the conflict resolution. How does people do that?09:49
wereHamster well 'git show' on a merge commit will show what conflict resolution was needed (if any).09:49
tahseen it generally shows the affected file if I don't change the commit message09:56
→ Zenopus_ joined09:56
← Zenopus left09:56
Zenopus_ → Zenopus09:56
tahseen trouble is there was some sort of human intervention when resolving the conflict there doesn't seem to be any record of what that involved09:57
← xiong left09:57
wereHamster if 'git show <merge commit>' doesn't show any diff, then no human interventino was needed09:59
→ Zenopus_ joined10:00
Isenn How do i create a branch based on "remote/origin/mybranch" ?10:00
wereHamster Isenn: git checkout origin/mybranch (or git checkout -t origin/mybranch in older versions of git)10:00
Isenn "git push origin origin:refs/heads/newbranch" creates a branch from head10:00
← Zenopus left10:01
Isenn wereHamster: i do not want to checkout, i want to create a new branch based on a subbranch of master10:01
Zenopus_ → Zenopus10:01
wereHamster has never heard 'subbranch' before10:01
Isenn wereHamster: so i can not create a branch of the content of "mybranch" ?10:02
teuf Isenn: git branch ... would create a branch without switching to (ie checkouting) it10:03
wereHamster git checkout -b mybranch -t origin/mybranch creates a new branch. And the two forms I presented above are just a short form of this command10:03
tahseen what does that mean wereHamster? If I keep the changes from only one version of the file when there's a conflict does that mean there wasn't any human intervention?10:03
Isenn wereHamster: that only tracks an remote branch10:03
← Pupeno left10:04
wereHamster tahseen: hm, another possibility is to use git diff b0b3a241e^@ b0b3a241e to see which changes each parent contributed10:05
Gitbot [git b0b3a241e]: http://tinyurl.com/ylfeqw9 -- Merge branch 'maint-1.6.1' into maint10:05
→ Zenopus_ joined10:05
← BigMack83 left10:05
Isenn So you are saying.. All new branches MUST be based on HEAD?10:06
tahseen ^@ does that mean the parent?10:06
← Zenopus left10:06
wereHamster all parents10:06
Zenopus_ → Zenopus10:06
teuf Isenn: you can create a branch from whatever commit you want10:06
Isenn teuf: how? i have a branch called "mybranch". Based on that branch/content i want a new branch10:06
so i want to create a new branch based on the lastest commit on "mybranch"10:07
teuf Isenn: I've already told you to look at git branch10:07
← tetha left10:07
teuf and git checkout -b newbranch mybranch would work10:07
(I guesss it's one of the things wereHamster suggested)10:07
→ BigMack83 joined10:07
tahseen this seems to be showing too much10:07
← cubuanic left10:07
tahseen but I would probably need something like that10:07
Isenn teuf: hmm, dosn't that create an local branch only for me?10:08
→ Pupeno joined10:08
wereHamster Isenn: do you want to create the branch in the remote repository?10:08
Isenn yes10:08
tahseen but what I having most trouble understanding is that its showing some diff if I use git show on the merge commit .. some diffs are shown10:08
→ marcoecc joined10:08
wereHamster git push origin mybranch:refs/heads/newbranch10:08
or git push origin <commit>:refs/heads/newbranch10:09
tahseen Now if there's a file where I rejected changes from HEAD completely but kept the changes introduced in the merge would that be kept out of the merge commit diff?10:09
wereHamster and replace <commit> with a ref/commit that you want <newbranch> to point to10:09
tahseen is that what you meant by no human intervention?10:09
wereHamster tahseen: no idea10:10
← ixti left10:11
→ mithro joined10:11
→ tetha joined10:11
tahseen thats the most confusing part and conflict is a rare case in my git usage (lucky me) so I get really confused with this behavior10:12
given we often get this situations when we are nearly release time, everyone wants to dobule check the merging but there seems to be no good way for that10:13
anyway thanks for the help10:13
← JohnFlux_ left10:15
→ reto` joined10:15
← ivan left10:15
wereHamster well, from git's point of view, both sides of the branches contributed the same changes to the final tree, so there was no conflict10:16
*both sides of the merge*10:16
tahseen no there were different changes10:16
and I needed manual resolution10:16
→ ivan joined10:17
→ Coke joined10:20
Coke Hey. How do I simply commit all the changes to the repos I cloned from?10:20
wereHamster commit -a ?10:20
← Twisted_Mentat left10:20
wereHamster or did you mean push all commits back to the repo you cloned from?10:21
Coke Oh wait. It says master has uncommited updates10:21
I don't understand anything10:21
Isenn wereHamster: thanks for your help, sorry for you not understanding my issue from the begining :)10:21
hehe10:21
→ intripoon joined10:22
Coke http://pastebin.ca/175079910:22
← Kelly_zhou left10:22
Coke How do I make that go away?10:22
→ tbf joined10:22
wereHamster how go away? commit? Or throw away your local changes?10:22
Fatal you don't want them to be staged anymore?10:22
Coke Hm. Ah -a10:22
I don't know what staged means10:22
← mstsirkin left10:22
Coke Those are real files, not fakes or staged10:22
It's reality, not scripted :)10:23
← sparta left10:23
wereHamster Coke: you should read a git tutorial or the book!10:23
Coke wereHamster: I thought "meh, it should work like most others"10:23
→ chris_n2 joined10:23
Fatal staged as in you've added the files and are about to commit10:23
← marcoecc left10:23
Fatal most others what?10:23
Coke Fatal: I did do git commit -m "test" multiple times10:23
I guess -a was the missing piece10:23
reto` ok, so I've commited and pushed some changes to my server... now it has auto-guessed my name and email which went wrong... how can I take it back? I don't want to take the changes back, just recommmit with the right info10:24
Coke Fatal: guess I'll have to read up with "staged" is10:24
→ RaymondX joined10:24
wereHamster reto`: best way is to use filter-branch (the man page has examples how to change author/committer)10:24
Coke I know most reality shows are staged, maybe git's bachelor need a few directions from the producer10:24
→ lohrun joined10:24
wereHamster Coke: man gitglossary10:25
Gitbot Coke: the gitglossary manpage can be found at http://git.or.cz/man/gitglossary10:25
Coke man git-commit also contained useful info10:25
Gitbot Coke: the git-commit manpage can be found at http://git.or.cz/man/git-commit10:25
reto` wereHamster: ok, thanks10:25
wereHamster Coke: see the definition of 'index'10:25
→ ixti joined10:26
Coke Any good project hosting sites (for free software) that use git?10:26
Ilari Coke: GitHosting in gitwiki?10:27
Coke: That should list multiple...10:27
Coke Ilari: I'll check it out10:27
Got any personal favourites or recommendation?10:27
→ rchavik joined10:28
← rseifert left10:29
← hipe left10:29
→ Chaser_ joined10:30
divVerent I made a branch tracking by setting the config variables, so next pull would download it10:30
→ drv_ joined10:30
divVerent but, git-for-each-ref with %(upstream) does not show the source yet10:30
what else do I need to change for that to work?10:30
drv_ Hello, I have added a git "sbumodule" but doesn't want to use the submodule feature. The superproject gives always the submodule as unstaged change. I have added the directory name to .gitignore, but this doesn't work. How can i tell git to ignore these submodule?10:32
← Coke left10:32
← jelmer left10:33
→ jelmer joined10:34
m-takagi → m-takagi_10:37
← chris_n left10:39
rvsjoen what's the easiest way to get a diff of the changes made since 'N days ago'10:40
← jelmer left10:40
rvsjoen use git-log and grab the earilest sha ?10:40
earliest10:41
← zoniq_ left10:41
Ilari rvsjoen: 'git diff master@{N.days.ago}' (but it uses local state for 'N days ago')?10:41
rvsjoen nice10:41
thanks10:41
→ rgr joined10:41
→ zoniq_ joined10:42
→ NET||abuse joined10:42
Ilari rvsjoen: The dates on git log are 'global'. 'local' is what existed locally at that time.10:42
rvsjoen i'm not sure I quite grasp the difference10:43
Ilari rvsjoen: If commit was made on another repository, it doesn't immediately propagate to your repo. And multiple commits can come to your repo in single update.10:44
rvsjoen oh, that makes sense10:44
anyway its not an issue for me, its only a single repo, and i'm using it to store configuration files, so nobody will be cloning it10:45
thank you10:45
← project2501a left10:50
reto` why am I getting WARNING: Ref 'refs/heads/master' is unchanged10:51
after doing git filter-branch --env-filter "export GIT_COMMITER_NAME=...10:51
it worked with the GIT_AUTHOR_NAME10:52
→ blahblah joined10:53
← hyperair left10:53
← blahblah left10:53
→ xiong joined10:53
wereHamster GIT_COMMITTER_NAME10:54
can you spot the difference? ;)10:54
reto` ew :)10:54
silly me10:54
LotR may I suggest renaming it to GIT_COMMIE_NAME to avoid confusion in the future? ;)10:55
wereHamster COMMIE ?10:56
→ MarcWeber joined10:56
→ Guest66580 joined10:56
LotR heh, is the cold war too far behind us?10:56
MarcWeber Which is the esiest way asking git to use a specific ssh key?10:56
wereHamster MarcWeber: use ~/.ssh/config10:57
MarcWeber wereHamster: But this will affect my account as well.10:59
Probably I'm going to write ssh wrapper scripts and put them in PATH10:59
tg` → tg10:59
wereHamster heh?11:00
MarcWeber #!/bin/sh\nssh -i mykey "$@" or such11:00
wereHamster put 'Host foo\nHostName domain.com\nUser yourusername\nIdentityFile ...' into ~/.ssh/config11:00
and then use 'foo' instead of the real hostname11:01
MarcWeber Let me try.11:01
I forgot about these options.11:01
→ marcoecc joined11:02
→ reprore joined11:03
→ aleray joined11:05
aleray hello, I have some uncommitted files on a (no branch). and this is strange because I though they were commited on another branch but cant check it because git refuse to checkout that other branch. How can I check it ?11:06
→ karel joined11:07
dwmw2 → dwmw2_gone11:10
karel Hi, I have a question about the best way to use git.11:10
There is a remote svn repository, and two developer machines11:11
On the first development machine I use git-svn11:11
I'm working on some stuff in a local branch which I don't want to dcommit to svn yet11:11
But I do have some local commits which I want to share with the second devloper machine11:12
MarcWeber wereHamster: The account is github. I only want to use this key for one project. So assigning this key by host name is not enough.11:13
karel What's the best way to work on the second machine? Should I do git svn init and send patches back and forth between the two machines, or should I use git clone ssh://firstmachine11:13
divVerent you certainly want to clone ssh://firstmachine, then git svn init (not git svn clone)11:13
as that goes WAY faster than redownloading all commits from svn11:14
→ tama joined11:17
← tstclair left11:18
aleray Ok, I simply forgot to finish my rebase11:18
← jinzhu left11:18
← Tama00 left11:20
karel And what's most efficient way to share commits between the two? Do I have to use git format-patch and what not or can I send changes backwards and forwards directly?11:23
RaymondX → Raymond11:23
→ Zenopus_ joined11:25
← Zenopus left11:25
Zenopus_ → Zenopus11:25
divVerent karel: you certainly cannot push11:26
but you can pull between the repositories11:26
nevyn_ → nevyn11:28
← Zenopus left11:28
→ Zenopus joined11:28
→ cuco joined11:31
← rgr left11:31
→ Zenopus_ joined11:31
→ rgr joined11:31
cuco hi all, i made a new branch and I forgot to configure my name + email, and thus all commits have a wrong user/emails. is it possible to modify this?11:32
→ vbgunz__ joined11:32
← Zenopus left11:32
Zenopus_ → Zenopus11:32
→ Haarg joined11:32
wereHamster MarcWeber: Host project.github.com\n HostName github.com\n User git\n IdentityFile ...11:33
and then use git clone project.github.com:.../project.git to clone it11:33
← jessep left11:34
← rgr left11:34
→ rgr joined11:34
MarcWeber wereHamster: Well I'm done now using the wrapper. But I'll remember11:34
wereHamster the 'Host foo' part is only to identify the entry, 'foo' dosen't need to do a valid hostname, it's just an identifier11:34
← rgr left11:34
→ ntoll joined11:34
→ rgr joined11:35
MarcWeber wereHamster: So the trick is that github will reply to any subdomain? But I can use such a subdomain to assign a key in the config? I didn't think about this..11:35
← Zenopus left11:35
→ Zenopus joined11:35
divVerent MarcWeber: actually, no11:36
you can use any name11:36
you can even use fdjhdjhfdjlk in the ssh:// URL, as long as you add Host fdjhdjhfdjlk\n HostName github.com\n User git\n IdentityFile ...11:36
to your ssh config file. SSH allows "redirecting" a host that way.11:37
wereHamster no, ssh will see that you are using 'project.githud.com' as the hostname, it will first look in ~/.ssh/config and see that there is an entry for that, then look up which HostName you specified11:37
in my case above it will contact github.com and use username 'git' and IdentifyFile ...11:37
← rgr left11:38
→ rgr joined11:38
← rgr left11:38
→ rgr joined11:38
→ Zenopus_ joined11:39
← rgr left11:39
→ rgr joined11:39
aleray I'm trying to rebase --continue. I add a conflicting binary file I just add before rebase --continue but I still get an error after that11:39
← Zenopus left11:39
aleray No changes - did you forget to use 'git add'?11:39
Zenopus_ → Zenopus11:39
aleray but there is nothing to add!11:39
wereHamster aleray: you need to choose which version of the conflicted file you want to use11:40
aleray wereHamster: how can I do this? I though using git add would pick the most recent file and git reset would keep the old one11:41
wereHamster if it's a binary file then use one of checkout --ours|--theirs <file>11:41
← rgr left11:42
aleray and then git add that file?11:43
← remi left11:43
← Axius left11:43
wereHamster yes11:44
though that may not be necessary11:44
→ Zenopus_ joined11:46
← Zenopus left11:46
Zenopus_ → Zenopus11:47
← karel left11:47
← Pupeno left11:48
→ Ryback_ joined11:48
→ Pupeno joined11:50
← lemonchicken left11:51
→ stamina joined11:51
→ Zenopus_ joined11:52
← Zenopus left11:52
Zenopus_ → Zenopus11:52
aleray how can I keep the remote files instead of the local ones ?11:52
← tahseen left11:53
wereHamster git checkout --theirs ?11:54
aleray right11:54
:-)11:54
Is there a way no to do this file by file ?11:56
wereHamster git checkout --theirs only works on conflicted files11:57
→ onigiri_ joined11:57
wereHamster do you want to completely replace your version with whatever the remote has?11:57
← pielgrzym left11:57
→ Zenopus_ joined11:57
aleray yes11:57
← Zenopus left11:58
Zenopus_ → Zenopus11:58
wereHamster in these cases it's usually better to use reset --hard (or merge -s ours from the 'other' side)11:58
→ rgr joined12:03
→ Zenopus_ joined12:03
← Zenopus left12:03
Zenopus_ → Zenopus12:03
aleray ok I think I need a tutorial on git!12:04
Ilari aleray: doesn't git-scm.com have one?12:05
aleray Iyes, I'm on it12:05
→ pielgrzym joined12:08
→ Zenopus_ joined12:09
← Zenopus left12:09
Zenopus_ → Zenopus12:09
← BigMack83 left12:10
→ gitte joined12:11
→ nickrw joined12:12
→ segphault joined12:13
→ Zenopus_ joined12:14
→ PointMan joined12:14
← Zenopus left12:15
Zenopus_ → Zenopus12:15
PointMan Im on a 1 man project, and in my dev cycle I do git checkout -b new_functionality, commits.., git checkout master, git merge new_functionality....should I be using rebase instead of merge? Im having difficulties deciding when to use rebase12:16
Chaser_ If the project is released then I guess merge is better as it doesnt rewrite history12:18
→ lucsky joined12:18
PointMan what if it isnt? The app provides a service to online users12:18
→ Zenopus_ joined12:20
Chaser_ But u still keep track of version numbers right ? Like the currently deployed app is some SHA id etc12:20
Grum PointMan: with rebase you'd get a linear history12:20
← Akufen left12:20
Grum Chaser_: tag it for a version :p12:20
← Zenopus left12:21
Zenopus_ → Zenopus12:21
Chaser_ But the tag doesnt mean the same thing before and after rebase right ?12:21
PointMan I havent tagged anything yet for version numbers, soon I will use it for a diff client thus having to maintain 2 diff branches so Im trying to prepare that the best possible way12:21
→ d0k joined12:22
→ Akufen joined12:25
Grum PointMan: Chaser_: ofcourse you wont tag something you later rebase, well you cold but it makes no sense12:25
you tag something on a release/version/whatever, something which shouldnt change again12:25
→ Zenopus_ joined12:26
← Zenopus left12:26
← stamina left12:26
PointMan grum:well is a linear history a problem? I mean everything in the past and im just 1 guy on the project...12:26
thus Ive never had merge conflics of the sort12:27
Grum PointMan: i sortof like a linear history :)12:27
well i'm guessing all of your merge are fast-forward merges12:27
PointMan Grum: well me too but I think thats because Im an on subversion man so I might not be able to make the right decision as Im a bit biashed12:27
Grum as you are working on a branch and nothing changes on master; then the subsequent merge of that branch and master will be fast-forward12:27
PointMan Grum: yep12:27
Grum ohnoes svn :(12:27
PointMan so what do you think?12:28
Grum well, where you would/could have an actual merge is if you work on 2 changes at the same time12:28
then merge one -- and then the other -- the last one will make an actual merge12:28
→ ehabkost joined12:28
← priidu left12:29
PointMan Grum: agreed, but Ive _always_ worked on 1 branch at a time12:29
and then merge that it in and continue with the next branch/functionality etc12:29
Grum because after it branched of master changed; if you want linear history (which is personal preference -- you could also not care and simply merge) you can rebase the branch and then merge (which will be fastforward again at that moment)12:29
yeah, a merge is always fastforward then PointMan12:29
btw; if you say you will be working for another client12:30
PointMan exactly12:30
yes then i would jump around etc12:30
between branches, causing conflicts mostlikely12:30
Grum yeah, but is it a rebranding of the first product?12:30
because you could opt to just store the differences in a branch for the client and simply rebase that whenever you do a change in master12:30
PointMan the product will be branched into two. Its a rails app so mostlikely the changes will be in the html12:31
→ Zenopus joined12:31
→ priidu joined12:31
Grum i'd simply put all the 'differences' from your main app to your client's app in a single branch and then rebase that12:31
← Zenopus_ left12:31
PointMan well the differences might be spread out on the entire app, presentation and business logic12:32
minor changes but sitll12:32
still*12:32
Grum well you can do minor changes in a branch :)12:32
→ Egelmex joined12:32
Grum the only 'snag' would be that if you were to code a new feature for the client only and later decide you want it on the 'master' as well, then you might need to do some extra work to make it nice looking12:33
PointMan "i'd simply put all the 'differences' from your main app to your client's app in a single branch and then rebase that" Im not sure I understand what you mean by this, mind illuminating me?12:33
well they might go in different directions12:33
Grum well, consider you have changes in some html/code; you create a branch; you put those changes in there12:33
PointMan and diff settings etc12:33
← krynnotaur left12:33
→ krynnotaur joined12:34
Grum PointMan: if they will differ so vastly, maybe 2 repos would be a better idea?12:34
or jsut simply ignore how the history looks and merge/cherrypick commits to hearts content :D12:34
→ afowler joined12:36
→ Zenopus_ joined12:37
PointMan Grum: yeah so far Ive been thinking about 2 repos12:37
← Zenopus left12:38
PointMan and then keeping a remote repo with the common stuff12:38
Grum PointMan: i'd recommend that unless it stays with 'some patches/changes'12:38
then again, from what i remember RoR apps dont really deal with this nicely, they spam shitloads of files all over the place :D12:39
→ ringlej joined12:40
→ zstolar joined12:40
PointMan I would start a discussion if I had the time :p12:41
thanks though :)12:41
← rgr left12:41
→ froschi joined12:41
→ rgr joined12:41
afowler anyway to show uncommitted changes in a repo's submodules inside of `git status`12:41
← rgr left12:41
afowler status.submodulesummary only seems to work after commits are made12:41
→ rgr joined12:42
Grum PointMan: well you can walk multiple paths, doesnt matter that much, you could even have 2 separate repos and cherrypick the things you want12:42
→ Zenopus joined12:42
← xiong left12:42
← rgr left12:42
→ rgr joined12:42
← Zenopus_ left12:43
PointMan Grum: yeah cherrypick e.g. relevant bug fixes12:44
Grum yeah or features .. or whatever :D12:44
PointMan thanks12:44
MarcWeber wereHamster, divVerent I got it know. I didn't knew about ssh hostname aliases. It works. My wrapper didn't push for some reason12:45
← rgr left12:45
→ rgr joined12:45
← rgr left12:45
Grum MarcWeber: .ssh/config makes you do all kinds of nice things =)12:46
← zstolar left12:46
→ rgr joined12:46
→ christophsturm joined12:47
→ marcusb joined12:47
→ Zenopus_ joined12:48
← Zenopus left12:48
← acalbaza left12:49
PointMan Grum: actually cherrypicking might not be the way to go. Say I have 3 repos. ClientA, ClientB and common. ClientA and B are branches of common way back ago. Now bug fixes are added to common and the commits are always relevant to clientA and B. so the clientA and B repos always wants to fetch off the common repo. If I use cherrypicking then I would have to pick each commit off the common repo..it would be better if they could just fetch all the commits12:50
→ parasti joined12:50
Grum well you can, and then merge =)12:51
wereHamster PointMan: checkout clientA; merge common; checkout clientB; merge common ?12:51
PointMan wereHamster: but that assumes they are all on the same repo?12:52
wereHamster then fetch first12:52
← mnyon left12:52
PointMan ok thanks12:53
→ mason_l joined12:53
→ hgimenez joined12:53
← rich97 left12:53
→ Zenopus joined12:53
← Zenopus_ left12:54
→ [1]intripoon joined12:55
← mason-l left12:55
mason_l → mason-l12:55
→ codeswing joined12:55
afowler does jens lehmann occasionally visit here?12:56
codeswing how do I cherry-pick from a forked repository hosted on github12:56
anybody here12:58
Ilari codeswing: Fetch the commits first.12:58
codeswing lll: hmm how to fetch .. my local github repository does not know about remote forked repository12:58
Ilari: ^12:58
Ilari codeswing: Add a remote for it (git remote add <name> <url>)12:59
wereHamster or run 'git fetch <url> <branch>'12:59
→ Zenopus_ joined12:59
← Zenopus left13:00
nonken → nonken_afk13:00
kristian42 Using all the same versions of the software, ONE of my users suddenly started getting "fatal: The remote end hung up unexpectedly". How do I diagnose this?13:01
← intripoon left13:01
[1]intripoon → intripoon13:01
kristian42 During clone13:01
fatal: Early EOF13:01
← froschi left13:01
wereHamster server running OOM?13:01
kristian42 OOM ?13:02
Then why does it work for me ?13:02
marcusb what do the colors in the lines of gitk mean?13:02
kristian42 (A bit slow on the OOM)13:02
wereHamster out of memory13:02
→ yhager_ joined13:02
kristian42 wereHamster: I understood that about 15 ns after asking ;)13:03
wereHamster: The problem is that it works for everyone else13:03
wereHamster: wereHamster Are there any memory options I can tune ? We're coming in via ssh13:04
marcusb: The colours mean nothing, they're just there to make it easier to keep the lines separat13:05
← ankit9 left13:05
← priidu left13:05
→ Zenopus joined13:05
→ priidu joined13:05
wereHamster kristian42: if it works for you and not for him then it's probably not the issue. But running gc in the remote repository wuoldn't hurt (if you haven't done so already)13:05
marcusb kristian42: ah ok thanks.13:06
← Zenopus_ left13:06
← flaguy48 left13:06
kristian42 wereHamster: Yes, I ran fsck & gc13:07
wereHamster: Is there any way I can get the log output of what is happening on the server a bit more verbosely ?13:07
wereHamster kristian42: are you cloning through ssh or git://?13:08
kristian42 ssh13:08
← rgr left13:08
→ rgr joined13:08
wereHamster I think there is a way to debug the communicatoin between the two endpoints13:08
but no idea what you have to set (GIT_TRACE=1 is not it, but you can try it anyway)13:09
afowler kristian42: http://git.or.cz/gitwiki/GitTips#Howtopasssshoptionsingit.3F13:09
(and the options you want to provide are probably ssh -vvv)13:10
→ Zenopus_ joined13:10
← Zenopus left13:11
→ ankit9 joined13:12
← ankit9 left13:12
nonken_afk → nonken13:14
← yhager left13:15
→ Zenopus joined13:16
kristian42 afowler: Can I add options in my ssh config file ? Is that the LogLevel setting ?13:17
← Zenopus_ left13:17
afowler kristian42: not sure if +verbosity is the same as loglevel13:17
→ scarabx joined13:18
← priidu left13:19
kristian42 LogLevel=DEBUG3 did the trick. Thanks13:19
afowler good to know!13:19
→ priidu joined13:20
kristian42 afowler: I'll see if I can understand what's happening too ;)13:20
← cantoma left13:20
→ Zenopus_ joined13:21
← Zenopus left13:22
→ priidu_ joined13:22
← priidu left13:22
→ catalis joined13:24
→ BigMack83 joined13:25
→ aziz joined13:25
→ Zenopus joined13:27
← Zenopus_ left13:28
→ cantoma joined13:29
← kssddy left13:30
← munichlinux left13:30
→ catalis_ joined13:30
→ hummingkid joined13:30
← ph^ left13:30
marcusb something I miss from gitk: it would be useful to be able to compare two branches visually, to see where development diverged13:31
maybe it's possible and I don't know how13:31
wereHamster marcusb: gitk branch1 branch213:31
→ ph^ joined13:31
→ v0n joined13:32
→ Zenopus_ joined13:33
→ auslander joined13:33
← catalis_ left13:33
← Zenopus left13:34
← gunmuc left13:34
← Lisimba left13:35
marcusb wereHamster: it's not as visual as I would like :-/13:35
← ringlej left13:35
marcusb my branch1 is already a proper subset of branch213:35
so looking at the Branches: field does tell me what I need to know13:35
wereHamster so how would you like to visualise it?13:35
marcusb but it seems to me it could be made visually easier to follow13:35
color coding?13:35
background color for commits depending on branch13:36
kristian42 marcusb: what kind of tools/deven are you running in ?13:36
marcusb I run gitk on the command line on Ubuntu 9.10, working on the dbus git tree13:36
wereHamster if branch1 is a proper subset of branch2, then color coding doesn't make much sense13:36
charon marcusb: commits do not have an intrinsic branch membership and can belong to any number of branches at any given time13:36
→ rudi_s joined13:37
charon so that doesn't make any sense13:37
marcusb well, it could color those differently that are in branch2 but not in branch113:37
for this particular case that would help me. I know it's not a generic solution, of course.13:37
part of my problems is that I did not take part in dbus history, and the commit messages are not always clear, and there are few tags. that's not something git can help with, but needs to be done by the committers13:38
→ Zenopus joined13:38
→ priidu joined13:39
← priidu_ left13:39
← rchavik left13:39
→ _Vi joined13:39
nonken → nonken_afk13:40
← Zenopus_ left13:40
← guardian left13:40
→ guardian joined13:41
→ tatsuya joined13:42
← catalis left13:42
→ sumangurung joined13:42
→ Zenopus_ joined13:44
→ rudi_s_ joined13:44
← Zenopus left13:45
→ froschi joined13:46
← tatsuya left13:46
→ beni- joined13:46
← hummingkid left13:47
← rgr left13:48
charon marcusb: if you're interested in only the history of two branches, you can 'gitk --left-right A...B' and it will show little arrows indicating on which side of the symmetric difference the commit came from13:48
→ rgr joined13:48
→ Zenopus joined13:50
← Zenopus_ left13:51
marcusb charon: that's useful, thanks13:51
← rgr left13:52
→ rgr joined13:52
charon also see the --cherry-pick option (in man git-log; many git-log options apply to gitk)13:52
Gitbot charon: the git-log manpage can be found at http://git.or.cz/man/git-log13:52
→ imajes joined13:52
← sumangurung left13:54
→ perlpilot joined13:54
→ testing joined13:54
← vbgunz__ left13:54
testing → Guest6863213:55
Guest68632 hi is it possible to just checkout a single file from a git repo, without having to d/l anything else ?13:55
vkroll_ Guest68632: no13:55
→ Zenopus_ joined13:55
charon Guest68632: only through git archive --remote, which very few servers have enabled, or web frontends like gitweb or cgit13:55
Guest68632 charon, cheers13:56
← Zenopus left13:56
nonken_afk → nonken13:58
← ph^ left14:00
→ PeakerWork joined14:00
→ Zenopus joined14:01
← Guest68632 left14:01
→ cypher23 joined14:01
→ RaceCondition joined14:02
→ catalis joined14:02
← Zenopus_ left14:02
→ ph^ joined14:02
→ jrabbit joined14:03
← rudi_s left14:03
← rudi_s_ left14:03
jrabbit are there any portable git windows ports?14:03
→ vbgunz__ joined14:03
PeakerWork is there an easy way to split a bunch of commits based on subdirectories? I have some library code I touched in the same commits as user code (unfortunately) and I'd like to have all the library improvements separately14:03
(Its in my own private branch)14:04
kristian42 jrabbit: What is a portable port ?14:04
wereHamster PeakerWork: http://github.com/apenwarr/git-subtree14:04
← beni- left14:04
PeakerWork wereHamster: does it work for splitting existing commits?14:05
→ rudi_s joined14:05
wereHamster it splits out a subtree into it's own branch (which can then be extracted into its own repository)14:06
→ remi joined14:07
→ Zenopus_ joined14:07
jrabbit kristian42: I think i found one msysgit has a portablegit14:07
charon huh. i wanted to mention that it should essentially be a thin frontend for filter-branch --subdirectory-filter, but apparently it does a lot more14:07
jrabbit going to see if I can work on my git based project from here14:07
← Zenopus left14:07
jrabbit hope it works14:08
→ hummingkid joined14:09
← catalis left14:09
kristian42 I'm amazed: I told you about 1 hour ago I had this guy with problems cloning over ssh. I know ssh on the server forks a process for each connection, but does it actually keep them alive for re-use too ?14:10
jrabbit it can iirc14:10
the timeout can be set very high14:11
kristian42 So basically he can reconnect to the same process a long time afterwards ?14:11
avtobiff kristian42?!14:11
kristian42 avtobiff: I had this guy who had problems cloning the repo. For no reason, out of nowhere. Everybody else could clone.14:12
→ Zenopus joined14:12
avtobiff kristian42, i wonder if you are KristianL :)14:12
← cypher23 left14:12
jrabbit kristian42: if sshd is configured to do so14:13
kristian42 avtobiff: Not sure I get it... Then I add my ssh key to his account and I can clone from it.14:13
jrabbit but TTYs aren't saved14:13
thats what screen is for14:13
← Zenopus_ left14:13
→ Lisimba joined14:13
kristian42 Then just suddenly, he can clone too. Out of nowhere. The only change I did was to add my ssh key to his authorized_keys14:14
← kpreid_ left14:14
→ kpreid_ joined14:14
← hgimenez left14:16
→ bdimcheff joined14:17
← perlpilot left14:17
← Zenopus left14:18
→ Zenopus_ joined14:18
→ LiamH joined14:18
Zenopus_ → Zenopus14:18
→ simNIX joined14:19
→ notjohn joined14:20
← scarabx left14:21
← aCiD2 left14:22
← nothingHappens left14:23
→ sourcemaker joined14:23
→ Zenopus_ joined14:24
← numbah left14:24
← Zenopus left14:24
→ nothingHappens joined14:27
→ el-cuco joined14:27
→ larsl joined14:28
→ Zenopus joined14:29
→ whaley joined14:29
larsl I have a repository that contains some tens of thousands of files, and adds and commits are sometimes very slow even if only a few files are added or committed. Is there any way to tweak the settings to speed it up?14:29
jrabbit ah wodnerful it works perfectly14:30
← jrabbit left14:30
→ werns joined14:30
← Zenopus_ left14:30
→ TeckniX joined14:31
← ntoll left14:32
← werns left14:32
Ilari larsl: Windows?14:33
→ max_halifax joined14:33
→ ctusar joined14:34
← Zenopus left14:35
→ Zenopus joined14:35
→ maxter joined14:35
max_halifax Hi dear git users, got a question about gitosis, trying to install this beast, when trying to execute this sudo -H -u git gitosis-init < /tmp/id_rsa.pub getting this error: ERROR:gitosis.app:Unable to read config file: [Errno 13] Permission denied: '/opt/git/.gitosis.conf' it seems that all permissions are fine14:35
← BigMack83 left14:38
→ numbah joined14:39
→ jasonn1234 joined14:39
larsl Ilari: Linux.14:39
← nullvariable left14:39
→ ringlej joined14:39
← cuco left14:40
← agile left14:40
larsl There are a lot of binary files as well, I don't know if that's relevant.14:40
wereHamster max_halifax: use gitolite instead of gitosis, it's much better supporte14:40
→ yaotti joined14:40
← Zenopus left14:40
→ Zenopus_ joined14:40
← sourcemaker_ left14:40
← bdowning left14:41
→ nullvariable joined14:42
→ bdimcheff_ joined14:42
larsl Come to think of it, the binary files don't really need versioning since they never change once they're added, it would be enough to just keep a manifest listing the binary files in the repository and actually store them somewhere else.14:42
Maybe I'll try that.14:42
← drv_ left14:42
← bdimcheff left14:43
bdimcheff_ → bdimcheff14:43
→ spearce joined14:43
→ Zenopus joined14:46
← parasti left14:46
m-takagi_ → m-takagi14:46
← Zenopus_ left14:47
← el-cuco left14:48
← bdimcheff left14:48
max_halifax wereHamster: thanks will try that,gitosis seems to be a pain in ass14:48
→ mm_work joined14:50
→ bdowning joined14:50
← yaotti left14:50
→ yaotti joined14:51
→ cannonball joined14:51
→ Zenopus_ joined14:52
← Zenopus left14:53
→ mnyon joined14:55
→ guest_007 joined14:55
guest_007 hello, how to make git clone ssh://user@path/ to ask me for password? it stops after "created empty repo.."14:56
← yaotti left14:56
← giallu left14:57
← jmspeex left14:57
reto` i tag before the commit, right?14:57
→ Zenopus joined14:57
→ jfkw joined14:57
wereHamster reto`: depends on what you want to tag14:58
if you want to tag the commit then obviously you have to commit first14:58
→ jmspeex joined14:58
← Zenopus_ left14:58
reto` ah... so for a release I tag the commit...14:59
→ giallu joined14:59
guest_007 fixed, nevermind14:59
larsl reto`: Tags are separate from commits, they are "live" immediately after you've run "git tag".14:59
→ merlin83 joined14:59
→ kukks joined14:59
larsl You need to push them separately too (git push --tags).15:00
← helmut left15:01
→ helmut_ joined15:01
reto` hmm... but the tag will be valid for the instant I applied it?15:01
→ WebDragon joined15:01
→ MacGyverNL_ joined15:01
← cedricv left15:03
← segphault left15:03
→ Zenopus_ joined15:03
→ smuf joined15:03
← Zenopus left15:04
← AAA_awright left15:04
→ AAA_awright joined15:04
→ hipe joined15:04
→ sumangurung joined15:04
← MacGyver_ left15:05
← sumangurung left15:05
→ sumangurung joined15:05
← ph^ left15:05
larsl reto`: What do you mean by "valid"?15:06
wereHamster you can tag anything, it doesn't need to be HEAD15:06
you can tag any commits, trees or blobs (even those from the past)15:06
← Pupeno left15:07
reto` so when I run git tag v1.015:07
is the current state tagged?15:08
wereHamster it creates a lightweigt tag which points at the same commit as HEAD15:08
→ Zenopus joined15:09
← Zenopus_ left15:09
nonken → nonken_afk15:09
nonken_afk → nonken15:09
→ lake joined15:09
← cannonball left15:11
→ agile joined15:11
→ neldoreth_ joined15:13
→ lfranchi_ joined15:13
lake Hi all, could anyone tell me a way to checkout a file from a single file from a commit? I have the commit hash of where the file was deleted...15:13
→ karihre_ joined15:13
← intripoon left15:13
lake /s/checkout a file from/15:13
← aziz left15:13
← tychoish left15:13
← deavid left15:13
← nothingmuch left15:13
← seezer left15:13
← Kudos left15:13
← edsu left15:13
← cenuij left15:13
← rtyler left15:13
← reuss left15:13
← tom___ left15:13
← Tuomas left15:13
← WebDragon left15:13
← neldoreth left15:13
← LotR left15:13
← kbingham_ left15:13
← mikkom_ left15:13
← vesech left15:13
← logankoester left15:13
← rvsjoen left15:13
← karihre left15:13
← remi left15:13
← MrMagic left15:13
← lfranchi left15:13
← GarethAdams|Work left15:13
← binjured left15:13
← Tank` left15:13
← RickXy left15:13
→ mstormo joined15:13
→ vesech joined15:13
← zjason left15:13
→ logankoe1ter joined15:13
→ intripoon joined15:13
→ geeKISSexy joined15:13
→ zjason` joined15:13
→ seezer joined15:13
→ MrMagic joined15:13
→ edsu joined15:13
→ remi joined15:14
→ Kudos joined15:14
→ aziz joined15:14
→ deavid joined15:14
→ reuss joined15:14
→ binjured joined15:14
→ nothingmuch joined15:14
→ tom joined15:14
→ tychoish joined15:14
→ bantic joined15:14
→ mikkom_ joined15:14
→ rvsjoen joined15:14
→ cenuij joined15:14
→ Tuomas joined15:14
→ LotR joined15:14
→ rtyler joined15:14
lake this solves my issue: git checkout <deleting_commit>^ -- <file_path>15:14
thanks all15:15
→ Zenopus_ joined15:15
→ WebDragon joined15:15
← jasonn1234 left15:15
→ beni- joined15:15
← Zenopus left15:15
nonken → nonken_afk15:16
nonken_afk → nonken15:16
→ AAA_awright_ joined15:17
→ loincloth joined15:17
← AAA_awright left15:18
← intripoon left15:18
← unreal left15:18
→ unreal joined15:18
← stepnem left15:18
→ mastroDani joined15:18
→ stepnem joined15:18
← SRabbelier left15:18
→ aptituz_ joined15:18
→ SRabbelier1 joined15:18
→ intripoon joined15:18
→ Dataforce` joined15:18
← beni- left15:18
← robinsmidsrod1 left15:19
← mastro left15:19
← aptituz left15:19
← Dataforce left15:19
Dataforce` → Dataforce15:19
← reto_ left15:19
→ jasonn1234 joined15:20
→ robinsmidsrod joined15:20
← _Vi left15:20
→ Zenopus joined15:21
→ GarethAdams|Work joined15:21
← Zenopus_ left15:21
→ reto_ joined15:21
← d0ugal left15:22
← anno^da left15:23
← Araneidae left15:24
→ d0ugal joined15:25
← Aldwuin left15:26
→ Zenopus_ joined15:27
← Zenopus left15:27
→ madewokherd joined15:28
→ cannonball joined15:29
→ kbingham_ joined15:29
larsl If I want to rewrite history so that all files in the directory "foo/" are excluded from the repository, something like 'git filter-branch --tree-filter "rm -rf foo/" HEAD' should work, right?15:30
← robinbowes left15:30
Aides larsl: yep15:31
→ cirwin joined15:31
larsl Thanks.15:31
Aides larsl: although there is a faster alternative15:31
larsl There is?15:31
→ Tank` joined15:31
cirwin can I take the commit at the head of one branch and apply it to another?15:31
afowler larsl: Aides: git filter-branch --index-filter "git rm -r -f --cached --ignore-unmatch ABC" --prune-empty HEAD15:32
→ beni- joined15:32
afowler == the faster15:32
Aides cirwin: git cherry-pick15:32
larsl cirwin: Yes, cherrypick.15:32
cirwin :)15:32
ok15:32
thanks15:32
cirwin was trying to get rebase to do it and failing miserably15:32
→ Zenopus joined15:33
← Zenopus_ left15:33
→ aresnick joined15:34
larsl Aides: Interesting. Since index-filter doesn't check anything out -d would be a no-op there, right?15:34
afowler: ^15:35
Sorry.15:35
Aides larsl: what is a "-d"?15:35
afowler -d?15:35
larsl I mean, I wouldn't gain anything by adding -d /dev/shm/foo to that command.15:35
→ anno^da joined15:35
larsl -d tells filter-branch where to store temporary data.15:36
afowler ooh -- yeah -- i've never bothered with -d15:36
Aides yeah, most probably you would gain nothing15:36
afowler but you're right, i don't think it would, because the data stored in -d is only the checkout, which is nil with index-filter15:37
← perk left15:37
→ Zenopus_ joined15:38
← Zenopus left15:39
→ Mezner01 joined15:39
larsl Well, there it runs... we'll see how it goes.15:40
→ Richardigel joined15:41
Mezner01 → Mezner15:41
Richardigel hi, after git fetch, how do i see the difference between my last local version and the newly fetched head?15:42
← kkoehne left15:42
KiBi git log ..origin/$branch15:43
← niki left15:44
← nullvariable left15:47
→ nullvariable joined15:48
← mnyon left15:48
→ tedoc2000 joined15:50
→ meanburrito920_ joined15:51
← codeswing left15:53
→ Rolenun joined15:54
← Adlai left15:54
aidan My merge failed, how can I grab the file from master and disregard the attempted merge file?15:54
git show :2:myfile.foo doesn't work "unknown revision or path not"15:55
→ tremby joined15:55
← hipe left15:55
tremby the current diff is confusing me. how do i run a vimdiff instead? ie i need the unedited file alongside the current one15:56
→ jrmuizel joined15:56
→ corni joined15:57
→ aspotashev_ joined15:57
wereHamster aidan: git checkout --ours or --theirs <file>15:58
← cirwin left15:58
← aspotashev left15:58
aspotashev_ → aspotashev15:58
← PointMan left15:59
→ vals_ joined16:00
← aziz left16:00
← zoniq_ left16:03
→ brodyberg joined16:03
← tremby left16:03
→ zoniq_ joined16:04
→ jjuran joined16:04
← meanburrito920_ left16:06
RobertLaptop siteram are you around?16:06
Ilari RobertLaptop: Get the name right and highlight might even work.16:07
→ kinabalu joined16:07
Ilari :-)16:07
→ meanburrito920_ joined16:07
RobertLaptop Yea.16:07
Ilari is has been a very long morning.16:07
→ jlilly joined16:08
lfranchi_ → lfranchi16:08
RobertLaptop Sitaram are you around still?16:08
→ Alagar joined16:08
← anno^da left16:09
Grum RobertLaptop: just send him a pm if you need *him* if you have a general question maybe other people could help?16:10
RobertLaptop It is regarding the change to @shell16:10
→ gebi joined16:10
RobertLaptop I will catch him tonight16:11
Grum prolly leaving a message would be the best ;) (and obviously then idling until he is here =))16:11
larsl Oh. That filter-branch command removed all the files from the working directory as well.16:11
← tango_ left16:11
→ Aldwuin joined16:12
→ juan_arandaalvar joined16:12
Grum larsl: what did you type? :D16:12
→ JoeConyers joined16:12
→ ph^ joined16:12
← psoo left16:13
sitaram RobertLaptop: hi16:15
Grum omigosch a sitaram!16:15
sitaram feels ashamed at not being on more often :(16:15
Grum you idle profoundly! so that is good :D16:16
← cannonball left16:16
sitaram Grum: not really. My broadband has been down for the last 4 days; came back today... :( [very, very, rare, by the way... I've never had this much downtime; it was a noisy DSL line...]16:16
→ hipe joined16:16
Grum dang that sucks :(16:17
RobertLaptop Hi Sitaram I was wonder if I had both @shell command if there would be any issue for a few days well update progate?16:17
Grum but welcome back :D16:17
sitaram Grum: :) thanks!16:17
→ tstclair joined16:17
← giallu left16:17
← tek left16:18
→ tekky joined16:18
sitaram RobertLaptop: "both @shell command" didn't parse16:18
Richardigel hi, is there a way to make my default repo "default". if i type git fetch, i want to fetch my default repo16:19
Ilari RobertLaptop: origin is the default default remote.16:19
Richardigel: origin is the default default remote.16:19
Richardigel Ilari: so i should just rename my default remote to origin? oki.16:20
RobertLaptop According to your commit notes you changed @SHELL to $SHELL_USERS with there be any problems including both until I am certain my repo's are updated?16:20
← whaley left16:20
RobertLaptop sitaram ^^^16:20
sitaram RobertLaptop: the old syntax is just ignored; it doesn't do anything any more, so by all means leave it in as long as you want16:20
→ whaley joined16:20
Ilari RobertLaptop: But higher priority than 'use origin' is the remote containg the branch current branch tracks.16:21
Aargh.16:21
Richardigel: But higher priority than 'use origin' is the remote containg the branch current branch tracks.16:21
RobertLaptop sitaram just making sure you didn't put any error checks for the old sytex16:21
→ Bass10 joined16:22
Richardigel Ilari: ehh, not sure i understood that. are you suggesting to make a tracking branch?16:22
sitaram RobertLaptop: no16:23
→ kipras joined16:23
Ilari Richardigel: The order (highest to lowest priority) remotes are used are: 1) Explicit remote on command line. 2) Remote containing tracking branch. 3) Origin.16:23
RobertLaptop siteram thanks. I will update later today.16:23
→ cannonball joined16:24
sitaram RobertLaptop: what IRC client do you use?16:24
Alagar happy pongal16:25
sitaram Alagar: thanks :)16:25
RobertLaptop sitaram xchat16:25
sitaram Alagar: same to you, of course!16:25
→ WebDragon|away joined16:25
teukka sitaram: great to have you back. i was already wondering what happened to the promised commits =)16:25
sitaram RobertLaptop: try typing "sit" and then hitting the tab key...16:25
RobertLaptop sitaram, Yea that works.16:25
← WebDragon left16:26
→ lresende joined16:26
sitaram teukka: sorry...!16:26
RobertLaptop I just forgot to use it most of the time.16:26
WebDragon|away → WebDragon16:26
teukka sitaram: no problem on my side. just wondering what happened =)16:27
sitaram teukka: some personal life issues... :)16:27
guest_007 I did "git clone ssh://myrepo" on my server then i did thanges to head, then i do on server" git fetch" - it fetches something, but files stay intact. what do i do wrong?16:28
← tekky left16:28
→ guardian_ joined16:28
→ tek joined16:28
Ilari guest_007: Nothing. Fetch doesn't merge.16:28
guest_007 what is the way to mirror updates to the server?16:29
Ilari guest_007: To server?16:29
guest_007 oh, nevermind. git pull16:30
Ilari guest_007: If its non-interactive, fetch + reset (not pull!).16:30
guest_007 ahh16:30
→ giallu joined16:30
Ilari guest_007: pull is fetch + merge, and can conflict.16:31
guest_007 yes, that's what i am missing. i just want to mirror changes16:31
Ilari guest_007: If you don't need working copy, just don't have one.16:32
→ ntoll joined16:32
→ schacon joined16:33
→ aziz joined16:34
→ catalis joined16:35
← guardian left16:35
guardian_ → guardian16:35
→ d2dchat joined16:35
→ onigiri__ joined16:37
← larsl left16:37
← galderz left16:38
sitaram Grum: http://github.com/sitaramc/gitolite/commit/a9824464e5729f1c8b031b491c384a49a199d4ff -- enjoy the commit message16:40
→ hyperair joined16:40
sitaram divVerent: you too ^^ :)16:40
guest_007 Ilari: thank you16:40
→ mnyon joined16:41
→ flixr joined16:42
flixr hi16:42
← ixti left16:43
Ilari ...16:43
Rolenun hey Ilari, I'm beginning to think you work here fulltime ;)16:44
sitaram sometimes wondered if Ilari was, like Shakespeare is often rumoured to be, multiple people operating as one name :)16:45
→ Ghost_of_FP joined16:45
Rolenun lol16:45
Ghost_of_FP Hello folks. I was looking for some context on why post-upload-hook was removed.16:46
Any pointers?16:46
Ilari Ghost_of_FP: At least the official reason was "it is security problem"...16:47
← Chaser_ left16:47
Ghost_of_FP Ilari, I was trying to understand what that problem was because I need something like a pre-upload-hook16:47
← marcusb left16:48
Ghost_of_FP And I need that in order to disallow a clone from scratch16:49
← aidan left16:50
→ jlilly_ joined16:51
→ dennda joined16:51
dennda How can I check, line by line, what will be committed if i do git commit?16:51
Bombe git diff --cached16:51
divVerent sitaram: thanks16:52
sitaram :)16:52
divVerent makes me "feel better" to define exactly where people can write16:52
even though most people won't abuse it16:52
→ lightcap_ joined16:52
sitaram divVerent: :) no problem16:52
sitaram wonders if there is an award for "highest ratio of commit message length to code change" :)16:52
dennda Bombe: ok that cached thing looks different from the file's actual contents. (because i added it and changed it then). how do i get only the newest version of that new (!) file into my commit?16:53
Bombe dennda, git add it again.16:53
→ alley_cat joined16:53
Bombe dennda, when you use git add the current state is saved in the index, and the index is what is being committed.16:53
← onigiri_ left16:53
Ilari Ghost_of_FP: Well, if you control the environment, you could add the hook... I don't think the security issues apply in that case.16:54
Ghost_of_FP Ilari, ah. I was hoping to be able to submit that patch as well.16:55
→ WALoeIII joined16:56
dennda Bombe: thank you16:56
Ilari Ghost_of_FP: I would guess same kind of security problems would affect pre-upload hook as affected post-upload hook.16:57
← juan_arandaalvar left16:58
Ghost_of_FP Ilari, presumably that the hook could do arbitrary things as the user?16:58
→ codeswing joined16:59
Ghost_of_FP Ilari, I mean presumably, that's the problem?16:59
→ pheaver joined16:59
Ilari Ghost_of_FP: Presumably something related to that.16:59
← WALoeIII left17:00
← vbgunz__ left17:00
Ilari Ghost_of_FP: Probably related to group-accessable repos (there security issues with hooks are most severe).17:01
→ sh1mmer joined17:02
← marc_kdab left17:03
← notjohn left17:05
← pencilo left17:05
→ sgh joined17:05
→ c_axis joined17:06
← hyperair left17:06
← jlilly left17:06
jlilly_ → jlilly17:06
nonken → nonken_afk17:06
→ notjohn joined17:07
→ dreiss joined17:07
→ swisherpop joined17:08
→ munichlinux joined17:08
→ amerine joined17:09
guest_007 Ilari: git reset does not help, even git reset --hard does not do enything (it shows correct commit comment)17:10
→ hyperair joined17:10
← tbf left17:10
← hipe left17:10
Ilari guest_007: Specify the correct commit to update to (origin/foo or so)?17:10
→ hipe joined17:11
→ bcardarella joined17:11
guest_007 Ilari: indeed, i tried HEAD w/o origin.17:11
→ montylounge joined17:12
Ilari guest_007: Yeah, that probably won't do much...17:12
→ project2501a joined17:14
← beni- left17:14
→ et joined17:17
← EricInBNE left17:17
et how do you suppress untracked files from the "git status" output?17:17
GarethAdams|Work et: add a matching pattern to your .gitignore file17:18
→ Theravadan joined17:18
← amerine left17:18
GarethAdams|Work et: that will stop git trying to do anything with them17:18
→ juan_arandaalvar joined17:18
← froschi left17:18
et that is not really feasible ...17:19
← sitaram left17:19
→ sitaram joined17:19
→ anno^da joined17:19
→ ixti joined17:19
← schacon left17:20
→ defectiv joined17:20
→ kumbayo joined17:20
← Bennid left17:21
→ altrux joined17:21
← marcoecc left17:21
→ benjy joined17:22
→ marcoecc joined17:23
← jonmasters left17:25
← stick left17:25
→ stick joined17:25
← teknotus left17:27
← catalis left17:27
→ teknotus joined17:27
→ sh1m joined17:27
→ WALoeIII joined17:27
← montylounge left17:27
← tek left17:28
→ tekky joined17:28
← oliver3 left17:30
← hadees left17:31
nonken_afk → nonken17:31
→ schierbeck joined17:32
→ tek joined17:32
← tekky left17:32
→ carrus85 joined17:33
→ daeaglebeagle joined17:33
daeaglebeagle i love git. just sayin.17:33
← lohrun left17:33
afowler daeaglebeagle: i love beagles!17:34
← cannonball left17:35
fr0sty et: can you elaborate?17:35
daeaglebeagle afowler: me too. lol17:35
← sh1mmer left17:35
sh1m → sh1mmer17:35
fr0sty et: .gitignore exists to do exactly what you asked.17:35
mastroDani → mastro17:35
→ RaceCondition_ joined17:36
nonken → nonken_afk17:38
← ntoll left17:38
→ numberGrey1 joined17:39
→ WebDragon|away joined17:40
← numberGrey left17:40
← RaceCondition left17:40
RaceCondition_ → RaceCondition17:40
→ dfr|work joined17:41
← d0ugal left17:43
→ jonmasters joined17:45
→ DavidKlein joined17:45
← hyperair left17:46
nonken_afk → nonken17:47
→ marc_kdab joined17:47
← dreiss left17:47
→ hyperair joined17:49
← onigiri__ left17:50
et fr0sty: the answer to my question is "git status -uno"17:50
← daeaglebeagle left17:50
dfr|work hey all. So I have a feature I was implementing in a branch that I later merged in the master. however it turned out that it's unnecessary, so I'd like to undo it.17:51
← guardian left17:52
← WebDragon left17:52
WebDragon|away → WebDragon17:52
→ oliver3 joined17:52
dfr|work the master was already pushed upstream to complicate things... what options do I have? I mostly can think of just git revert =/17:52
→ ruediger joined17:52
← gebi left17:52
→ Theory joined17:53
Theory Does anyone know if there is a build of msysgit anywhere with git-svn that uses subversion 1.5 ?17:53
→ patmaddox joined17:54
nonken → nonken_afk17:54
→ Makis joined17:54
Makis hi, how do i report a bug in git? i found one but can't find the mailing list for this...17:54
Ghost_of_FP Makis, see the topic :)17:55
← jrmuizel left17:56
→ nadavoid joined17:56
Makis [email@hidden.address]17:56
Ghost_of_FP Yep17:57
dfr|work actually, seems like http://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt specifically discusses it. thanks.17:58
Makis do i need to subscribe or anything & any rules to follow? sorry, i have only reported linux related buge via Launchpad...17:58
Ilari Makis: No need to subscribe.17:58
→ catalis joined17:58
Ilari Makis: And as for rules, don't post HTML (even with text alternative).17:58
← tek left17:58
Makis of course not :)17:59
→ tekky joined17:59
Makis ok, i'll send a message to that list17:59
← mastro left18:00
Ilari Makis: Oh, and the list uses greylisting, so the first message takes a while to get there.18:01
Makis ok, i have an interesting bug related to the file ignoring :)18:01
← sgh left18:02
vals_ → tango_18:02
← maxter left18:02
← brodyberg left18:03
→ _Mica_ joined18:03
dfr|work so about branch merge reverts... Does it always show up in the log message? =/18:05
rather the merging of two branches?18:05
← pheaver left18:05
dfr|work or is my question sort of silly? =/18:06
→ PointMan joined18:07
← sde_antrix left18:07
→ maxter_ joined18:07
← bentob0x left18:08
← Zenopus_ left18:08
← gitte left18:10
→ queso joined18:12
→ godsflaw joined18:12
queso if I'm in the middle of a merge and have just completed fixing a merge conflict, what do I do to finish the merge?18:12
← petrux left18:12
dfr|work queso, git commit ?18:12
queso, you also need to label the fixed files by git add <file>18:12
queso dfr|work: so like a regular commit?18:13
davr dfr|work: yes, when you make a merge, it will show up as a commit.18:13
dfr|work davr, seems like I had a merge that just fast-forwarded... =/18:13
queso dfr|work, davr: okay, thanks -- I didn't know if there was something special I had to do18:13
dfr|work davr, so I see the commits of the other branch but no actual log message of the merge. =/18:13
→ niki joined18:14
davr dfr|work: that's the easiest kind of merge should be a :) and not a =/18:14
dfr|work davr, right. So how do I undo it? git reset and then push it upstream? =/18:14
→ ecwNick joined18:15
dfr|work there were some commits there-after as well. =/18:15
davr dfr|work: if you don't mind leaving it in your history, git revert is better18:15
dfr|work okay.18:15
davr, so just git revert commit by commit all the commits the merge introduced?18:15
Ghost_of_FP → Ford_Prefect18:15
→ tek joined18:15
davr yeah, that should work. I'm not sure if revert has an option to do a range of commits or not, I've only used it for single commits before18:15
dfr|work it doesn't.18:16
← tekky left18:16
← queso left18:16
davr well, I guess you could revert all the commits, then before you push, you could rebase/squash them into a single commit18:16
but that's not required18:16
dfr|work davr, thanks, that's a good idea. Lemme play with it. :)18:17
← max_halifax left18:17
→ codeswin_ joined18:19
← marcoecc left18:19
→ ereslibre joined18:20
→ snearch_ joined18:21
→ nsussman joined18:21
→ sagsousuke joined18:21
→ pantsman joined18:22
→ javatexan joined18:23
← lightcap_ left18:24
→ bcardarella_ joined18:26
← bcardarella_ left18:26
→ makeworkeasy joined18:26
→ Chillance joined18:26
← codeswing left18:27
← nickrw left18:27
→ Laibsch joined18:27
← javatexan left18:28
→ malumalu joined18:28
Laibsch I'm seeing frequent errors on "git pull --rebase" of the form "fatal: The remote end hung up unexpectedly" when pulling from git://git.openembedded.org/openembedded. Upon retrying, everything works fine most of the time. I know the machine is idle. Can you guys shed some light on what may be causing this?18:28
← kipras left18:29
Aides packet loss?18:29
→ kipras joined18:29
Aides or remote daemon crash18:29
codeswin_ → codeswing18:30
→ lucsky_ joined18:31
→ ChezaWho joined18:31
← lresende left18:31
← munichlinux left18:32
ChezaWho Is there a way to get a side-by-side listing of changes to a file? (analogous to the --side-by-side switch to the unix "diff" command)?18:32
← snearch_ left18:34
← zoniq_ left18:34
→ snearch_ joined18:34
← snearch_ left18:34
← wolog left18:34
→ zoniq_ joined18:34
← bcardarella left18:35
← tek left18:35
→ tekky joined18:35
← madewokherd left18:35
← Richardigel left18:36
→ keystr0k joined18:37
← c_axis left18:38
Laibsch Aides: Thank you for your answer and joining me in contemplating what may be wrong there (I can actually admin the openembedded.org server, I should add)18:38
I can't imagine it being packet loss.18:38
ping does not show any18:38
How would I see if the daemon is crashing?18:38
an immediate retry usually works18:38
well, it's 50:5018:38
the connection succeeds in about 50% of the cases18:39
So, one out of four times, I will have to retry twice18:39
but sometimes even more18:39
although that's rare18:39
I have root on the box, but did not install the git server18:39
I wonder if it's a timing issue. The server is across the pond18:41
ping of 228 ms18:41
stable18:41
davr ChezaWho: http://lmgtfy.com/?q=git+diff+side+by+side&l=118:41
← zoniq_ left18:42
davr Laibsch: maybe try transferring a large file using ssh or ftp or something, see if you run into any errors there? at least it will narrow down the problem a bit18:42
→ kennethlove joined18:43
→ jlogsdon joined18:43
Laibsch davr: thank you for your thoughts. I regurly scp files from the machine to my local box18:43
→ |_z3r0_| joined18:43
Laibsch Never have any issues18:43
Let me see if the git daemon has any log18:43
→ jmcantrell joined18:44
← corni left18:44
|_z3r0_| hi all. When giving the comand "git push" after i cloned a repository, i get this error -> http://gist.github.com/27738418:45
Laibsch There are 40 git-upload-pack processes "running". None of them seem to do anything. Is that normal?18:45
ChezaWho davr: thanks. I had been trying to find a way to do it w/o one of the graphical tools, and hadn't thought of vimdiff. lmgtfy.com is funny too.18:46
→ zoniq_ joined18:46
← lucsky left18:46
davr ChezaWho: I like to use it when the answer to a question comes up as the first result on google :P18:47
← SRabbelier1 left18:47
ChezaWho davr: (egg on face). I had already googled for this, but however I asked the question, *that* link didn't come up for me.18:47
← smuf left18:48
reto` |_z3r0_|: git:// is read only18:48
|_z3r0_|: you'll have to use ssh or http (with webdav)18:49
← Guest66580 left18:49
reto` pushers18:49
Ilari There's smart HTTP support in 1.6.6 as well.18:50
→ snearch_ joined18:50
reto` Ilari: ah... no hook anymore?18:50
Ilari reto`: ?18:51
← snearch_ left18:51
→ snearch_ joined18:51
reto` Ilari: well... with http/webdav you had to use a hook to update the repo18:53
→ pheaver joined18:53
Ilari reto`: Hooks didn't work with webdav.18:53
→ ereslibre_laptop joined18:53
reto` Ilari: oh, good I didn't try it any further... switched to ssh18:54
Ilari: but what do you mean by smart http support?18:54
← catalis left18:54
Ilari reto`: With smart http, currently only password auth is supported. Hooks run but can't pass output back to client.18:54
← reprore left18:54
→ psoo joined18:55
|_z3r0_| so every time i clone a repository i can't push to it if i make changes?? doesn't sound right18:55
Ilari reto`: HTTP with CGI script acting as support on server end.18:55
|_z3r0_|: $faq non-bare ?18:56
Gitbot Ilari: Pushing to non-bare repositories is discouraged. See http://git.or.cz/gitwiki/GitFaq#non-bare18:56
→ dreiss joined18:56
|_z3r0_| don't understand... kinda newbie on using git here :S18:57
Grum i wonder what would the motivation be behind choosing webdav over ssh18:57
reto` |_z3r0_|: you can push... but not with the git protocol... setup your git repo with ssh18:57
Ilari Grum: SSH being blocked?18:58
Grum then tunnel it over the davport!18:58
davr |_z3r0_|: there are several protocols for communicating with remote git repositories. the git:// protocol does not allow pushing. ssh:// does, and with some setup, http:// does too18:58
Ilari Grum: Or even all direct connectivity being blocked and only access being over HTTP proxy...18:58
reto` Ilari: tunnel through http proxy18:59
← tvw left19:00
→ schacon joined19:00
|_z3r0_| ok, solved19:00
i used "git init" and pushed setting up from 019:01
← schacon left19:01
|_z3r0_| but if i clone the repository it doesn't let me use the simple "git push" whilst instead doing it the way i did, it lets me19:01
Ilari |_z3r0_|: You should have used 'git init --bare'.19:01
|_z3r0_|: (to create the repo you push to).19:02
|_z3r0_| ok, now i know. Thanks19:02
→ Tureba joined19:03
← codeswing left19:03
← benjy left19:06
→ benjy joined19:06
→ [tla] joined19:09
→ drizzd_ joined19:10
[tla] Hi. What is the easiest way to determine (from the command line) whether a commit in branch A has been merged into branch B? Thanks19:10
← Theravadan left19:12
dwmw2_gone → dwmw2_LHR19:12
→ schacon_ joined19:13
← schacon_ left19:13
→ thiago_home joined19:13
← benjy left19:13
→ parasti joined19:14
← LRN left19:14
← aleray left19:14
← vinse left19:15
→ benjy joined19:15
jmcantrell if i'm in the middle of a conflicted merge, how can just take all of the remote changes and discard my own?19:15
→ LRN joined19:15
→ aleray joined19:15
← benjy left19:17
→ benjy joined19:17
→ anjen joined19:18
← lake left19:18
davr do you want to discard all of your changes, or only discard your conflicted changes?19:19
jmcantrell davr: only the conflicted, i guess19:20
← benjy left19:20
→ benjy joined19:20
jmcantrell i want to use the remote changes as the authority19:20
davr actually there's a flag to git checkout you can use19:21
← fujin left19:21
davr git checkout --theirs19:21
→ wolog joined19:21
davr so I think "git checkout --theirs ." run from the top level working directory should discard all of your conflicted changes19:22
jmcantrell davr: oh, cool19:22
thank you19:22
← SolarWar left19:23
→ jschoolcraft joined19:23
→ Yuuhi joined19:23
→ MetaCosm joined19:24
→ SolarWar joined19:24
← MetaCosm left19:25
← nsussman left19:25
→ MetaCosm joined19:25
→ Sky[x] joined19:26
← drizzd left19:26
→ WebDragon|away joined19:27
→ reidab joined19:27
← |_z3r0_| left19:27
→ lake joined19:28
→ javatexan joined19:29
→ guardian joined19:29
← Ford_Prefect left19:29
← WebDragon left19:29
→ hakunin joined19:30
← LRN left19:30
→ brizly joined19:30
→ Ford_Prefect joined19:31
→ LRN joined19:31
→ amerine joined19:32
← numberGrey1 left19:39
→ Zephyrus joined19:39
← lake left19:40
→ max_halifax joined19:40
logankoe1ter → logankoseter19:40
logankoseter → logankoester19:40
max_halifax guys is anyone familiar with gitolit?19:40
gitolite I mean19:40
→ Richardigel joined19:42
Grum dont ask to ask, feel free to ask your question :D19:42
← Makis left19:43
← ereslibre_laptop left19:43
max_halifax I've installed gitolite today, done everything as described in installation guide, cloned gitolite-admin repository on my workstation changed some configuration parameters there,commited them and pushed them to repository. But config on a server which stores here: /opt/git/.gitolite/conf/gitolite.conf Haven't changed. What can be a problem?19:46
→ L_R_N joined19:46
Grum no executable bit on the hook19:47
← LRN left19:47
max_halifax you mean on a server19:47
Grum the update hook on the server is for some reason not executable19:48
anjen Hi, still pretty new to git and haven't absorbed everything quite yet...if I want to drop the latest changes (made by the other contributor) from a github repro to my local workspace, I use "git pull master origin", right?19:48
Grum check: /opt/git/repositories/gitolite-admin.git/hooks/update -- should have +x19:49
amd just to prevent sillyness, you sure the push was succesful?19:49
anjen That is, git pull master origin should merge the changes @ git with my current work locally, yes?19:50
max_halifax Grum: Yep I understand what you mean, same thing happens sometimes with gitosis.19:50
Ilari anjen: That fetches master from origin and merges it into current branch.19:50
Grum anjen: other way around with the arguments19:50
rvsjoen anjen: im pretty new myself, but it sounds right to me19:50
→ polyrhythmic joined19:50
Ilari Ah yes, the arguments should be other way around.19:51
Grum 'master origin' should be 'origin master' afaik19:51
← Richardigel left19:51
← ctusar left19:51
max_halifax Grum: on workstation [root@fleetwood conf]# git-push gitolite:gitolite-admin Last lines: Writing 4 objects... 100% (4/4) done19:51
polyrhythmic hello, I apologize in advance for this completely noob question. I'm trying to clone this project, what is the url I give to git? http://androidhtc.git.sourceforge.net/git/gitweb.cgi?p=androidhtc/camera.git;a=summary19:51
anjen thansk Ilari Grum rvsjoen ...So "origin" means "the source located at gihub", and master refers to my ,ocal copy?19:51
*local19:52
Grum anjen: 'origin' is the remote19:52
anjen Grum, thanks!19:52
Ilari anjen: origin is where you cloned from (unless you have changed where it points to). And master is name of branch (on remote side in this case!)19:52
← mithro left19:53
→ jrmuizel joined19:53
→ Twisted_Mentat joined19:53
polyrhythmic I've pulled code from repos before with git but I can't seem to find the URL for this one19:54
max_halifax Grum: there is not hooks directory in the repo on a server (/opt/git/repositories/gitolite-admin.git)19:54
→ flaguy48 joined19:54
← NET||abuse left19:55
WebDragon|away → WebDragon19:55
← schierbeck left19:55
Ilari max_halifax: Uh, oh...19:56
max_halifax :)19:56
what was is dude19:56
:)19:56
Grum max_halifax: well, you did something wrong =)19:57
if there are no hooks it cannot possible *ever* update :)19:57
← vesech left19:59
→ fishey joined19:59
max_halifax I was using script which was provided with gitolite, I only generated ssh keys and script did the rest of job. So what do you think I need to do now? :)19:59
Grum sitaram: wake up! gitolite problem, you broke it!19:59
you do that =)19:59
poking the author is useful!20:00
max_halifax oh wow, cool author is here :)20:01
Ilari max_halifax: What exact version you did try to use?20:01
max_halifax: If its newly cloned, branch name should be enough to figure it out...20:01
→ schierbeck joined20:01
max_halifax I did this: git clone git://github.com/sitaramc/gitolite20:02
I assume it was last one stable :)20:02
→ LRN joined20:02
Ilari max_halifax: And then?20:02
→ ntoll joined20:02
← L_R_N left20:03
→ bbeecher joined20:04
max_halifax ssh-keygen -t rsa && ssh-copy-id -i ~/.ssh/id_rsa.pub remote-host && cd src/ && ./gl-easy-install git server_ip 22 bigadmin20:04
→ jelmer joined20:04
max_halifax script did all the job20:04
Thanks god I am saving what I was doing, LOL20:05
Thank God I mean :)20:05
Ilari max_halifax: Then you cloned gitolite admin, edited it and pushed it?20:05
← jrmuizel left20:05
max_halifax yes20:05
→ jrmuizel joined20:05
max_halifax this is exactly what I did20:05
Ilari max_halifax: And then tried to clone some other new project, but it didn't work and you hopped to investigate?20:05
max_halifax the problem is that config on a server haven't updated20:06
that is why I am getting error message that access to one repo denied20:06
if I clone testing.git repo20:06
Ilari max_halifax: You got the error first and then hopped to investigate?20:06
max_halifax getting standard message, when you try to clone empty repo20:07
← christophsturm left20:07
max_halifax yes20:07
bbeecher I'm sorry this is a newb question, but to track a remote svn branch using git svn I need to run git `reset --hard REMOTE_BRANCH_NAME" right?20:07
→ christophsturm joined20:07
← christophsturm left20:07
Ilari bbeecher: 'git svn rebase'?20:07
← jrmuizel left20:07
→ jrmuizel joined20:08
max_halifax I am getting this: R access for repo DENIED to user20:08
I pushed all necessary config parameters to config file20:08
so I was expecting to get something from there :)20:09
→ christophsturm joined20:09
← christophsturm left20:09
bbeecher Ilari: That will update my local branch to be insync with the remote - I want to create a new local branch that tracks a new remote branch. `git svn branch somename; git branch some_name; git checkout some_name; git reset --hard somename`20:09
← jrmuizel left20:09
bbeecher something like that20:09
→ jrmuizel joined20:09
bbeecher I'm not sure if that's actually doing what I want though20:10
max_halifax Ilari: but I assume that gitolite keeps config on a server in a same was as gitosis. /opt/git/.gitolite/conf/gitolite.conf here. But this file wasn't updated20:10
→ jelmer_ joined20:10
Ilari bbeecher: Why would you need that extra branch?20:10
→ tek joined20:10
← tekky left20:10
Ilari max_halifax: Yes. And it is probably related to missing hooks directory (and thus the missing hook).20:10
bbeecher because I want two local branches - one tracking svn trunk and the other tracking the new svn branch20:11
max_halifax Ilari: Yep, I think I got it. But how can I fix it. :)20:12
Ilari max_halifax: Does the gitolite source contain the hook?20:12
max_halifax Ilari: good idea, let me check20:12
← Chillance left20:12
remi if I get this message "Your branch is ahead of 'origin/master' by 47 commits.", what can I do to get my local copy at the same point as origin/master?20:12
Ilari max_halifax: src/ga-post-update20:13
remi: First try 'git fetch origin' (no branchname!)20:13
← maxter_ left20:13
→ Chillance joined20:14
remi Ilari: ok, done20:14
Ilari remi: Still claims 47 commits?20:14
→ lemonchicken joined20:14
→ cannonball joined20:15
← jelmer left20:15
remi Ilari: yep, but I did a "git reset origin/master" and discardes my local changes and it was back to normal!20:16
max_halifax Ilari: yep, you absoulutely right it is there,can I just move it from workstation on a server and make it +x?20:16
Ilari max_halifax: If you find that hook, copy it as gitolite-admin.git/hooks/post-update and make it +x.20:16
→ tvw joined20:16
max_halifax Ilari: ok, will try, thanks for help20:16
→ khmarbaise joined20:16
Ilari max_halifax: That should work. But note that the hook is post-update, not ga-post-update.20:16
→ bdowning_ joined20:17
← zjason` left20:17
Ilari max_halifax: Then try cd to gitolite-admin.git and run 'GIT_DIR=. hooks/post-update'.20:17
max_halifax: After that, configuration should have updated.20:17
max_halifax Ilari: how should I run 'GIT_DIR=. hooks/post-update'?20:18
← bdowning left20:18
→ mmw joined20:18
→ bentob0x joined20:18
Ilari max_halifax: 'cd gitolite-admin.git', 'GIT_DIR=. hooks/post-update'.20:19
bdowning_ → bdowning20:19
max_halifax Ilari oh,got it20:19
Grum Ilari: according to max_halifax there was no 'hooks' dir20:19
Ilari Grum: He created it and copied the hook there. Still, would be interesting to figure out why there was no hooks dir.20:20
Grum yeah indeed20:20
makes no sense tbh20:20
Ilari max_halifax: What OS the server has?20:20
max_halifax Ilari: just to confirm, we are talking about gitolite-admin.git which is on server, not on workstation. Just to be sure.20:21
Ilari max_halifax: Yes.20:21
max_halifax CentOS20:21
Ilari max_halifax: Okay, it isn't some fly-by-night Unix then...20:21
← [tla] left20:21
max_halifax nope20:22
Ilari max_halifax: And you are not using some fly-by-night shell either? :->20:22
m-takagi → m-takagi_20:22
max_halifax 2.6.18-028stab064.7-ent20:22
uname -a20:22
CentOS20:23
← Lisimba left20:24
← dermoth left20:25
max_halifax Ilari: GNU bash, version 3.2.25(1)-release (i686-redhat-linux-gnu)20:25
→ mw joined20:25
max_halifax very standard :)20:25
← psoo left20:26
→ sgh joined20:30
max_halifax Ilari: Are these permissions fine: -rwxr--r-- 1 git git 1180 Jan 14 21:28 post-update20:30
Grum if the user on that box is 'git' then yeah20:31
max_halifax yep20:31
user is git20:31
executing this: GIT_DIR=. hooks/post-update20:31
← polyrhythmic left20:32
max_halifax hooks/post-update: line 31: /gl-compile-conf: No such filr or directory20:32
Grum nothing was copied over20:32
← hakunin left20:32
max_halifax post-update is there20:32
or whole directory should be copied?20:33
Grum yes but gitolite consits of waaaay more20:33
→ ablemike joined20:33
max_halifax all hooks from source?20:33
ok20:33
got it20:33
thanks20:33
Grum nonono20:33
that is not it at all20:33
← hipe left20:34
Grum do you have a gitolite-install dir in /opt/git?20:34
if not then its severely borked20:34
← tek left20:34
Grum i am so sure that the install process gave you errors20:34
it cant be that it didnt20:34
→ tekky joined20:35
max_halifax yes I have gitolite-install in /opt/git20:35
Grum what is in that folder?20:35
max_halifax no it didn't gave me abything :(20:35
conf doc src20:35
Grum any actual files? ;)20:35
← snearch_ left20:36
max_halifax all files are there20:36
in each directory20:36
I assume we interested in source20:36
tekky → tek20:36
← jelmer_ left20:36
max_halifax in src I mean20:36
Grum src should have a hooks as well20:36
max_halifax yep, it has it20:37
→ vinse joined20:37
max_halifax I probably need to copie them from there, but I copied from workstation20:37
copy20:37
← sgh left20:37
Grum http://github.com/sitaramc/gitolite/blob/master/src/gl-easy-install#L327 <-- you could follow the script from there yourself20:37
→ halfline_ joined20:37
Grum but i still have no idea why it didnt work in the firstplace20:37
max_halifax yep,I was executing this script20:38
Grum the next step would be: sh -p $port $user@$host "cd gitolite-install; src/gl-install $quiet"20:38
+s; so you could just do that by hand20:38
→ sgh joined20:39
← halfline left20:40
→ jelmer joined20:40
max_halifax will try, thank you guys, you are really helpful20:40
Grum max_halifax: the script is basicly in order20:41
so you could just work your way fown from that point on doing all the 'MANUAL' things20:41
→ seanius_ joined20:42
max_halifax yep. If I will get stuck I will ask :)20:42
again :)20:42
→ csgeek joined20:44
csgeek Hey guys20:44
Ilari ...20:45
csgeek I'm looking at the interaction between git -> cvs.. I can checkout and clone a cvs repo without any issues. I'm just wondering if there's any way to push data back upstream. The only thing I found was cvsexportcommit which seems to generate a patch that I can commit to a local cvs checkout20:45
Grum steals some dots from Ilari.20:46
← d0k left20:46
→ ereslibre_laptop joined20:47
← seanius left20:47
max_halifax Ilari: what hooks should be in /hooks directory in each directory20:49
only update?20:50
← Ford_Prefect left20:50
max_halifax I will just copy it manually20:50
Grum max_halifax: copying it manually will not make it work20:51
there need to be lots more files installed than just the hooks20:51
← Haarg left20:52
max_halifax but I think they all there, only hooks are not there, for some reason, I still can clone repositories20:52
→ Haarg joined20:52
flixr I have a problem with an unusual git-svn setup: I used git svn to clone a subdir of a svn repo (/repo_root/projectV3/trunk) and now want to import some subdir (repo_root/projectV3/trunk/sw) into a new major version of the project (repo_root/projectV4/trunk/sw) for refactoring.20:53
Grum i'll just say it once more; more files need to be installed *on the right location*20:53
flixr any ideas on how to do this so I can still track the changes properly?20:53
max_halifax so you want me to run each command in script manually?20:54
Grum from: http://github.com/sitaramc/gitolite/blob/master/src/gl-easy-install#L410 and down yeah -- ofcourse check if it wasnt already done20:54
max_halifax ok, got it. I already spent a day on it. Can't spent more, if there is SVN which I am installing in minutes.20:55
Grum well, it *should* work, and alternatively you can do the manual install which is also described20:55
and sure, if you think SVN is the same as git, go with that20:56
max_halifax I know it is not the same20:56
kevlarman flixr: i think git-svn somewhat understands svn mv/svn cp, but it's generally pretty painful20:56
max_halifax but I have dev project which needs to be done20:56
asap20:56
Grum erm ...20:56
so you are setting up gitolite for a devproject? that seems to be major yakshaving20:56
max_halifax I tried gitosis, it such a pain, then people here suggested gitolite20:57
it is a pain as well20:57
nothing compares to yum install subversion :)20:58
Grum yes, nothing compares to the crap svn is20:58
but hell, lets nto go there20:58
tek → tekky20:58
max_halifax I know it's crap :)20:58
that is why I am here20:58
Grum and we're trying to help but you dont really seem to follow the suggestions :D20:58
→ Lisimba joined20:59
← _Mica_ left20:59
max_halifax but tools to work with git, are ,how to say that kindly, not very good :( I am following suggestions for whole day. :)20:59
not oyurs20:59
flixr kevlarman, I know it is painful... but unfortunately I have to deal with this. I cloned the "old" project version with git svn clone repo_root/projectV3 and added another svn-remote section with repo_root/projectV4. But I don't really know where to to from here...20:59
max_halifax not yours,some other people :)20:59
Grum max_halifax: tbh the gitolite install should have worked20:59
← javatexan left21:00
Grum no idea why it didnt, but you can pick up from where it seems to ahve failed21:00
max_halifax so are you suggesting to run manual install?21:00
becuase if I will start follow shell script, and then manually try to understand what those perl script are doing,don't think I will have a chance to take a nap today.21:01
Grum its not rocketscience ...21:01
just run the perlscripts by hand21:01
i assume you can read the shellscript21:01
max_halifax oh yes I can :)21:02
Grum so it should be trivial21:02
sitaram wrote the shellscript in a way you could just read it top to bottom and follow it by doing the things he mentioned in the '# Manual' sections21:02
→ froschi joined21:03
max_halifax yes, but21:03
this is function: setup_pta() {21:03
Grum well, you *could* wait until sitaram shows up21:03
max_halifax and this line is at the bottom of this function, ssh -p $port $user@$host "cd gitolite-install; src/gl-install $quiet"21:03
so If it will run successfully I think I am done21:04
but it's not ;)21:04
my console is on Russian, so I will have another pain in translating those messages in English :)21:05
Grum read the MANUAL comment above it21:05
it explains what to do:21:05
ea: go into gitolite-install dir21:05
and run: src/gl-install21:05
max_halifax I am able to clone repo21:05
already21:05
Grum so running gl-install was enough?21:06
← zoniq_ left21:06
← Theory left21:06
→ bambule joined21:07
max_halifax no it's giving me an error, gl-install Perl script contains a lot of logic,maybe half of it was executed right.21:07
Grum what errpr?21:07
*error21:07
← brizly left21:07
Grum pastie.org it orso =)21:07
kevlarman flixr: anything you do to change history will cause git-svn to flip out21:08
the only thing that has any chance of working is if the new location was svn cp'ed from the old one21:08
max_halifax Grum: the funny thing, it is in Russian :)21:08
kevlarman in which case git-svn should hopefully follow the copy21:08
→ WebDragon|away joined21:09
→ PHLAK joined21:09
flixr kevlarman, yeah, I know.. I don't want to change the history... But is it possible to copy the files in some way that git recognises that they are just copied from the "old" project?21:09
kevlarman flixr: if they were created with svn cp, then git-svn should recognize they were copied21:10
flixr so that later when I run git blame or something it will give me the correct output of who last changed a line21:10
kevlarman uh yeah21:10
that part won't work even if git understands the move in my experience21:11
flixr kevlarman, even if I have two svn-remote entries in my config file?21:11
kevlarman, no.. that works.. at least if I move files within a repo21:12
max_halifax Grum: after ./gl-install I am getting http://pastie.org/77864221:12
→ corni joined21:12
max_halifax first line there is brief translation from Russian :) lol21:12
← sh1mmer left21:12
← ablemike left21:14
Grum what did you run exactly?21:14
and from where?21:14
because i am guessing you didnt do what i said =)21:14
← schierbeck left21:15
← kipras left21:16
max_halifax Grum: I run ./gl-install from here /opt/git/gitolite-install/src21:16
on server21:16
Grum yes ... wrong ....21:16
max_halifax from workstation?21:16
Grum run it from 1 dir lower with: src/gl-install21:16
max_halifax ok21:16
→ matthewmccull joined21:16
← jasonn1234 left21:17
← reidab left21:17
← malumalu left21:17
max_halifax oh, cool, script was generated21:17
it is saying: created /root/.gitolite.rc21:18
please edit it, change the paths if you wish to, and RERUN THIS SCRIPT21:18
← matthewmccull left21:18
Grum you are running it as root21:18
dont do that21:18
run it as user 'git'21:18
→ matthewmccull joined21:19
← emmanueloga left21:19
→ emmanueloga joined21:20
max_halifax oh, now it gave some errors: cp: can't make a file `./testing.git/hooks/': This is a directory21:21
again, brief translation from Russian :)21:22
something in a script I guess21:22
and you right, I've seen those errors before21:22
during installation21:22
→ xiong joined21:22
← PeakerWork left21:23
← anno^da left21:24
← anjen left21:24
← PointMan left21:24
← WebDragon left21:25
← PHLAK left21:26
Grum max_halifax: i think you might need to just clean it all out and do the manual install described in the docs21:27
unless you want to be helpful and track down what on earth failed so sitaram can fix it21:28
→ WebDragon|laptop joined21:29
max_halifax I am still thinking that only /hooks directory wasn't copied correctly. Can you tell me what scripts normally should be there after installation?21:29
Grum it copies over: src hooks and docs .. so all of those folders/files should be in the git-install folder21:29
← WebDragon|away left21:30
→ gunmuc joined21:31
→ gmcinnes joined21:31
← s4msung left21:34
← remi left21:35
gmcinnes Hi all. I'm trying rebase my feature branch against a master branch. I have about 80 commits on my feature branch and every time I rebase I have to silly walk through a bunch of conflicts, most of which I always want simply my feature branch version of. Is there any way to simplify this workflow?21:35
max_halifax Grum: I know Perl a little bit,maybe will try to help21:36
← project2501a left21:36
kevlarman gmcinnes: git-rerere is what you want21:37
→ johnw joined21:37
← makeworkeasy left21:39
→ onigiri joined21:39
gmcinnes kevlarman: ah ha. it may very well be.21:40
← jmcantrell left21:40
→ ablemike joined21:42
gmcinnes however, there is one thing I don't understand. Lets say I rebase feature against master. Feature branch initially branched at A, and after rebase against master, am I right in thinking that it now looks as if it branched at A', which is the tip of master ?21:43
kevlarman gmcinnes: yes21:44
→ agib joined21:44
→ vbgunz__ joined21:44
← auslander left21:46
→ schierbeck joined21:46
← schierbeck left21:46
← seanius_ left21:46
→ schierbeck joined21:46
→ seanius joined21:47
→ Paraselene_ joined21:48
→ schacon joined21:49
gmcinnes kevlarman: ok. thought so. I understand my problem. other people are advancing master in the meantime so if master is at A' when I rebase again, I have to make the same conflict resolutions. Which is exactly the use case for rerere21:50
perfect.21:50
kevlarman: I guess I just need to rebase more often to spread the pain.21:51
← schierbeck left21:53
← rgr left21:53
→ rgr joined21:54
AAA_awright_ → AAA_awright21:55
← carrus85 left21:57
← lucsky_ left21:59
→ agenteo joined22:00
→ vbgunz joined22:00
→ bry joined22:01
→ tstclair_ joined22:04
← rgr left22:04
gmcinnes why is it that git mergetool sometimes doesn't notice conflicts?22:04
→ rgr joined22:04
← froschi left22:07
← tchan left22:08
← notjohn left22:09
← ereslibre_laptop left22:10
max_halifax Grume: dude, I made it working, Thanks for all your help. You really made me to beleave :)22:11
← vbgunz__ left22:14
← Zephyrus left22:15
← ablemike left22:15
← spearce left22:16
← WebDragon|laptop left22:19
→ __iron joined22:19
← LiamH left22:20
flixr I have a problem when trying to create a new branch in svn via git svn branch <new branch>: Trying to use an unsupported feature: Source and dest appear not to be in the same repository22:20
that is because the url to the svn repo includes my username: svn+ssh://flixr@svn......22:21
and in the source that is apparently stipped away22:22
any ideas how to deal with this?22:22
← awx left22:22
← Yuuhi left22:22
→ DrAk0 joined22:23
← keystr0k left22:25
→ Mezner01 joined22:25
← Mezner left22:26
Mezner01 → Mezner22:26
→ r11t joined22:26
← lamont left22:27
→ ablemike joined22:27
→ lamont joined22:30
→ tchan joined22:30
← aleray left22:30
← oliver3 left22:30
→ aleray joined22:30
← JoeConyers left22:31
→ jasonn1234 joined22:31
← corni left22:32
← tstclair left22:32
→ zub joined22:33
→ anno^da joined22:34
zub hi22:34
→ gregt_ joined22:34
← ph^ left22:35
zub I wonder how should I work with tags. All I found was that they behave like branches. So... if I want to checkout a tag, should I do something like git checkout -b blah origin/blah, if there's "blah" tag?22:35
→ schierbeck joined22:36
← fr left22:37
← sgh left22:38
→ fr joined22:38
→ remi joined22:38
→ dermoth joined22:38
flixr zub, as far as i can tell this would give you a new branch off the tag blah22:38
zub yes, that's what I'd guess22:39
btw. reading Git - SVN Crash Course I see I should never checkout a remote branch22:39
is it true even if I don't evenr intend to commit into it?22:40
Aides zub: if you don't intend to commit, it is safe to checkout22:40
zub ok :)22:40
← krynnotaur left22:41
aleray Is there an equivalent to "hg mv --after" in git ?22:41
Aides as is the case with things like HEAD^^22:41
you may checkout them to explore22:41
← DrAk0 left22:41
flixr I have a problem when trying to create a new branch in svn via git svn branch <new branch>: Trying to use an unsupported feature: Source and dest appear not to be in the same repository22:41
→ DrAk0 joined22:41
Aides but if you commit when such a thing is checked out (termed a "detached head"), you risk losing the commit22:41
flixr that is because the url to the svn repo includes my username: svn+ssh://flixr@svn......22:42
zub, better to make a lokal branch of the remote branch if you might work on it22:42
← kumbayo left22:42
zub well, I'm just testing various tags of a package, and then the braches get a bit annoying22:42
← hebz0rl left22:43
→ spearce joined22:43
aleray I renamed and modified a file without using git mv. How can I tell git ?22:44
→ PointMan joined22:45
kevlarman git rm --cached the old file and git add the new file22:46
Aides aleray: git rm --cached old; git add new22:46
aleray kevlarman: Aides : will git link the old file and the new one then ?22:47
davr aleray: git does not track file renames. git mv is the same as typing git rm + git add22:48
aleray davr: ah ok22:48
why doesn't it do so ?22:48
davr http://git.or.cz/gitwiki/GitFaq#Whydoesgitnot.22track.22renames.3F22:48
→ voxpelli-laptop joined22:49
aleray davr: thanks22:50
← jrmuizel left22:50
← schierbeck left22:51
← ntoll left22:51
← matthewmccull left22:52
← Rolenun left22:52
→ Rolenun joined22:52
→ fcuk112 joined22:53
← Rolenun left22:53
prudhvi_ → prudhvi22:53
← erikvold left22:54
← sagsousuke left22:54
← priidu left22:56
→ carrus85 joined22:56
← DavidKlein left22:58
→ reidab joined22:59
← Raymond left23:01
→ L_R_N joined23:02
← Akufen left23:02
← LRN left23:03
→ madewokherd joined23:03
L_R_N → LRN23:03
← deavid left23:04
→ deavid joined23:04
← flixr left23:05
→ Akufen joined23:05
→ rolfb joined23:06
→ sh1mmer joined23:06
← altrux left23:06
← flaguy48 left23:06
← rolfb left23:07
← Mezner left23:07
← mmw left23:07
→ rolfb joined23:07
→ ruediger_ joined23:09
→ numberGrey joined23:09
← ruediger left23:09
ruediger_ → ruediger23:09
← PerlJam left23:10
→ PerlPilot joined23:10
→ awx joined23:12
← bentob0x left23:12
← anno^da left23:13
← Paraselene_ left23:13
→ anno^da joined23:14
← alley_cat left23:15
→ nevyn_ joined23:16
← brez left23:18
← juan_arandaalvar left23:18
← MarcWeber left23:22
→ MarcWebe1 joined23:22
← psil left23:22
→ psil`wrk joined23:22
← nadavoid left23:23
← Ryback_ left23:23
← mnyon left23:23
→ aCiD2 joined23:26
aCiD2 Does anyone know how to fix "Author: (no author) not defined in authors.txt file" when importing from svn?23:26
I've added (no author) = (unknown) to my authors.txt, but that doesn't fix it23:27
→ guardian_ joined23:27
← nevyn left23:28
→ Raymond joined23:28
← numberGrey left23:29
Raymond desire mindgames23:29
→ oliver3 joined23:29
← max_halifax left23:30
← voxpelli-laptop left23:30
→ em-dash joined23:30
← anno^da left23:32
← agile left23:33
← bantic left23:36
→ tcurdt joined23:37
← ablemike left23:38
tcurdt I've looked at the "non-fast forward" section of git push but I still don't get why this push failed http://codepad.org/rme9fIzq ...could anyone explain what went wrong here?23:38
nonken_afk → nonken23:39
tcurdt I did a pull. There was merge conflict. Fixed it. Commited that. Merge done. Then I did a "git push --all" and that got rejected23:39
fr0sty tcurdt: I think the '--all' might be tripping you up.23:40
← remi left23:40
fr0sty tcurdt: or, put another way you need to merge 'customized'23:41
→ james_ joined23:41
← guardian left23:41
guardian_ → guardian23:41
fr0sty git checkout customized; git pull origin customized; # or some such thing.23:42
tcurdt I am confused. I thought that's just what I did before the push23:42
← ecwNick left23:42
→ remi joined23:42
→ jmcantrell joined23:42
fr0sty tcurdt: It depends on what precisely you did beforehand.23:42
(and on the contents of .git/config)23:43
← imajes left23:43
fr0sty tcurdt: how many branches do you have? (git branch)23:43
← reidab left23:44
← benjy left23:44
tcurdt hm .... a git pull origin customized ; git push --all worked ...but I am not sure I understand why I had to do it that way23:44
locally I have master and customized23:44
plus 5 remote branches23:45
Ilari tcurdt: If you don't locally have all the commits on remote end, the push is going to fail due to non-ff.23:45
← sh1mmer left23:45
mugwump try looking at 'gitk master customized origin/master origin/customized'23:45
← xiong left23:45
fr0sty tcurdt: 'git pull' will fetch+merge 'origin/master' by default23:45
tcurdt but I did a pull before I did the push23:46
fr0sty tcurdt: you need to do as you did to get the changes to 'customized'23:46
Ilari tcurdt: And note that pull always merges to current branch.23:46
tcurdt but I was on customize when I did the pull23:47
fr0sty tcurdt: then you pulled the changes from 'origin/master' into customized (most likely).23:47
tcurdt feels like a confused stupid newbie atm23:48
← schacon left23:48
fr0sty tcurdt: git pull doesn't care what branch you happen to be on. it does what is is told.23:48
tcurdt which means pull of origin/master if no arg is given IIRC23:49
which is why I didn't have the changes23:49
fr0sty Bingo.23:49
tcurdt on customized23:49
→ LordSteiner joined23:49
tcurdt I see23:50
← khmarbaise left23:50
→ interferon joined23:50
→ javaJake joined23:50
tcurdt I thought it would know from the "merge" config in .git/config what to pull by default23:50
interferon let's say that i create branch b from branch a and then make a series of commits in both branches. how can i find out how b differs from how a was at the time of branch creating23:51
nevyn_ → nevyn23:51
→ sh1mmer joined23:51
nonken → nonken_afk23:51
javaJake A project I'm part of wants to merge different kernels produced by different people for different featuresets together into a single kernel. How do we do this in git and track it properly (where we pulled from, etc.)?23:51
Ilari javaJake: Fetch all the branches and merge them?23:52
javaJake I was thinking of ahving a 'master' branch, and then a branch for each remote repo, and then merge into the master.23:52
tcurdt fr0sty: thx for the help!23:52
javaJake Ilari: that's done, but now no one except the one who did the work knows where the code was pulled from. It'd be nice if git could help us track it so we don't all have to have a "pull-sources" file or something :P23:53
fr0sty tcurdt: My pleasure.23:54
tcurdt is there a way to have git-pull pull the changes from the remote branch without specifying further args?23:54
← amerine left23:54
tcurdt like setting something in .git/config23:54
javaJake tcurdt: git remote add origin <reponame>23:54
→ hgimenez joined23:54
tcurdt javaJake: no - that can't be it in this case23:54
javaJake OK23:55
Ilari javaJake: Add such file (even if it doesn't have any special meaning)?23:55
tcurdt I have remote = origin and merge = refs/heads/cust omized23:55
javaJake Ilari: is it really that messy? :/23:55
tcurdt still I had to do "git pull origin customized" instead of just "git pull"23:56
→ mjf joined23:56
← interferon left23:56
Ilari tcurdt: Change .git/config ?23:56
← LordSteiner left23:56
fr0sty tcurdt: can you paste your .git/config ?23:56
javaJake Can a branch have a '/' character in it? Maybe we'll just track via '<reponame>/<branch>' branches with their origins set up and then have our own branches which sync with those "local" ones.23:57
→ reidab joined23:57
tcurdt Ilrari: question is how ;) ... let me paste the config23:57
← DrAk0 left23:57
→ schierbeck joined23:58
tcurdt http://codepad.org/E5L7omhM23:58

Logs Search ←Prev date Next date→ Channels Documentation