IRCloggy #git 2008-05-01

Provider of IRC logs since 2005.

WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

	2008-05-01
	→ ilogger2 joined	04:20
	→ glommer joined	04:24
	→ robin_ joined	04:27
	← robin_ left	04:28
	→ cliffstah joined	04:30
	→ z3ro joined	04:30
	→ tjafk1 joined	04:31
	→ ironfroggy joined	04:32
	→ eternaleye joined	04:34
	→ sgrimm joined	04:35
	→ EmilMedve joined	04:37
	← cliffstah left	04:44
	← eternaleye left	04:47
	→ dreiss joined	04:55
	→ Beket joined	04:55
	→ eternaleye joined	04:58
	→ eald joined	05:00
	→ nkallen joined	05:21
	→ statim joined	05:23
wifs	is there a simple way to switch what git repo url to 'pull' from?	05:34
offby1	just edit .git/config :)	05:34
	wifs nods	05:34
offby1	there's probably a simpler way, but that's pretty simple	05:34
wifs	wow, that's pretty simple :)	05:35
	← ironfroggy left	05:36
	→ KirinDave joined	05:36
wifs	hrm, now it errors out on the pull with 'file x would be overwritten by merge.'	05:36
	is there anything like p4's 'force sync to head'? e.g. I don't care about destructive overwrites of my local checkout	05:37
Mikachu	git reset --hard	05:39
	or maybe you need git clean	05:40
	→ z3ro_ joined	05:40
EmilMedve	gitster: ping?	05:44
	← mqt left	05:44
	→ jmspeex joined	05:49
	→ harinath joined	05:50
	→ ironfroggy joined	05:51
	← z3ro left	05:54
	→ mozammel joined	05:56
	→ brosner_ joined	05:58
	← ironfroggy left	05:58
	← mozammel left	06:09
	→ LoPMX joined	06:13
	→ etnt joined	06:21
	→ mczepiel joined	06:22
	← KirinDave left	06:26
	← z3ro_ left	06:27
	→ leethal joined	06:28
	→ ben_h_ joined	06:29
	→ z3ro joined	06:34
	→ deavid joined	06:35
	→ alenoosh joined	06:40
	→ KirinDave joined	06:42
	← brosner_ left	06:45
	← Beket left	06:47
	→ d0k joined	06:58
	← KirinDave left	07:09
	← leethal left	07:11
	→ Morphous joined	07:11
	→ KirinDave joined	07:13
	→ sitaram joined	07:15
	→ unreal joined	07:19
	→ fhobia joined	07:26
	← Morphous left	07:30
	→ Morphous joined	07:30
	→ Sho_ joined	07:32
	← LoPMX left	07:34
	→ ec joined	07:36
	→ johnw joined	07:39
	← alenoosh left	07:39
	→ thiago_home joined	07:40
	→ ph^ joined	07:40
	→ unreal_ joined	07:46
	→ leethal joined	07:46
	→ grumbel joined	07:52
	← etnt left	07:52
grumbel	What is the difference between just 'git-push' and 'git-push --all'?	07:52
	→ EmilMedv1 joined	07:55
	← statim left	07:56
AlexB	grumbel: git help push	07:56
johnw	it pushes every tracked branch up	07:56
	which might involve multiple remote sites, btw	07:56
	git push pushes the current branch up, if it's tracked	07:57
	→ sisir joined	07:58
	← EmilMedve left	07:59
	← unreal left	08:03
	unreal_ → unreal	08:03
	→ LoPMX joined	08:04
	→ Yuuhi joined	08:05
	← ben_h_ left	08:06
	→ markkalderon joined	08:07
	← sitaram left	08:08
	→ Malesca joined	08:13
	← Sho_ left	08:15
	→ Sho_ joined	08:15
	← fhobia left	08:15
	← johnw left	08:19
	EmilMedv1 → EmilMedve	08:25
	← EmilMedve left	08:28
	← KirinDave left	08:36
	→ crab joined	08:38
crab	hi. how can i tell which is the oldest unchanged file in my repository?	08:38
	→ swombat_ joined	08:40
swombat_	how do i remove a couple of files from the commit i just made, and get them back in "changed but not updated" state?	08:41
	swombat_ → swombat	08:41
mczepiel	swombat_: git reset foo	08:44
	pretty certain at least	08:44
swombat	foo = the file name?	08:44
mczepiel	http://www.kernel.org/pub/software/scm/git/docs/git-reset.html	08:44
swombat	hmm... i don't want to lose those changes though	08:45
	that'd be a disaster	08:45
mczepiel	they have it listed as git reset -- frotz.c but I want to say I've typically not used the --	08:45
swombat	i just want them to be uncommitted	08:45
mczepiel	"This removes the file from the index while keeping it in the working directory."	08:45
swombat	hmm. I guess I can just take a backup first grin	08:45
crab	swombat: maybe read about "git commit --amend	08:46
	"	08:46
mczepiel	no he hasn't committed it yet, it's jsut sitting in his indexcache	08:46
swombat	i've committed	08:46
	but not pushed	08:46
mczepiel	ohh	08:46
	nm then	08:46
	sorry, late totally misread that	08:46
swombat	np :-) thanks for the help	08:47
	does that change your advice re: git reset?	08:47
	→ cedricv joined	08:47
	← LoPMX left	08:47
mczepiel	no, just the usage	08:47
	if you read the exmapels they give for reset there is one that brings you back ... but I'm not sure where that leaves that commit	08:48
swombat	ok	08:48
mczepiel	so i dunno, somebody bettet qualified should have some idea	08:48
	or you jsut cone that repos and try it a few different ways	08:48
	*cone = clone	08:48
	→ statim joined	08:49
mczepiel	btw the reset I was talkign about is under "Undo a commit and redo"	08:49
crab	swombat: you can't, afaik, undo just a part of that commit directly.	08:49
swombat	i'm ok with moving all the files back into un-committed and then recommitting the ones i want	08:49
mczepiel	well I'd suggest cloning your existing repos if you're still unsure about it but "git reset --soft HEAD^ " looks like what you want	08:50
	then you jsut make your edits and finally "git commit -a -c ORIG_HEAD"	08:50
crab	right.	08:50
mczepiel	possibly exactly what commit --amend does as crab mentioned	08:51
crab	that is indeed what it does.	08:51
mczepiel	lol so it is, man i love when the docs actually coincide with my mental model of what's going on :-)	08:52
	← markkalderon left	08:53
swombat	hmm, brilliant... fatal: Cannot do a soft reset in the middle of a merge.	08:53
	I seem to have all the luck today :-)	08:53
mczepiel	stash	08:53
swombat	fatal: git-write-tree: error building trees	08:53
	Cannot save the current index state	08:53
	lol	08:53
mczepiel	lol wow, well that's my cue to leave	08:54
eMBee	good afternoon	08:54
mczepiel	no idea what state you're in now, gl with that though ;-)	08:54
swombat	# Not currently on any branch.	08:54
	didn't know hat was possible :-P	08:54
	swombat is in repo-limbo.	08:55
mczepiel	oh yeha you're just at an arbitrary tree-ish or something?	08:55
	gitk may help at least visualize this	08:55
eMBee	how do use git-svn if the svn repo has branches in multiple directories?	08:55
swombat	good point	08:55
crab	swombat: redo your tree and use git-commit --amend, it can be used to amend merges.	08:55
swombat	gitk seems to think everyone's alright	08:56
	← mczepiel left	08:56
crab	(and just checkout head to not be in limbo any more.)	08:56
swombat	what do you mean by "redo your tree"?	08:56
crab	make whatever changes you actually want to commit	08:57
	but maybe the best thing for you to do is to revert your commit and then redo it	08:59
swombat	yay	09:00
	got it	09:00
	→ Catfish_ joined	09:00
swombat	i completed the merge, then "git reset HEAD <file>" for each of the files i wanted to un-commit	09:00
	→ unreal_ joined	09:01
	← crab left	09:03
swombat	and... then once back in my branch, "git reset --soft <commit-id>" uncommitted all the files so i could remove a couple	09:04
	→ ebel joined	09:07
	→ ben_h joined	09:07
swombat	Git: Your friendly neighbourhood atomic demogrifying ultra-spatial field-driven tachyomasticator.	09:09
	← ben_h left	09:12
	← unreal left	09:13
	unreal_ → unreal	09:13
	← dreiss left	09:33
	→ FunkeeMonk joined	09:42
	→ ben_h joined	09:46
	← FunkeeMonk left	09:56
	← leethal left	09:59
	→ mithro joined	10:01
	→ FunkeeMonk joined	10:04
	→ railsmonk joined	10:08
	← harinath left	10:17
	→ kumbayo joined	10:20
	← ben_h left	10:27
	→ harinath joined	10:28
	→ ddaa joined	10:28
swombat	how do i push only a certain branch (the production branch in this case... master's not ready to be pushed, but i need to push the production branch to origin so i can deploy it)	10:29
	→ sverrej joined	10:29
	→ theju joined	10:29
	→ janm joined	10:30
deavid	swombat: git push origin branchname	10:31
	swombat: try push in "git gui"	10:31
	← d0k left	10:38
	Catfish_ → Catfish	10:41
swombat	deavid: cheers	10:43
	→ d0k joined	10:47
	→ tomtt joined	10:47
	← harinath left	10:48
tomtt	I want to extract a subdir of a project as a seperate project. I would like to keep the history of the project but not the history of the project it was originally in. Is that possible?	10:49
	← ph^ left	10:50
	→ ph^ joined	10:51
	→ LotR joined	10:52
Mikachu	tomtt: yes	10:55
tomtt	Mikachu: any pointers? :)	10:56
Mikachu	git filter-branch	10:56
tomtt	Michitux: sweet! thx	10:57
	→ angasule joined	10:57
Mikachu	that's the best misspelling of my nick i've seen to date, i think	10:57
tomtt	Mikachu: it was emacs autocomplete and my misstype :). sorry	10:58
	→ sitaram joined	10:58
tomtt	Mikachu: it's somebody who's on the rspec channel...	10:59
Mikachu	i don't know exactly the invocation to extract the subdir, but after you do you'll end up with empty commits	10:59
	--commit-filter 'if [ z$1 = z`git rev-parse $3^{tree}` ]; then skip_commit "$@"; else git commit-tree "$@"; fi'	11:00
	that should remove them	11:00
	ah, --subdirectory-filter dirname for the first step	11:02
	ah#2, it looks like that properly skips empty commits	11:03
	→ ph^_ joined	11:04
	← ph^ left	11:05
	→ d0k_ joined	11:06
	← d0k left	11:07
	← cedricv left	11:08
tomtt	Mikachu: now that was just beautiful. I do love git.	11:11
	← ddaa left	11:13
	← sitaram left	11:14
	← theju left	11:19
	→ vbgunz joined	11:21
	← tomtt left	11:21
	→ kipras joined	11:27
	→ railk joined	11:36
	→ d0k joined	11:45
	← Malesca left	11:46
	← swombat left	11:50
	→ cedricv joined	11:51
	← d0k_ left	11:53
	→ thiago_h1me joined	12:14
	← ph^_ left	12:18
	← mithro left	12:19
	→ ph^ joined	12:21
	→ jmbr joined	12:23
	← thiago_home left	12:24
	← jmbr left	12:29
	thiago_h1me → thiago_home	12:30
	→ BabelO joined	12:34
	→ lamont joined	12:34
	→ ben_h joined	12:35
	→ bentob0x joined	12:41
	→ kukks joined	12:59
nexus10	hi -- any suggestions how to convert a repo that's just a copy of the .git folder resulting from a 'git clone' into a true, bare, repo?	13:08
	I want to be able to clone from this new repo and get all the branches	13:09
	→ vivien joined	13:11
nexus10	man git-clone says about --bare: Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to	13:12
	refs/remotes/origin/.	13:12
jast	set the bare config option to true and move the heads in refs/remotes/origin to refs/heads, i guess	13:13
vivien	Hi. I have question about git-svn. After a "git-svn dcommit", I have problems with the other git clones. I get "non-fast forward" errors while pushing or pulling. Are you aware of that kind of problem?	13:14
jast	what do you mean by "other git clones"?	13:14
nexus10	that's what I need -- the repo I have at the moment, created with 'scp -rp .git server:blah', and the branches are all remotes...	13:14
	→ ironfroggy joined	13:14
jast	nexus10, perhaps i don't understand what you want to do. i believe what i outlined would turn the remotes into local branches as they'd be in a bare repo.	13:15
vivien	Example: One git repository A cloned from the SVN repository (git-svn clone) and another, B, cloned directly from A (git-clone).	13:15
thiago_home	vivien: you need to rebase, not pull	13:16
jast	vivien, problem is that dcommit rewrites the commits after they've been sent to the original repo. that pretty much breaks all clones that already had your original commits.	13:16
nexus10	jast: I hadn't thought of moving the heads -- what command do I need to read up on?	13:16
thiago_home	you must never pull/merge/rebase from a branch that contains commits not on Subversion	13:16
	that will create the issue you're seeing	13:16
jast	nexus10, i meant manual moving of the heads files :) i don't know of any plumbing that would do that	13:16
vivien	I get the problem with: git commit on A (cloned from SVN), git push from A to B, git svn dcommit (on A), and then git push from A to B again fails with error "non-fast forward"...	13:17
nexus10	jast: ah... very scary :-)	13:17
jast	vivien, i suggest you re-create the remote on B	13:17
vivien	jast: yes, you are right. I can see that from the logs also (they change after dcommit: there is a line "git-svn-id:"...)	13:18
thiago_home	vivien: that's what we've just told you	13:18
	vivien: do not share the commits that aren't on Subversion	13:18
vivien	jast: you mean another "git svn clone" for B instead of "git clone from A"?	13:19
nexus10	jast: I think it'll be easier to start afresh, create a fresh bare repo -- converting what I currently have looks pretty scary	13:19
jast	nexus10, well, of course that's always an option, yeah	13:19
nexus10	jast: can't see a better one atm :-(	13:20
jast	vivien, that would be another possibility, yes. what i meant, though, is to remove the origin remote in B and re-create it. you can then re-fetch all of it.	13:20
	you may have to throw away local branches in B, too	13:20
	nexus10, it's certainly the quickest and easiest solution	13:21
nexus10	jast: can you? Does manally moving the heads sound a reasonable option to you?	13:21
jast	nexus10, i'd probably go with clone too	13:21
nexus10	jast: ok, thanks -- that sounds good	13:21
vivien	thiago_home & jast: thanks for your help.	13:23
	→ EmilMedve joined	13:30
	← Morphous left	13:30
EmilMedve	gitster: ping?	13:33
	→ threeve joined	13:35
ironfroggy	what is the largest git repository anyone know of in active use?	13:35
	→ threeve_ joined	13:36
frsk	The kernel is among the largest, I guess	13:36
thiago_home	ironfroggy: 1.1 GB	13:36
	← eternaleye left	13:37
	thiago_home repacks	13:37
thiago_home	741 MB after repacking	13:41
	1205989 objects	13:42
	→ solo joined	13:43
	→ emss joined	13:43
ph^	I think they have KDE on git too, which I think is alot bigger	13:44
thiago_home	KDE isn't that big	13:44
	the largest repo is 250 MB	13:44
	altogether, the repos make 1.4 GB though	13:44
	→ johan-s joined	13:45
	← threeve_ left	13:45
ph^	I just seem to recall Linus mentioning KDE when he said they were testing some very big projects	13:46
	would be weird to mention KDE then and not the kernel if the kernel is bigger	13:46
offby1	_I_ seem to recall, from the Google talk, that he said it's not a good idea to use a really large repository; that you should carve things up into subrepositories when they get big	13:46
ph^	he did	13:47
	but this was for testing edge cases :)	13:47
thiago_home	he mentioned it because Chris Lee started doing the conversion	13:47
	the KDE Subversion repository is huge, but that's one monolithic repository	13:47
	Git can't handle that	13:47
	when converting to Git, the KDE repo is split into several smaller ones	13:47
	when I say "can't handle", I mean "it works, but no one is going to do that"	13:48
offby1	ah	13:49
thiago_home	when I converted the KDE main modules, I got several repos in sizes ranging from a few MB to 250 MB	13:52
	total size 1.4 GB	13:52
	← threeve left	13:52
G_SabinoMullane	How exactly does one update a repo dir (with no content, just meta info) such that gitweb.cgi can see the updates? I'm probably conflating some problems here, but git-fetch is pulling the changes in but now I need 'git for-each-ref' to see the latest commit from the remote master. Normally I'd do a git-pull but I'm trying this without a full tree.	13:57
	→ jmspeex_ joined	13:57
	→ krh joined	14:01
	→ cannonball joined	14:01
	← sisir left	14:05
	→ sisir joined	14:06
	→ andres joined	14:12
	→ m3thos joined	14:13
	→ patroy joined	14:18
patroy	Hi guys, how can I "disconnect" from a git repo using a certain branch. do I just switch to that branch and delete the .git folder?	14:19
	I want to do the same as svn export	14:19
eMBee	well, if you delete the git folder then the repo will be gone, so that's probably not what you want	14:20
offby1	patroy: I suspect you want git-archive	14:21
	it writes out the tree of your choice into a tar file, or some other format of aren't	14:22
	archive	14:22
patroy	that would work	14:23
	thx	14:23
	→ ggeecko joined	14:23
	→ zed_ joined	14:24
	→ jacqui joined	14:25
	→ ruphy joined	14:26
	→ aroben joined	14:26
	← jmspeex left	14:28
timonator	this isn't too much of a git question, but: when i try to push from my laptop to my desktop via ssh, it says "git-receive-pack" not found. i installed git with the prefix set to my home and then added /home/timo/bin to my PATH in ~/.zshrc.	14:28
	why doesn't zsh evaluate its rc when being called by git?	14:28
	→ bobesponja joined	14:28
offby1	I think the question is more "why doesn't zsh evaluate its rc when being called by ssh?"	14:29
timonator	i know, that i can specify the git-receive-pack path via the commandline, but i'd like to make this work the right way	14:29
	can i find out what exact comamnd git uses to call ssh and zsh?	14:29
offby1	I suspect it's the distinction between a "login shell" and ... "not a login shell"	14:29
	timonator: sure. Read the source, or run your "push" under "strace".	14:29
	strace answers all questions.	14:29
timonator	what does a system call look like in the strace output?	14:30
offby1	Not always usefully, but ...	14:30
timonator	iow what do i grep for?	14:30
offby1	it's pretty easy to read	14:30
timonator	but it's a lot	14:30
offby1	do "strace -fe process git-push ..."	14:30
	or better yet	14:30
	do "strace -o some-file -fe process git-push ..."	14:30
	then edit some-file with your favorite editor, and search for "ssh"	14:30
	in fact, I'll try that now	14:31
timonator	hah	14:31
offby1	I see 25416 execve("/usr/bin/ssh", ["ssh", "git@github.com", "git-receive-pack \'nex3/arc.git\'"], [/* 32 vars */]) = 0	14:31
	so there's yer answer	14:32
timonator	yup	14:32
offby1	pretty straightforward, really	14:32
timonator	it is!	14:32
	timonator straces zsh now	14:32
offby1	no need	14:32
	I can tell you already	14:32
	→ chris2 joined	14:32
offby1	well, maybe not.	14:33
	but I am pretty sure zsh simply doesn't read that particular startup file when ssh invokes it	14:33
timonator	/home/timo/.zshenv - this may help	14:33
offby1	in fact ... the ssh daemon probably doesn't run zsh _at all_. Why should it?	14:33
	you told it to run git-receive-pack, not zsh.	14:33
	so the real question is: how do you tell the ssh daemon which PATH to use	14:34
	← solo left	14:34
timonator	well, it does run zsh	14:34
	or else it wouldn't say "zsh:1: blah not found"	14:34
	→ harryv joined	14:35
harryv	hey -- what am i doing wrong? $ git archive --format=tar --remote=git://github.com/thoughtbot/paperclip.git v2.0.2	14:35
	fatal: The remote end hung up unexpectedly	14:35
timonator	using zshenv is much more elegant, too. and now it works	14:35
offby1	timonator: hmm, I concur with your deduction	14:36
	funny	14:36
	I don't know _why_ it runs a shell, though	14:36
timonator	doesn't ssh always run the commands you tell it to run in a shell?	14:36
offby1	I wouldn't think so.	14:37
	→ athought joined	14:37
offby1	apparently it does at least some of the time, but I don't know why.	14:37
timonator	interesting	14:38
	→ threeve joined	14:38
offby1	I seem to recall having this same confusion many eons ago when I hung out in #svn	14:39
timonator	hm.	14:39
offby1	I even own two different editions of the fancy SSH book (http://snailbook.com)	14:39
	what good do they do me, you ask?	14:39
timonator	yes, i do ask.	14:39
offby1	impertinent	14:41
	the ssh man page says: "If command is specified, command is executed on the remote host instead of a login shell."	14:41
	so ... that confuses me	14:41
timonator	yeah, that implies, that when command is given, no shell is invoked	14:41
offby1	hence my belief that, when command is given, no shell is invoked :-\|	14:43
timonator	hm. is there an easier way to reset my file to the current HEAD than to git-diff \| patch -R -p1?	14:43
	git reset didn't seem to help me :/	14:43
offby1	git reset --hard	14:44
	although that'll do the whole working tree	14:44
	I don't think "reset" works on individual files.	14:44
	it works on refs, if I understand correctly.	14:44
	offby1 wonders if anyone notices the irony of him giving advice in #git	14:44
timonator	what, are you the inventor of hg?	14:45
	→ chrisb joined	14:46
	timonator bbl	14:46
offby1	timonator: it's clearly running a shell for me, to	14:48
	too	14:48
timonator	have you taken a look at /etc/ssh yet?	14:48
	you investigate while i clean my bathroom.	14:48
offby1	that's better than the other way around.	14:49
	since, after all, it's _your_ bathroom.	14:49
	and yes, I've poked around a little in there.	14:49
	→ rlb3 joined	14:50
threeve	timonator: I think you could also `git checkout -- thefile` if you don't want to reset your whole working tree.	14:51
timonator	i wanted to reset my hwole tree	14:52
	after git-pushing from my laptop, the changes i made on it somehow got applied and then my working directory was kind of the "reverse" of what i did on my laptop	14:52
	that's why the patch solution helped	14:52
	← harryv left	14:53
threeve	timonator: Ahh, I read "reset my file" to mean you only wanted to affect a certain file rather than the whole tree.	14:53
timonator	oh, yeah, that was a miscommunication	14:53
	the changes only happened to one file	14:53
	→ ThaDon joined	14:56
	→ jmbr joined	14:58
jmbr	how can I produce GNU style ChangeLog files with git? I'm googling it but I couldn't find anything clear	14:59
athought	git log has a --pretty=format to help you if there is no more comfortable way	15:00
	→ thierryM joined	15:00
offby1	jmbr: isn't this relevant? http://kerneltrap.org/mailarchive/git/2007/11/2/379541	15:00
	first google hit for "git changelog"	15:00
ThaDon	mugwump: ping	15:01
jmbr	it says it's at git/contrib and it isn't in the current repo so I thought it was deprecated	15:01
	→ rolf__ joined	15:01
	← rolf__ left	15:02
	→ rolfb joined	15:02
jmbr	thanks, anyway	15:02
	→ iabervon joined	15:03
	← rolfb left	15:04
	→ KirinDave joined	15:04
	→ proxie joined	15:05
	→ emlprime joined	15:06
ThaDon	git-svn question, n00b questions so bear with! I executed the following: git svn init -T trunk -t tags -b branches https://source.acme.com/Web/DataServices/prodx	15:07
	so in .git/config I see the url,fetch,branches,tags settings, they look good	15:07
	then I execute a git-svn fetch -r 1000:HEAD	15:07
	← athought left	15:08
offby1	.... and ?	15:08
ThaDon	after that completes, I run "git branch -a" and am sitting on the "master" branch, and see another branch called "trunk". Where are the "tags" and "branches" branches?	15:08
offby1	they don't exist!	15:09
	the tags have been turned into git tags	15:09
	and your branches are all there.	15:09
	at least, mine were.	15:09
	note that, in the typical svn repository, "tags" and "branches" aren't, in fact, branches; they're just ordinary directories.	15:09
ThaDon	hmmm, well all I have when I execut the branch -a command is "master" and "trunk"	15:09
offby1	hmm	15:09
	I did mine slightly differently: I just did "git-svn clone -s http:// ..."	15:10
ThaDon	right, I'm wondering if it doesn't work so hot with fetch, or doesn't work so hot with partial fetch (1000:HEAD)	15:10
	← jmspeex_ left	15:10
offby1	I suspect the latter.	15:11
	that partial fetch probably skipped the revision that created your branches and tags.	15:11
	→ jmspeex_ joined	15:11
ThaDon	wellll I guess I could clone... I better grab a coffee.	15:11
offby1	ayup	15:11
	→ gallo joined	15:11
ThaDon	offby1: yeha, I was watching it pull down stuff and it did indeed "skip" the revision where a branch was made	15:11
offby1	I did a big clone; took a couple hours but finished OK.	15:11
	← gallo left	15:12
offby1	however, now I don't know what to do with it. My attempts at merging have led to confusion.	15:12
	lots of conflicts, some of which I suspect (but am not sure) aren't "real"	15:12
ThaDon	offby1: let me ask you this. We also have a "releases" folder up on svn, would there be a way to incorporate that into my git branches? hotfixes go into that baby.	15:13
	last night I was tempted to do all my merging via svn in a separate set of working folders, but thought I would give this one more chance.	15:14
iabervon	offby1: git-svn should only give you real conflicts. The thing that's unfortunate about it is that it'll give you conflicts that you've already resolved over and over.	15:14
ThaDon	iabervon: i've run into that! annoying as hell!	15:14
iabervon	It's a problem with SVN's history representation. It can't represent two lines progressing for a while and having their conflicts resolved all at the end. And git isn't so good at passing the resolutions you've done around to the other spots in the history where you're trying to resolve the same thing in a context that's only different in irrelevant ways.	15:17
ThaDon	iabervon: is there any solution?	15:19
iabervon	Not that I know of, aside from not diverging from SVN for many commits.	15:20
	Or convincing your upstream project to switch to a DVCS. :p	15:21
ReinH	Generic UTC greeting, #git :)	15:23
	→ ferdy joined	15:23
	← proxie left	15:25
offby1	yow, that's truly nerdy	15:25
	good 1500	15:25
	ThaDon: I didn't mean to give the impression that I had a clue about git-svn. I've just played with it once. I dunno how you'd incorporate "releases". Maybe a command-line option?	15:26
	← jmbr left	15:27
ThaDon	offby1: thx. I'm sure at some point I'll better grasp the entire picture and will be able to draw parallels between how git does things and how svn does things. I'm still struggling a bit with some of the nomenclature	15:27
xenoterracide	if I set this in .gitconfig end of lines should be converted to LF right?	15:27
	14.3. Including External HTML Content	15:28
	14.3.1. Problem	15:28
	You want to combine (include) content from another HTML document into a single document on the page.	15:28
	14.3.2. Solution	15:28
	Put the external content into an iframe element, and disguise the iframe so that it looks to be part of the regular document flow. Here is an example of an iframe element that blends seamlessly into a plain HTML page:	15:28
offby1	yikes	15:28
	accidental paste?	15:28
	When I do that, I blame it on my cat.	15:28
	"Bad kitty, clicking Daddy's left-mouse button"	15:28
	→ xenoterracide joined	15:31
xenoterracide	sorry for the flood :( I had the wrong thing in my buffer. I only meant to paste 2 lines	15:32
	→ bryanray joined	15:33
	→ dsaxena joined	15:34
xenoterracide	anyways what I meant to ask...	15:35
	[core]	15:36
	autocrlf = true	15:36
	if I have that set in .gitconfig all lines should be converted to LF right?	15:36
offby1	I dunno how that works :-\|	15:36
xenoterracide	(I'm tracking gitconfig with git) and I get this :( warning: LF will be replaced by CRLF in gitconfig	15:37
	so it looks to me as if it's doing the opposite	15:37
	→ brosner joined	15:38
	→ gitguy joined	15:41
	← ferdy left	15:42
	→ ferdy joined	15:42
	← kumbayo left	15:46
	→ kumbayo joined	15:47
	← ferdy left	15:47
	→ ferdy joined	15:48
	→ gerhardlazu joined	15:57
floppyears	hi guys	15:57
	so I'm using git-svn to work on a project	15:58
	why does it ask me for my password multiple times when I use 'git svn fetch' ?	15:58
gerhardlazu	I'm pushing to a previous origin that used to work fine (on github.com), I'm now getting fatal: invalid number of threads specified (0)	15:58
	← sisir left	15:58
offby1	wow	15:58
gerhardlazu	and it goes on... error: pack-objects died with strange error	15:58
	anything changed since 1.5.4.4 that could cause this?	15:59
	← ThaDon left	16:00
	→ sisir joined	16:00
	→ madewokherd joined	16:01
	← ben_h left	16:04
	→ andres_f joined	16:04
	→ a-priori joined	16:06
	← sverrej left	16:06
	← andres left	16:06
	andres_f → andres	16:07
	→ pombred1 joined	16:10
	→ tvachon joined	16:14
	← patroy left	16:14
	→ SRabbelie1 joined	16:16
	← SRabbelie1 left	16:16
	→ SRabbelier joined	16:17
	← KirinDave left	16:18
Pieter	heya	16:22
	→ ThaDon joined	16:22
ThaDon	alrighty, git-svn clone'd all my tags and branches. Survived ubuntu 8.04 crashing 8/10ths of the way through. after restart git continued on like a champ	16:25
offby1	:-(	16:26
	glad it continued; pity Hardy crashed	16:26
Ed_	:D	16:27
ThaDon	so, now I have my svn branches/tags locally. I think I'm going to be re-iterating a problem that was brought up yesterday. that is, which I switch to one of my local branches and want to rebase/dcommit, how to I choose which location in svn to do that to?	16:27
	offby1: yeah, it's crashed a half dozen times so far. I thought at first it was because of	16:28
	"visual effects" being on, but those are off now. Might be the vpnclient, but you would hope a vpn client couldn't freeze the entire system, I mean, what is this windows?	16:28
offby1	ThaDon: I assume that your .git/config file describes, for one branch at least, where in svn your dcommits go.	16:29
Pieter	ThaDon: it will commit on the branch the last svn commit was on	16:29
	← ferdy left	16:29
floppyears	quick question	16:29
	→ ferdy joined	16:29
floppyears	so I use git-svn , if another programmer wants to join	16:29
	can they clone my git repo or do they have to go through the process of importing the git repo ?	16:29
Ed_	you mean: import the svn repo?	16:30
Pieter	they can clone your repo	16:30
ThaDon	Pieter: I did a git-svn dcommit --dry-run and it wants to commit against one of the branches, which was probably the last place somethign was commited	16:30
Pieter	floppyears: at the bottom of the git-svn manpage, it tells you how	16:30
floppyears	thanks Pieter	16:30
Pieter	ThaDon: it's supposed to commit on the branch you've checked out	16:30
	→ fhobia joined	16:30
	→ kanru joined	16:31
offby1	my "git --version" says "git version 1.5.5.1.118.g7def0". I understand every piece of that, except for the "g" after the final dot. What does that "g" stand for?	16:31
Pieter	offby1: the g is just a suffix used by git-describet	16:32
offby1	well, I know that	16:32
	but I wonder why "g" and not some other letter ...	16:32
Pieter	probably because hashes are limited to 0-f	16:32
offby1	ah	16:32
ThaDon	Pieter: oh this is strange, I did a git branch -a, saw the branch I wanted to switch to. So I switched to it by going "git checkout <branchname>" and it says "Note: moving to "cyo" which isn't a local branch"	16:33
offby1	I'd have used an underscore or something, but I guess they wanted to keep it alphanumeric	16:33
	yup	16:33
ThaDon	Pieter: and when I do a git branch -a I'm on a branch called "(no branch)	16:33
offby1	ThaDon: I think that warning is to remind you that you can't commit to a remote branch.	16:33
Pieter	ThaDon: yes, you sholudn't check out the branch directly. You should create your own branch that tracks the remote branch	16:33
floppyears	with git-svn when I create a git-tag does it also get committed as an svn tag ?	16:33
Pieter	ThaDon: try "git checkout -b own_branchname branchname"	16:34
	floppyears: no	16:34
ThaDon	Pieter: interesting, I shall give that a shot	16:34
floppyears	thanks Pieter	16:35
ThaDon	Pieter: awesome.	16:35
	→ markkalderon joined	16:35
	→ andres_f joined	16:36
	→ krawek joined	16:37
ThaDon	Pieter: one thing I noticed is at some point certain branches were deleted from svn, those still show up as valid remote branches after teh clone, is that right?	16:37
Pieter	probably, yes	16:37
ThaDon	it is funny though, local master is hooked up with a branch, not with trunk.	16:41
Pieter	you can reset that if you want	16:41
	→ eternaleye joined	16:43
	→ KirinDave joined	16:47
	→ markkald_ joined	16:48
	← kipras left	16:48
	← markkalderon left	16:50
	← emlprime left	16:51
	→ KirinDav joined	16:51
	← fhobia left	16:53
	← andres left	16:53
paulproteus	With git-svn, I find that the svn branches are "remote" branches, and I would like to automatically make local branches that track those remote branches.	16:55
Pieter	for all branches?	16:56
paulproteus	Yeah - that way, when I push my git-svn clone of a repository, when people clone that, they see all the svn branches as branches in their git remote.	16:56
	The idea is that I want to be able to just pretend the upstream project uses git rather than svn. (-:	16:57
	(And as they make changes, I want the git repo to reflect that.)	16:57
Pieter	why not use git push --mirror or so?	16:57
	or make a push refspec that pushes git-svn branches?	16:57
paulproteus	I used git push --all and that didn't do it, and I haven't quite understood refspecs yet.	16:57
	But lemme see...	16:57
	So right now, "git branch" shows no branches, and "git branch -r" shows a long list of svn branches.	16:58
	There is a branch called "wikidata", but http://pastebin.com/m1f3bf8b8 is the output of "find .git \| grep wikidata"	16:59
	So I don't see what parameters I would use in the refspec to match those, since they don't appear to be in .git/refs .	16:59
doener_	paulproteus: first line, actually	17:00
Pieter	it's probably because they're packed	17:00
paulproteus	Furthermore, .git/logs/refs/remotes/wikidata seems to be some file with both git and svn revision information in it.	17:00
doener_	oh, oops, logs/	17:00
paulproteus	0000000000000000000000000000000000000000 f1be654ca180b8203c8f68dfbd330b197acd898	17:00
	1 paulproteus [email@hidden.address] 1209553851 +0000 r10854	17:00
	is a sample line.	17:00
xenoterracide	how do I add autocrlf to .gitconfig so that it auto converts lines to LF? (I've read the docs but I don't think I did it right)	17:00
Pieter	paulproteus: try .git/packed-refs	17:00
	← sisir left	17:01
doener_	paulproteus: logs/ holds the reflog for the branch, those that you see with "git reflog show $branch"	17:01
	→ paulproteus joined	17:01
doener_	(IIRC)	17:01
paulproteus	Oops, wrong button.	17:01
	Okay, that has some lines like "6e7250c06b1fffe9ccb81ddfc2cbd82f825d66b1 refs/remotes/wikidata"	17:01
	So does that mean a refspec that says to push refs/remotes/* to the "origin" would handle it?	17:02
Pieter	refs/remotes/:refs/heads/svn/ or so is probably what you want	17:02
paulproteus	Pieter, Like http://pastebin.com/m5035c7dc ?	17:03
	The idea is that I would git-svn fetch, and then push to origin.	17:04
Pieter	paulproteus: you'll need a push line, not a fetch line	17:06
	and you'll probably need to reverse the left and right side	17:06
	but I'm not suder :)	17:06
	*sure	17:06
	← andres_f left	17:08
gerhardlazu	any major changes to git in the past 2 weeks? My OS X git install via MacPorts started throwing errors when pushing stuff.	17:16
	any Mac users around?	17:16
thierryM	gerhardlazu : I know, I posted a comment on how to fix it at http://trac.macosforge.org/projects/macports/ticket/15100	17:16
	gerhardlazu : It will probably be resolved in a couple of days at worst	17:16
	gerhardlazu : if you really need it right now you can download macports svn, make the changes inside it and rebuild you package	17:16
gerhardlazu	thierryM: oh, ok. so it IS an SSH error then.	17:16
	thierryM: grab the svn source you mean?	17:16
ThaDon	Pieter: niice, did a git reset --hard trunk on master and it worked like a charm	17:16
gerhardlazu	thierryM: oh, sorry, right, I get you now	17:16
thierryM	gerhardlazu : for my part, I got the svn following this : http://trac.macosforge.org/projects/macports/wiki/howto/SyncingWithSVN	17:16
	gerhardlazu : and then I did sudo port -nf upgrade git-core after the changing the problematic line	17:16
	run port edit git-core ($EDITOR should be exported) to edit the necessary file after setting your svn properly	17:17
	→ zpinter_ joined	17:18
gerhardlazu	thierryM: k, giving it a go now	17:18
	→ dreiss joined	17:18
thierryM	gerhardlazu: k, tell me if anything fail, I might be able to help	17:19
gerhardlazu	cool :)	17:19
	→ destruct joined	17:22
	→ johnw joined	17:30
gerhardlazu	thierryM: you are a star mate ;)	17:34
	worked spot on	17:34
	so from now on	17:34
	rather than sudo port sync	17:34
	I need to get into the dports dir	17:35
	and do an svn up	17:35
thierryM	gerhardlazu : I'm not that smart, I worked 1 hour on it with someone else to make it work :P	17:35
gerhardlazu	before sudo port upgrade	17:35
	right?	17:35
	thierryM: well, you had it figured out before me. I was banging my head a bit a few days ago, dropped it, came back to it today	17:35
	you saved me a lot of time, cheers ;)	17:35
thierryM	mmm not sure about that part, the guy that helped me told me that even updating port wouldn't be a problem, but the better way is to test it	17:36
gerhardlazu	ok, not a problem, cheers mate ;)	17:36
thierryM	:)	17:37
gerhardlazu	thierryM: check this out http://groups.google.com/group/github/browse_thread/thread/c5a0e06690e216e2	17:37
thierryM	wow I'm mportant now ;)	17:37
	→ hackbert-hh joined	17:37
gerhardlazu	you are indeed :)	17:38
	← ebel left	17:41
	← gerhardlazu left	17:43
	→ acm joined	17:45
	→ _graham_ joined	17:50
	→ gerhardlazu joined	17:51
	← gerhardlazu left	17:51
	← chris2 left	17:53
	← krawek left	17:57
	← hackbert-hh left	18:01
	→ SRabbelie1 joined	18:04
	← SRabbelie1 left	18:04
	← SRabbelier left	18:04
	→ SRabbelier joined	18:05
	→ dreiss_ joined	18:12
	← dreiss left	18:13
	← xenoterracide left	18:14
zdennis_	is it possible to clone a particular branch from a repository?	18:15
Pieter	you'll have to a git init, and only fetch the specific branch	18:16
	← kumbayo left	18:16
	← eternaleye left	18:17
	← vbgunz left	18:19
	← dsaxena left	18:19
	→ eternaleye joined	18:19
zdennis_	thx Pieter , i'll look into doing that	18:20
	← aroben left	18:25
	→ aroben joined	18:25
	→ LoPMX joined	18:31
paulproteus	Pieter, Thanks for clearing me up earlier. If I want to thank you on a web page post about my git-svn setup, is there a specific name or URL you want me to use? (Feel free to answer in the form of an HTML fragment.)	18:32
	→ timocratic joined	18:32
	→ texel joined	18:32
	← acm left	18:33
texel	Hmm... Is it possible to send a newly created git tag up to a svn server using git-svn?	18:33
johnw	texel: your tag names a commit that is only local	18:34
	what you want is a transfer of that tag to a subversion tag bound to the related revision number?	18:35
texel	Yep.	18:35
	You nailed it. =o)	18:35
johnw	i think you could write a script to do that quite easy, using git-show and svn tag	18:35
	or better, git cat-file commit HASH	18:35
	pull out the svn-rev from the commit's comment	18:35
	then use svn itself to create the tag	18:35
texel	Mm.	18:37
	Not a bad idea, actually.	18:37
	Too bad it's not implemented in git-svn dcommit, though.	18:37
	← krh left	18:37
johnw	i don't think dcommit can even create remote branches, can it?	18:37
	texel shakes her head	18:37
texel	Yeah, I'm afraid not.	18:37
	git-svn dcommit is rather... ...sparse in terms of functionality.	18:38
johnw	ooh, use git-svn find-rev HASH	18:38
	that will return the SUbversion rev number for HASH directly	18:38
texel	Nice.	18:38
	Okay, I'll give that one a shot. Maybe even send a patch upstream to integrate that stuff into git-svn directly.	18:39
	Unless, of course, git-svn is abandoned. O.o	18:39
johnw	this needs much improvement, but: URL= $(grep url .git/config \| awk '{print $3}') svn copy $URL/trunk $URL/tag/$(git-svn find-rev $HASH)	18:40
	need to 1) make sure you use the right url from .git/config (I'm sure there's a git-config command for pulling it out), and check to be sure that an SVN rev does exist for HASH	18:41
	git config svn-remote.svn.url	18:43
	there you go	18:43
	← dreiss_ left	18:44
johnw	URL=$(git config svn-remote.svn.url) svn copy $URL/trunk $URL/tag/$(git svn find-rev $HASH)	18:44
	s/tag/tags	18:44
	→ warthog9 joined	18:45
johnw	last try: URL=$(git config svn-remote.svn.url) svn copy -r $(git svn find-rev $HASH) $URL/trunk $URL/tags/$TAGNAME	18:45
texel	hehe	18:45
	texel loves how git makes things easy	18:46
johnw	me too!	18:46
texel	So then the next question is...	18:46
	...the next time I do a git-svn rebase...	18:46
	...what happens when git-svn sees the new tag?	18:46
Cacher	If I have a repository that I am working on and I want to work on it from another computer, Should I create a "bare" repository and push to the bare repository, then pull/push on the bare repository from the second computer?	18:46
texel	It'll probably re-import it as a lightweight branch, yes?	18:46
	← bentob0x left	18:46
johnw	i'm sure that it looks for new branches when you fetch	18:47
	reading...	18:47
texel	Err... s/branch/tag/	18:47
johnw	i don't know what will happen	18:47
	i'd try out your theories on a sample repo	18:47
	texel nods	18:48
	← FunkeeMonk left	18:48
johnw	the odds are, you'll have a local Git tag, and a remote tag, which ought to match up	18:48
	texel nods	18:50
	→ Eridius joined	18:51
johnw	i'm playing with different merging tools for OS X today	18:51
	← Sho_ left	18:52
	→ Sho_ joined	18:52
	← LoPMX left	18:57
	→ hermax_ joined	18:57
	← hermax_ left	18:57
	→ LoPMX joined	18:58
	→ agib joined	18:58
	→ Fullmoon joined	18:59
cworth	So, I've got a commit of interest, and about 60 branches. Any suggestions for the easiest way to find which branches can reach that commit?	19:00
	→ dreiss_ joined	19:01
	← m3thos left	19:01
	← Sho_ left	19:03
	→ Sho_ joined	19:04
cworth	Looks like "gitk --all" and goto sha1 did the trick in this case.	19:04
	→ sverrej joined	19:09
	→ zeom joined	19:11
	→ kosh[0] joined	19:13
	← zed_ left	19:14
kosh[0]	hi, I am wanting to grab a tag from my repo, so I goto my project dir where I want to put the files and do a git checkout /<path>/project.git/ and it keeps saying tht it's not a valid repository	19:14
RandalSchwartz	you don't checkout a .git	19:15
	you checkout a tag	19:15
	in the current repo	19:15
	tag/commit/sha1 etc	19:16
kosh[0]	in the current repo?	19:17
RandalSchwartz	yes	19:18
	go to your workdir	19:18
	git checkout $tagname	19:18
	you don't say ".git" anything :)	19:18
	that will make the workdir match that tag	19:18
	→ vbgunz joined	19:19
Mikachu	i think maybe kosh[0] wants clone, not checkout?	19:25
	→ joevandyk_ joined	19:26
	← BabelO left	19:29
	→ pygi joined	19:31
	← kosh[0] left	19:36
	→ niki joined	19:37
	← gitguy left	19:38
Pieter	paulproteus: you can use frim.nl if you like	19:39
	anyone know if I can look at live snooker somewhere?	19:39
	→ kelvie_ joined	19:54
	← madewokherd left	19:55
comp	greetings, how the "author" field (in a commit) is used? Does belong to the creator of that commit and doesn't change after pull/cherry-pick?	20:03
	→ dotsintacks joined	20:04
	→ leanucci joined	20:04
leanucci	hi	20:04
Eridius	comp: right	20:04
	the committer field is set based on who creates the commit, but the author field denotes who wrote the actual changes	20:04
	so format-patch/am and cherry-pick won't change the author field even though they will set you as the committer	20:05
	→ krawek joined	20:06
leanucci	consider this scenario: a remote origin, a local master branch that i merge remote changes against, and a local, outdated branch of the local master. question is: how do i see the changes applied to local master that have not yet been applied to the local branch?	20:07
	git fetch master and then git diff?	20:07
jamesjb	leanucci: git log -p HEAD..origin/master or so?	20:07
leanucci	jamesjb, that would give me a diff of the changes in master not applied tothe branch? (both local)	20:08
jamesjb	well, maybe not HEAD, but with the correct names that might be right... or i'm simplifying your question too much ;)	20:10
	→ xenoterracide joined	20:10
leanucci	jamesjb, simplicity is a plus, im just to svn-ish yet and the transition needs time	20:10
	what does -p do?	20:11
jamesjb	leanucci: shows you the diff for each commit in the log	20:11
	→ jerbear joined	20:11
leanucci	oh	20:11
	i see	20:12
comp	Eridius: thanks	20:13
	← sverrej left	20:13
	→ sverrej joined	20:14
	→ e-dawg joined	20:22
	→ harryv joined	20:23
harryv	hey, i pushed some commits to remote that i want to undo, not just revert. how would i do that?	20:23
	→ madewokherd joined	20:24
Pieter	~.	20:25
	← grumbel left	20:27
	← leanucci left	20:27
xenoterracide	how do I checkout a single file from a previous commit version?	20:27
	← pygi left	20:27
Pieter	git checkout REF -- path/to/file	20:27
	← marlun left	20:28
Eridius	harryv: git reset	20:28
	→ GyrosGeier joined	20:28
Eridius	however, undoing pushed commits is generally not recommended, since anybody else who's fetched from your remote will them have issues (and will have to force the fetch)	20:28
harryv	(solo-repo	20:28
xenoterracide	Pieter: thanks	20:28
harryv	thanks.	20:28
	← harryv left	20:29
aniero	Eridius: how would you go about doing that, if you did accidentally push something you didn't want to?	20:30
Eridius	aniero: I'd probably create a new branch based on the old version that I want the remote to have, then push that new branch to the old branch on the master	20:30
	→ fron joined	20:30
aniero	Eridius: hmm, ok. i think i follow	20:31
Eridius	or, as I was trying to suggest to harryv, you could just reset your current branch, push, then reset back to the previous version	20:31
	actually, you could do `git push remote sha1:master` to push a specific sha1	20:31
	but I wasn't sure if that was possible until just now when I checked the manpage	20:31
	← jerbear left	20:33
aniero	Eridius: cool, thanks	20:35
	→ schacon_ joined	20:40
xenoterracide	warning: LF will be replaced by CRLF in vimrc (how do I get it so that it replaces CRLF's with LF)?	20:40
	← pombred1 left	20:42
	← Fullmoon left	20:43
	→ etnt joined	20:46
	← janm left	20:46
	→ pygi joined	20:47
	← bryanray left	20:48
	→ jerbear joined	20:58
	→ juanbond joined	20:59
	← Eridius left	21:00
	← ironfroggy left	21:04
	→ mczepiel joined	21:13
juanbond	if i just created and checked out a branch in my local repository, how can i push the branch up to my github account?	21:14
	just do a git push github branchname?	21:14
	← krawek left	21:15
	← jerbear left	21:19
	→ gitguy joined	21:20
	→ felipe joined	21:21
juanbond	ok, so i cloned my github repository locally, i created a new branch and checked it out, i then pushed that branch to my github repo, then i tried to clone my github repo into another folder so i can do work on that branch and when i clone, the branch does not come down with it. what am i doing wrong?	21:22
	← threeve left	21:23
	→ m3thos joined	21:24
fujin	juanbond: git checkout --track -b blahblah origin/remotebranchname ?	21:25
	→ jerbear joined	21:25
juanbond	wonderful!	21:26
	so, when you clone, it really does pull down all branches, you just need to checkout that branch locally after you clone.	21:27
	← Yuuhi left	21:27
	→ wagle joined	21:27
	→ pombreda joined	21:29
	→ bdiego joined	21:30
	← johnw left	21:30
	← LoPMX left	21:30
	→ \|mako\| joined	21:31
	→ spearce joined	21:35
	← d0k left	21:35
	← dotsintacks left	21:40
	← railk left	21:42
	← e-dawg left	21:44
	→ kristoffer joined	21:45
	← jacqui left	21:50
	→ dsaxena joined	21:54
	→ Cacheaway joined	21:56
juanbond	whhat's a wip branch?	21:57
vmiklos	work in progress :)	21:59
	technically it's a normal branch but it's something that you don't want to release as "working" yet	21:59
juanbond	nice, figured it was something along those lines.	22:00
	thanks!	22:00
	← jerbear left	22:03
	→ dave_h_d joined	22:03
	→ Eridius joined	22:04
	← ph^ left	22:07
	← \|mako\| left	22:08
Cacheaway	Hey I have a question.	22:08
frsk	Shoot	22:08
Cacheaway	I have a project that I recently imported into git from svn, and I want to start working on it from a remote computer	22:09
	I understand it is not advisable to push from a remote machine into a working copy	22:09
	so should i clone --bare and push/pull from the bare clone from now on?	22:09
	RandalSchwartz averts his eyes at the mention of svn	22:09
RandalSchwartz	oh - you can push into refs/remotes/*	22:10
	just don't push into refs/heads	22:10
	then you just have to remember to refresh/rebase onto your pushed item	22:10
	just as you would a fetched item	22:10
	→ mxNet joined	22:10
mxNet	how do i undo working tree changes to the state of my last commit?	22:10
RandalSchwartz	I do that to push from laptop to server, even though I want only a non-bare on the server	22:10
mugwump	Cacheaway: this is answered on the faq under unexpected behaviour	22:11
RandalSchwartz	indeed	22:11
mugwump	there is a hook you can employ if you want darcs/bzr/hg-like behaviour	22:11
mxNet	would appreciate advice	22:11
	← wagle left	22:11
RandalSchwartz	mxNet - your question is also a FAQ	22:11
	man "git-reset"	22:11
mxNet	RandalSchwartz: thought so, sounds trivial	22:11
RandalSchwartz	but ideally, you would have gone through a tutorial before starting with git	22:12
mxNet	RandalSchwartz: heh, did that, it caused some problem like a file requires an update	22:12
RandalSchwartz	nearly every tutorial coverss that.	22:12
	"git-reset --hard HEAD"?	22:12
mxNet	RandalSchwartz: i read nearly each of them, but you know how it is, can't hold everything at once in your head till you practice it 10 times	22:12
	RandalSchwartz: thanks	22:12
	← KirinDav left	22:13
	→ KirinDav joined	22:16
Cacheaway	from the FAQ: A quick rule of thumb is to never push into a repository that has a work tree attached to it, until you know what you are doing.	22:17
	i think the FAQ is why I am here, I've read this.	22:18
	← _graham_ left	22:19
mugwump	yeah. personally I think that's a bit of an apologist rule of thumb	22:19
RandalSchwartz	yeah - the real rule is "don't push to the currentl-checked-out local branch"	22:20
mugwump	but even that is a silly rule	22:20
RandalSchwartz	so the first answer is "don't push to a non-bare repo"	22:20
mugwump	the question is "why not"	22:20
RandalSchwartz	because it reverses the index	22:20
mugwump	it works in the other tools	22:20
RandalSchwartz	other tools may be broken. :)	22:20
mugwump	it's tricky to do it in a robust fashion	22:20
	but I think it could be done	22:21
Cacheaway	so, I've decided that I don't want to push into a working copy	22:21
	what i said earlier the way to do it?	22:21
mugwump	a bare intermediate repository will work	22:22
Cacheaway	is intermediate a git term or do you mean "a bare repository between the two working copies will work"	22:24
spearce	the latter	22:24
fujin	intermediate is a concept :P	22:24
Cacheaway	bare is also a concept, but when talking about git it means something else ;)	22:24
RandalSchwartz	bear is not a concept... it's an animal. :)	22:25
spearce	yes, sadly in git it doesn't have quite the same meaning as in real life. ;-)	22:25
Cacheaway	so my plan is to do "git clone --bare /project /barerepo"	22:26
	← KirinDav left	22:26
Cacheaway	and then on the remote machine I will "git clone server:/barerepo"	22:27
	→ KirinDav joined	22:27
Cacheaway	then replace /project with something cloned from /barerepo	22:29
	does that sound like a sound lan?	22:29
	plan	22:29
	← dave_h_d left	22:29
RandalSchwartz	why use a copy of a copy?	22:29
	just use the original, push to /barerepo	22:30
Cacheaway	i thought about that, i could modify the "origin" in the config file right?	22:30
RandalSchwartz	there's nothing special about the word "origin"	22:30
	just add the remote repo, and check it out	22:30
Cacheaway	nothing?	22:31
RandalSchwartz	nothing	22:31
Cacheaway	isn't it the default push pull target?	22:31
RandalSchwartz	just like there's nothing special about "master"	22:31
	it's set up on a clone	22:31
	but otherwise, meaningless	22:31
	the default for pull and push depends on your current branch	22:31
	→ unreal_ joined	22:31
RandalSchwartz	git checkout -b myname remote/branch/name	22:31
	that associates myname with "remote"	22:32
	so default fetch updates "remote"	22:32
	and default push pushes "remote"	22:32
Cacheaway	as clueless as I am at this point, I am starting to think I will love git the more I learn	22:34
comp	how can I prune remote master branch?	22:35
RandalSchwartz	you can't prune a remote	22:35
	pruning is a local operation	22:35
	unless you mean somethign else	22:35
comp	i mean delete everything	22:35
	I have some project on repo.git.cz and pushed a wrong local repo in it	22:36
mugwump	push a delete	22:36
	git push origin :refs/heads/master	22:36
comp	well .. error: unlink(.git/refs/remotes/repocz/master) failed: No such file or directory	22:37
mugwump	can you paste the whole command output to rafb.net ?	22:38
comp	sure	22:38
	http://rafb.net/p/g5iW6466.html	22:39
	I probably know what caused this error	22:40
	→ bododo joined	22:40
comp	I did git-branch -d -r repocz/master	22:40
	because the git push origin :refs/heads/master gave me another error	22:40
	(before that)	22:41
bododo	RandalSchwartz: heh! papy	22:41
Ilari	comp: 'git push repocz :refs/heads/master'?	22:41
comp	just copy&paste here	22:42
	so I had right syntax	22:42
	→ drizzd joined	22:42
comp	git-remote update probably works, I get the same error as before	22:43
	← eternaleye left	22:43
comp	(http://rafb.net/p/Qf27yI86.html)	22:44
Ilari	comp: Perhaps do 'git ls-remote repocz' and see if the master is still there?	22:44
	→ david_koontz joined	22:44
	← bododo left	22:45
	← KirinDav left	22:45
comp	Ilari: no, not really, but I can browse it in the gitweb interface	22:45
	I'll try to delete all tags	22:45
	← KirinDave left	22:46
comp	well... it's gone now, thank you for help	22:46
cehteh	grave bugs of git-core ( -> 1:1.5.5-1) <pending>	22:47
	#478647 - git-core: bisect eats branches and pees on carpets	22:47
	.. lmao :)	22:47
spearce	haha	22:48
	← unreal left	22:48
	unreal_ → unreal	22:48
	→ KirinDav joined	22:52
	← thiago_home left	22:56
	→ igorgue joined	22:59
	→ wagle joined	23:01
	→ Klowner_ joined	23:03
	← ggeecko left	23:05
	← cannonball left	23:05
daaku	does anyone use git on top of cvs? i find it keeps missing commits and the only way i seem to have around it is to start from scratch	23:05
	← mxNet left	23:08
	← zpinter_ left	23:14
	→ pflanze joined	23:16
	← vivien left	23:16
pflanze	Hello. I'd like to create multiple branches without a common base, right from the start, in the same repository;	23:16
	how do I do that?	23:16
	(yes I want to dissect the working dir into separate 'partitions')	23:17
	i.e. git-add a b c; git-commit; then rename that branch, and create a new empty one.	23:18
	How do I do that last point?	23:18
	← a-priori left	23:19
DrNick	git branch name	23:19
daaku	you cant branch from nothing. a branch has to grow from somewhere	23:20
pflanze	But you can have disconnected branches.	23:21
	You can add them from remotely, so..	23:21
	do I have to hack around in the repository I guess?	23:22
daaku	but they need to be born from somewhere iirc	23:22
pflanze	hm every branch is born from nothing at some point	23:22
	← kristoffer left	23:22
tmm1	anyone using msysgit?	23:22
	← felipe left	23:23
wnight_	git is taking 3+ minutes for a 1 second commit, intermittently. When I strace it during this it's doing nothing but stat64'ing object files. The files aren't being read, let alone 'touch'ed in between these operations so I don't know what would trigger this. I've only seen the behavior from within a script - not directly at the command-line.	23:23
pflanze	wnight_: git has to check whether they have changed, right? Maybe you're seeing cold vs. warm cache behaviour?	23:24
mugwump	platform and filesystem can make a difference sometimes...	23:24
cousin_it	I'm doing a git clone ssh://.... and it's failing with "bash: git-upload-pack: command not found", however, git-upload-pack is in my path on both local and remote boxes	23:25
	← xenoterracide left	23:25
	→ a-priori joined	23:25
pflanze	cousin_it: PATH doesn't matter for non-interactive ssh logins	23:26
daaku	cousin_it: what sets your path? maybe its not being set via the right init script [bashrc works but profile doesnt or something like that]	23:26
pflanze	cousin_it: more precisely: the PATH being set up by shell init files.	23:26
	← a-priori left	23:26
daaku	it can - depending on which init file sets it	23:26
	login vs interactive	23:27
	(or both)	23:27
cousin_it	hmmm, so I need to set the path in /etc/bash.bashrc?	23:27
wnight_	Hmmm. I wonder why it takes so long, I can tar the whole thing (just tried) in 18 seconds. 128 MB of files + .git	23:27
daaku	~/.bashrc	23:27
	why mess with / when ~ will do	23:27
pflanze	wnight_: yes but your OS page cache is already warm right?	23:27
wnight_	And that's cold-cache behavior I'd imagine because the drive did seem to be grinding.	23:28
	What should I do to flush it?	23:28
pflanze	wnight_: on linux?	23:28
wnight_	yeah	23:29
cousin_it	~/.bashrc fixed it, thanks	23:29
wnight_	sorry, I forget other OSes exist.	23:29
pflanze	wnight_: there's some file in /proc for that..	23:29
jengelh	there is no other os :p	23:30
pflanze	wnight_: /proc/sys/vm/drop_caches maybe, try with echo 1 > /proc/sys/vm/drop_caches but don't come to me if it eats something.	23:30
	wnight_: maybe better check the docs aka google.	23:30
	wnight_: you could search the git ml for linus and that, he used it there iirc.	23:31
jengelh	echo 3 >	23:33
	→ felipe joined	23:33
	← m3thos left	23:34
	→ bentlege1 joined	23:35
wnight_	Yeah, sorry, I was manning proc myself. I tried 3 and it didn't seem quite right, so I'm just copying a huge file. That should do it.	23:36
	← fron left	23:37
pflanze	wnight_: if linux is good enough and detects serial reading/writing, it maybe won't do it	23:39
	wnight_: you could also umount the filesystem; if nothing else references the device, linux will drop it's pages.	23:41
	← brosner left	23:43
wnight_	pflanze: true. unmounting is a good idea. It'll give me an opportunity to make sure it hasn't got any hardcoded references to its current path.	23:45
	...moving it elsewhere, and all.	23:45
	→ spearce` joined	23:46
	← spearce` left	23:47
comp	if I specify some commit to be cherry-picked and that commit doesn't exist on my local repo, will cherry-pick search for it on remotes?	23:49
	← KirinDav left	23:50
comp	because I did a git reset --hard on my devel branch and that commit wasn't anywhere in my repo (was it commit object?), but cherry-pick found it somewhere and applied it	23:51
	→ KirinDav joined	23:52
pflanze	daaku / DrNick : renaming the branch, then echo 'ref: refs/heads/master' > .git/HEAD works just fine for creating a new detached branch :)	23:54

Logs Search ←Prev date Next date→

Channels Documentation