IRCloggy #git 2009-12-11

Provider of IRC logs since 2005.

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

	2009-12-11
hacim	i guess this is why I asked my original question	00:00
	are there any tools that make this more clear that I can use to understand what happened?	00:00
	← mattions left	00:01
	← Paraselene_ left	00:03
	← mattweg left	00:04
	mattweg_ → mattweg	00:04
	→ kpreid_ joined	00:05
hacim	oh interesting, I can right click on a line and ask gitk to tell me the origin of a line	00:06
	→ bcardarella joined	00:06
hacim	that helps me understand things a little more	00:07
	→ Paraselene_ joined	00:09
	← vvsh left	00:11
	→ jspiros joined	00:11
	← SRabbelier left	00:12
	→ SRabbelier joined	00:13
	← madewokherd left	00:13
	← broquaint left	00:14
	← Geralt left	00:14
	← raichoo left	00:15
	← __iron left	00:15
	→ __iron joined	00:15
	← smotchkkiss left	00:20
	← tvw left	00:21
	→ flaguy48 joined	00:22
	← sgh left	00:22
	→ ron_ joined	00:24
	← SRabbelier left	00:26
	→ yarddog joined	00:26
	← ron___ left	00:27
	← khmarbaise left	00:28
	→ SRabbelier joined	00:28
	→ jmcantrell joined	00:29
	Wolf2k_Pinged → Wolfman2000	00:30
	→ ajonat joined	00:30
	→ magcius joined	00:31
magcius	eek	00:31
	→ sgh joined	00:31
magcius	I just had the wonder of looking at somebody's "custom" Git setup	00:31
	← fualo left	00:31
	→ ereslibre joined	00:31
	→ hipe_ joined	00:31
	← Wraithan left	00:32
magcius	where, git-checkout-ng symlinks the file in the working directory to the associated file in objects	00:32
	the horror	00:32
	← hipe left	00:33
	← rphillips left	00:33
	← LiamH left	00:33
wereHamster	why do that?	00:34
	m-takagi_ → m-takagi	00:38
	→ rphillips joined	00:38
	← Yuuhi left	00:38
	→ tfarina_ joined	00:39
RobertLaptop	ok my day sucks. Someone made a typo in a request for repo's I setup about 30 repo's using zues_xxx instead of zeus_xxx there is already code committed and stuff setup before someone google zeus and figured out the mistake. Now I need to fix it. Am I looking at a ton of cloning in my future?	00:40
	← Mezner left	00:40
	→ jrmuizel joined	00:40
	→ Brack10 joined	00:41
	← ajonat left	00:41
	← Brack10 left	00:41
wereHamster	what's zeus_xxx? The name of the repository? The name of the committer as recorded in the commits?	00:42
	→ dgarr joined	00:43
	→ ajonat joined	00:44
	→ ron___ joined	00:44
RobertLaptop	zeus_xxx is the base name of the repo	00:45
	→ catalis joined	00:46
	→ MrUnleaded joined	00:46
RobertLaptop	I have about 30 repo all starting with zues_xxx when zeus_xxx is what the manager wanted. Problem no one noticed the mistake until there was some use.	00:47
MrUnleaded	does anyone know how to update your refs for a remote? some of the remote's refs were deleted but if i do a fetch my local repo's copy of those remote refs are not deleted	00:48
johnw	git remote purge <name>	00:49
MrUnleaded	prune oh thats right	00:49
johnw	oh yeah, prune	00:49
MrUnleaded	thanks...i could of deleted them out of the refs directory but just couldnt remember the "proper" way	00:50
	← MrUnleaded left	00:51
wereHamster	RobertLaptop: and where do you have these repositories? Are you managing them with a special tool (gitolite for example) ? Or did you create them manually?	00:52
RobertLaptop	gitolite	00:52
	I have root access to were the repo are stored if it makes a diff	00:53
	← qhoxie left	00:53
wereHamster	then rename the directories, adjust gitlite.conf and tell all users to adjust the urls in their .git/config files	00:53
RobertLaptop	That simple yea	00:53
	so nothing is stored or hidden config files in the folder them?	00:53
wereHamster	no	00:54
	← cjs left	00:54
	→ GMFlash joined	00:54
RobertLaptop	Just rename in both places. Yea that makes life much easier	00:54
	Thank You wereHamster	00:54
	→ ecgrieco joined	00:54
GMFlash	hello. is it possible to just add a specific folder from another git repo as a submodule rather than the entire project?	00:55
wereHamster	no	00:55
	→ john268 joined	00:55
	← Pewpewarrows left	00:55
GMFlash	thanks wereHamster	00:55
	→ qhoxie joined	00:56
	← up_the_irons left	00:56
	→ up_the_irons joined	00:56
	→ sdboyer joined	00:56
	← tfarina left	00:57
	→ threeve joined	00:58
	← stamina left	00:58
	→ stamina joined	00:58
	← psoo left	00:59
	→ pklingem1 joined	01:00
	→ madewokherd joined	01:00
	← jrmuizel left	01:03
	← ron_ left	01:03
ecgrieco	Is there a philosophical reason for the above?	01:04
	← Sho_ left	01:04
wereHamster	ecgrieco: http://git.or.cz/gitwiki/GitFaq#HowdoIcloneasubdirectory.3F	01:04
	← sgh left	01:05
	← catalis left	01:06
	← mattweg left	01:06
	→ mattweg joined	01:06
	← madewokherd left	01:07
ecgrieco	Thanks for the link. So it looks like no, just not implemented.	01:08
	→ madewokherd joined	01:08
ecgrieco	I ask because I would like to clone a single directory from one branch to another. The only way I can see to emulate this behavior is with submodules but, for my purposes this becomes unwieldy.	01:09
	→ jinzhu joined	01:09
	← fcuk112_1 left	01:10
wereHamster	or you could change your repository layout/setup or workflow so that you don't need to merge selected subdirectories between branches	01:11
	← rudi_s left	01:12
ecgrieco	Yeah, there is the possibility that it's not the best way to use git and something like Capistrano should be used instead or in conjunction. I'd like to manage the configuration files for a distributed Nagios monitoring system.	01:12
	The problem is that some files need to be on all machines and others only need to be on one or two machines. The submodule approach quickly leads to one repository per remote sensor.	01:13
	→ babilen_ joined	01:13
	← vbgunz left	01:14
	→ rchavik joined	01:15
	← qhoxie left	01:15
engla	magcius: I hope it was a hard link, not symlink	01:15
	→ j416 joined	01:15
	← dreiss left	01:16
	→ broquaint joined	01:19
	→ blaines joined	01:20
	← blaines left	01:20
	→ Sho_ joined	01:20
sitaram	RobertLaptop: you around?	01:21
RobertLaptop	Yes	01:21
benjo2	ecgrieco: puppet might also have something that does what you want	01:21
RobertLaptop	sitaram yes	01:21
sitaram	RobertLaptop: make sure you rename the actual repos before you adjust gitolite.conf and push it; otherwise it will create empty ones of that name. Not a big problem but just makes things easier by doing it in that order	01:21
	← Gitzilla left	01:22
ecgrieco	benjo2: thanks, I'll check it out	01:22
RobertLaptop	Yea sitaram that was the plain to avoid that.	01:22
	← babilen left	01:25
	→ ispeak joined	01:27
	← Sho_ left	01:28
	← smuf left	01:28
	→ Sho_ joined	01:29
	← kpreid_ left	01:29
	→ fualo joined	01:30
	← patmaddox left	01:30
	← justin-george left	01:31
	← sh1mmer left	01:34
	← aisipos left	01:34
	← Ryback_ left	01:39
	→ Gitzilla joined	01:40
	→ EricInBNE joined	01:41
	← ajonat left	01:43
	→ aisipos joined	01:43
	← vinse left	01:45
	→ Analias joined	01:46
	→ ben_h joined	01:46
	← babilen_ left	01:47
	← sdboyer left	01:48
	← benjo2 left	01:49
	→ sdboyer joined	01:50
	→ paltman joined	01:52
	→ sh1mmer joined	01:53
	← bcardarella left	01:54
	← WALoeIII left	01:54
	→ kpreid_ joined	01:56
	← mjf left	01:57
	← botanicus left	02:01
	← mattweg left	02:02
	→ Keiya joined	02:03
	← ecgrieco left	02:04
	← munichlinux left	02:05
	→ hakunin joined	02:07
	← ispeak left	02:08
	← ereslibre left	02:09
	→ breitz joined	02:09
	← ben_h left	02:11
	← breitz_ left	02:12
	→ ben_h joined	02:13
	← gaveen left	02:13
	← Keiya left	02:15
	→ Keiya joined	02:15
	→ dreiss joined	02:15
	→ D[a]vey joined	02:20
	← Keiya left	02:20
	→ camonz joined	02:21
	→ hipe__ joined	02:22
	← cubuanic left	02:24
	→ VVSiz_ joined	02:24
	→ godsflaw_ joined	02:24
	D[a]vey → Davey	02:25
	← hipe_ left	02:27
	→ Keiya joined	02:30
	→ upul joined	02:32
	→ hipe joined	02:32
	← godsflaw left	02:33
	← hipe__ left	02:33
	→ patmaddox joined	02:33
	← parasti left	02:34
	→ munichlinux joined	02:37
	← munichlinux left	02:37
	← krawek left	02:39
	→ krawek joined	02:40
	→ allenwei joined	02:40
	← tstclair_bbl left	02:40
	→ mamund joined	02:40
	← hipe left	02:41
	→ hipe_ joined	02:41
	← VVSiz left	02:42
	→ benjo2 joined	02:46
	← tfarina_ left	02:48
	← kpreid_ left	02:48
	→ kpreid__ joined	02:48
	→ bgerber joined	02:48
	← jmcantrell left	02:49
	← Sho_ left	02:52
	← suman left	02:57
	→ Tjh_ joined	03:04
	← GMFlash left	03:04
Tjh_	hello there	03:04
	← r11t_ left	03:06
	← JasonWoof left	03:06
Tjh_	is there any git (prererably ncurses or smthg) front end that would display a nice tree diagram of the branches etc?	03:06
wereHamster	git log --decorate	03:06
Tjh_	i know gitk does that and other gui clients do that, but id like a cli one	03:06
	o really	03:06
wereHamster	er, --graph	03:06
	or git show-branch	03:06
Tjh_	meh	03:07
	theyre ok	03:07
	not very tree like tho	03:07
	:(	03:07
wereHamster	git log --graph is as close as you get	03:08
Tjh_	like umm ok have u seen the graph in man git-cherry?	03:08
	thats what i want	03:08
wereHamster	those were written manually	03:09
	also, time on the horizontal axis? that doesn't look very useful	03:09
Tjh_	yea true	03:10
	← hakunin left	03:10
Tjh_	but basically smthg like tha	03:10
wereHamster	so something like that or something like the gui clients have?	03:10
Tjh_	its fun to watch ur $HOME look like a tree	03:10
	yea pretty much	03:10
	→ hakunin joined	03:10
Tjh_	except gitk takes a 1/2 hour to load lol	03:10
	i tried some other ones too	03:10
wereHamster	did you try gitg?	03:11
	← sh1mmer left	03:11
	← johnw left	03:12
Tjh_	hmm	03:12
	no	03:12
	→ tfarina joined	03:12
	← dreiss left	03:12
Tjh_	whew apparenly tig can do that	03:14
	← flaguy48 left	03:15
loops	Tjh_, don't think tig has a graph view	03:16
	Tjh_, oh, it does.. sorry	03:16
Tjh_	yea din knkow that lol	03:17
	nice	03:17
	perfect	03:17
	→ ddp joined	03:19
	← stuffcorpse left	03:20
	← threeve left	03:20
	← SRabbelier left	03:20
	→ moconnor joined	03:21
	→ stuffcorpse joined	03:21
	→ threeve joined	03:23
	← bugfux left	03:24
	← Paraselene_ left	03:25
	→ cytrinox_ joined	03:26
	→ jaysern_ joined	03:26
	← rado1 left	03:27
	← Keiya left	03:27
	→ SRabbelier joined	03:27
	← warthog9 left	03:29
	← tedoc2000 left	03:29
	→ modsognir joined	03:31
	← Tjh_ left	03:31
	← ab3 left	03:31
	→ Keiya joined	03:33
	→ Dashkal joined	03:33
	→ kingfishr joined	03:34
	← paltman left	03:34
	→ Tjh_ joined	03:34
	→ rachman joined	03:34
Tjh_	thats odd	03:34
	→ yuanyelele joined	03:35
Tjh_	git push origin --tags master pushed the tags from person...wtf	03:35
	*personal	03:35
wereHamster	personal what?	03:35
	← rchavik left	03:35
	← yuanyelele left	03:35
nevyn	repo	03:35
	rachman → rchavik	03:36
	← tfarina left	03:36
	→ yuanyelele joined	03:36
	← cytrinox left	03:37
	cytrinox_ → cytrinox	03:37
	→ catalis joined	03:37
	← yuanyelele left	03:37
Tjh_	branch	03:38
	my tree has 2 branches personal and shared	03:38
	essentially the same except shared has all the passwords removed	03:38
wereHamster	you told git to push all tags, so it did	03:38
Tjh_	aah	03:41
	how do i tell git to only push tags that belong to this branch?	03:41
	← kpreid__ left	03:41
wereHamster	you list them explicitly on the command line	03:41
	→ kpreid_ joined	03:41
Tjh_	o ok	03:41
	ok so i want to push v2.0 and split	03:42
wereHamster	git push tag v2.0 split	03:42
	→ godsflaw__ joined	03:43
Tjh_	o really cool	03:43
	→ javatexan joined	03:45
Tjh_	that worked great thank you	03:46
	← aisipos left	03:47
wereHamster	don't forget to deletet he other tags	03:47
	← eletuchy left	03:47
Tjh_	yeap i deleted the entire repo lol	03:49
	and recreated it (github)	03:49
	man there has to be an easier way of managing this	03:49
wereHamster	managing what?	03:49
Tjh_	every time i make a change i have to checkout the shared branch cherry pick the commit from personal	03:49
	→ Azeroth-Working joined	03:49
Tjh_	basiclly commit twice..	03:49
wereHamster	work on shared, merge into personal	03:50
Tjh_	hmm	03:50
	← godsflaw_ left	03:50
	← hipe_ left	03:51
	← Theravadan left	03:51
	→ tjafk joined	03:52
	→ Nomolos joined	03:52
Nomolos	hi all	03:53
	← bgerber left	03:53
Nomolos	I am interested in using git but I would like to know if git can handle this scenario?	03:53
Tjh_	nope merge fails SO BAD for some reason	03:53
Nomolos	I have a base Project X	03:53
	which I use for all projects	03:53
	I want to add a new project as a subfolder but don't want changes to be committed to base project	03:54
	← Dashkal left	03:55
wereHamster	Nomolos: man git-submodules	03:55
	→ hipe joined	03:55
Tjh_	ok umm how do i tell merge to "if there is a conflict overwrite the file with the one from remote"	03:55
wereHamster	Tjh_: git checkout --theirs -- <file>	03:55
Tjh_	hmm yea i guess hat work lol	03:56
	meh	03:57
	i'll just keep doing what i am i guess	03:57
	← Keiya left	03:57
Nomolos	wereHamster thanks - Is it possible to commit from the project root folder and all submodules get committed automatically? or do I need to go to every submodule and commit?	03:57
wereHamster	Nomolos: I think you have to go to every submodule	03:57
	Tjh_: I'd strongly suggest you to adjust your workflow	03:58
	→ Keiya joined	03:58
	_Einstein → bburhans	03:58
Nomolos	wereHamster - thank you	03:58
Tjh_	wereHamster: ?	03:58
	wereHamster: what would you suggest	03:59
Nomolos	Just because I saw you mention workflow - what workflow is best for the scenario I suggested? were you reuse a project as a base for all others?	03:59
	← Twisted_Mentat left	04:00
wereHamster	Tjh_: I can't tell you without knowing what you make and why you make it	04:00
Tjh_	wereHamster: what i make, meaning?	04:00
wereHamster	Tjh_: why you need the two branches	04:00
Tjh_	wereHamster: because my home directory contains certain files that contain passwords (that i would like to be tracked)	04:01
	but nevertheless those files are important ones that i would like to be tracked and shared	04:01
wereHamster	you are tracking your $HOME in git?	04:01
Tjh_	yeap	04:01
	wait din't i mention this before?	04:01
	looksl like i did not, my bad	04:02
	→ bcardarella joined	04:02
	← catalis left	04:03
	→ dreiss joined	04:03
wereHamster	I'd probably keep the two branches compelely separate (eg. no common root)	04:03
	← hipe left	04:04
Tjh_	well thats what it is now yea	04:04
	→ eletuchy joined	04:04
Tjh_	what i do is change smthg in my personal one (the one i acutally use) and then go into the shared one and bring in the changes that i want	04:05
wereHamster	on yeah, that wouldn't really work. So what about mergin from shared to personal?	04:05
Tjh_	hmm lemme try	04:05
	→ qhoxie joined	04:06
j416	Nomolos: another solution that I have used once is to just symlink in the other projects into the "base project"	04:06
	and/or vice-versa	04:06
	← camonz left	04:06
j416	you won't be able to maintain their relative states, but it's easy.	04:07
	← Azeroth-Work left	04:07
	→ catalis joined	04:07
	← tjaway left	04:08
Nomolos	j416 thanks for the tip	04:08
Tjh_	wereHamster: still super fail, like epic amounts of fail, most of the files are the exact same and it still fails	04:09
j416	Nomolos: git will store the symlink as a symlink, it won't include what it points to.	04:09
wereHamster	Tjh_: I guess that's because there's no common root	04:09
	← yhager left	04:09
Tjh_	wereHamster: aah prbly	04:09
	→ yhager joined	04:10
Tjh_	wereHamster: and fankly the 2 branches intertwine twice which wud just confuse git	04:10
	o welll...	04:10
	whatever	04:10
Nomolos	j416 store ...meaning it will commit the symlink to the repo?	04:11
j416	yes	04:12
	like a symlink	04:12
	it won't suck in the file it points to.	04:12
	and hence it won't notice changes to that file	04:12
	because the symlink is the same no matter what the contents are of the file it points to	04:13
Nomolos	j416 ok	04:13
	← javatexan left	04:14
	← yarddog left	04:17
	← plediii left	04:18
	← bcardarella left	04:19
	← godsflaw__ left	04:19
	← Tordek left	04:27
	← Keiya left	04:29
	→ Tk_L joined	04:29
	→ imajes joined	04:31
	→ javatexan joined	04:31
	← dreiss left	04:33
	← kpreid_ left	04:34
	→ kpreid_ joined	04:34
	→ bcardarella joined	04:37
	← ia left	04:38
	→ hipe joined	04:38
	← pklingem1 left	04:39
	→ ia joined	04:39
	← allenwei left	04:40
	→ hipe_ joined	04:42
	← Nomolos left	04:44
	← jspiros left	04:44
	→ jspiros joined	04:44
	← AkumaStreak left	04:45
	← hipe left	04:47
	← eletuchy left	04:48
	→ johnw joined	04:49
	← j416 left	04:50
	← catalis left	04:53
	← mamund left	04:53
	← ia left	04:55
	← lresende left	04:56
	→ ajonat joined	04:57
	→ dreiss joined	05:01
	→ hyperair joined	05:03
	← kukks left	05:03
	→ ia joined	05:04
	← __iron left	05:04
	→ plediii joined	05:04
	← bry left	05:04
	→ sh1mmer joined	05:06
	← loops left	05:08
	→ yarddog joined	05:09
	← bcardarella left	05:09
	← upul left	05:10
	→ mithro joined	05:11
	← scarabx left	05:11
	→ upul joined	05:15
	→ Dashkal joined	05:18
	← kw left	05:22
	→ Cro_Crx joined	05:23
	→ tedoc2000 joined	05:23
	→ loincloth joined	05:23
	← ddp left	05:24
	→ Keiya joined	05:25
	→ allenwei joined	05:27
	← kpreid_ left	05:27
	→ murr4y joined	05:27
	→ kpreid_ joined	05:27
	→ Twisted_Mentat joined	05:27
	→ v0n joined	05:28
	→ bgerber joined	05:31
	→ seventoes joined	05:32
	→ celling joined	05:32
	← javatexan left	05:36
	→ hipe joined	05:37
celling	Hi, How can I cat a file in a commit?	05:38
	→ yhager_ joined	05:39
	← yhager left	05:39
	← hipe_ left	05:39
	← jfkw left	05:40
	← v0n left	05:40
wereHamster	?	05:41
	you mean show a file how it was in a certain commit?	05:41
	← engla left	05:41
celling	wereHamster: yes	05:42
	← ia left	05:42
wereHamster	git show <commit>:<path>	05:42
	← pippijn left	05:42
	→ pippijn joined	05:42
zomg	note that path must be from the root of your repo.. if you're in a subdir it won't work as expected	05:42
	always keeps confusing me partially because tab-completion doesn't work properly from subdirs if you have to prepend the path from the root :P	05:43
	← pippijn left	05:43
celling	wereHamster: It works, thank you.	05:43
	zomg: Yes, it is a bug?	05:46
	← moconnor left	05:46
wereHamster	no	05:46
	← Travis-42 left	05:48
celling	wereHamster: status, log work well in subdir, why show can't work properly?	05:49
	→ ia joined	05:50
wereHamster	it just wasn't designed to work that way. If you have a problem with it, write a patch and send it to the mailing list	05:50
	→ gkm joined	05:52
celling	wereHamster: I used to work under root directory, so it is not a big thing for me.	05:52
gitster	It is not about "show". It is a syntax to name an arbitrary blob, relative to a tree object.	05:52
	a commit, when the calling context calls for a tree, can evaluate to a tree, and it evalutates to the tree object that is recorded by the commit. HEAD in some context is the same as HEAD^{tree}.	05:53
	And <tree>:<path> is a syntax to name an object at <path> in a tree object <tree>. If the <path> has a subdirectory, it names a tree object that corresponds to the <path>. If <path> corresponds to a regular file or symlink, the syntax names a blob object.	05:55
	So "git cat-file blob HEAD:file" and "git show HEAD:file" syntax finds the path "file" from the top-level of the tree object recorded in the commit named by "HEAD".	05:56
seventoes	is it possible to remove a tag from a commit?	05:56
gitster	"git tag -d that-tag"?	05:56
gkm	"git push" pushes heads and "git push --tags" pushes tags. Are there options that will do both in one command? Don't say --mirror, because that's too big a hammer...	05:56
seventoes	easy enough :P thanks	05:57
gitster	"git push $there $this_tag $that_branch"?	05:58
celling	gitster: Thank you, I see it now.	05:58
gitster	celling: don't thank me. That was an _explanation_, not justification.	05:58
gkm	gitster: I want to push current branch and whatever (possibly multiple) tags, without needing to explicitly name them	06:00
	← niki left	06:00
gitster	Because existing scripts _rely_ on the explained behaviour, we cannot change what "HEAAD:file" means (it will _always_ mean "file at the toplevel"), but nothing prevents a patch to make "HEAD:./file" to be interpreted as "relative to my current directory" from getting written.	06:00
	gkm: in other words, you want git to read your mind.	06:00
	→ AkumaStreak joined	06:01
gkm	gitster: no more mind-reading than it already does with "git push; git push --tags". I just want it to all of it in a single invocation. If I need two, it's no tragedy--it'll just take twice as much remote connection latency	06:01
	← Analias left	06:02
gitster	"git push --tags" pushes "all tags", and that is already too big a hammer. "git push && git push --tags" doesn't make much sense.	06:02
	I can understand if the request were this:	06:02
	"push named branches, _and_ tags that point at commits that are reachable from them"	06:02
	→ j416 joined	06:03
gitster	and the answer is "there is no such option to 'git push', but I'd agree it would be handy to have".	06:03
	← threeve left	06:03
gitster	As I just had to do that myself while pushing v1.6.5.6 release out a few minutes ago.	06:03
celling	gitster: Then if git provide a command git cat commit path, maybe it is more convenient.	06:03
gitster	I did "git push k.org v1.6.5.6 && git push".	06:03
gkm	gitster: maybe if there were a --heads option to explicitly request the default [no arg] behavior, so "git push --heads --tags" would do what I want.	06:03
	→ obiwan_chinobi joined	06:04
	← AkumaStreak left	06:04
	→ aisipos joined	06:05
gitster	celling: I think that misses the entire point of naming blob objects consistently for _any_ command that can take blob object names. E.g. "git diff HEAD:gitk-git/Makefile paulus:Makefile" (I have Paul's gitk repository on "paulus" remote tracking branch, and it is merged with subtree strategy into gitk-git/ directory).	06:05
	gkm: The default [no arg] behaviour is _not_ "--heads". It does not push all branches; only the matching ones.	06:05
	← krunk- left	06:05
gkm	gitster: so "push --tags" can push tags that are unreachable? Here's what I'm doing: I make some commits on the current branch, and I make some tags on the current branch. When I'm happy, I want to push 'em all out, and I'd rather it go a bit faster.	06:06
gitster	gkm: often people have more tags and branches than they want to publish in their private repositories, so "--tags" or "--heads" are not very useful for "git push" to begin with.	06:06
	← seventoes left	06:06
	← aisipos left	06:07
gitster	gkm: what I said before you described "Here's what I'm doing" would fit the bill, and I think I already answered the question.	06:07
	gitster refers gkm to scroll back and find "I can understand if the request were this:"	06:08
	→ aisipos joined	06:08
	← neoeinstein left	06:08
	→ krunk- joined	06:10
	← ia left	06:11
	→ ia joined	06:11
	← Keiya left	06:14
	← madewokherd left	06:14
	← ben_h left	06:15
	→ Keiya joined	06:15
gitster	"git push --tags $there :" should already be equivalent to "git push $there && git push --tags", I think.	06:16
	← tedoc2000 left	06:16
gitster	(notice the 'colon', that is one argument that means "trigger the default, no-arg form to push matching refs").	06:17
	also for most people $there == "origin".	06:17
	so if that is succinct enough, we don't even need any new option ;-)	06:18
	← MacGyverNL_ left	06:18
	→ MacGyverNL joined	06:18
	→ tvw joined	06:20
	← kpreid_ left	06:20
	→ kpreid_ joined	06:20
	→ jrmuizel joined	06:21
gkm	gitster: yes, just a few minutes ago, I determined that "git push --tags $there" does the job. Thanks!	06:23
	← gkm left	06:23
gitster	hmm... without " :" at the end of that command line?	06:24
	→ tho joined	06:25
	→ SockPants joined	06:25
	→ khmarbaise joined	06:25
	← khmarbaise left	06:27
	← jas4711 left	06:29
	← qhoxie left	06:31
	→ spearce joined	06:32
	→ javatexan joined	06:33
	← jlilly left	06:33
	→ ericholscher joined	06:35
ericholscher	How do I revert a series of changes?	06:35
	→ jlilly joined	06:36
	← dreiss left	06:37
	← Ingmar left	06:38
	→ agib joined	06:38
	→ Ingmar joined	06:39
	← opcode left	06:39
	→ spearce` joined	06:39
johnw	you mean, just wipe out all changes currently in your working tree?	06:39
	← tho_ left	06:40
	← javatexan left	06:43
	← chuckd left	06:44
	→ ustunozgur joined	06:44
	→ javatexan joined	06:45
	← hipe left	06:46
	← bigmack83 left	06:47
sitaram	gitster: what was the security issue with post-upload? searching "post-upload" as subject line in recent ML didn't get me anything	06:47
	(mild curiosity, no more; feel free to ignore)	06:48
	← johan-s left	06:48
	→ dreiss joined	06:49
	→ cedricv joined	06:49
	← jrmuizel left	06:50
	← univate left	06:51
	→ univate joined	06:52
	← gitster left	06:52
	→ roop joined	06:53
	← javatexan left	06:54
	→ camonz joined	06:54
	← melissaseverini left	06:54
camonz	hi	06:54
	I've got a branch where I've commited some changes and I want to unstage all those commits so I can create a new branch and apply them there	06:55
	Is it possible?	06:55
	→ sis joined	06:56
	← spearce left	06:57
	spearce` → spearce	06:57
	→ petrux joined	06:58
	→ JakeSays joined	06:59
	← spearce left	07:00
	← krawek left	07:01
	→ bigmack83 joined	07:03
	→ sde_antrix1 joined	07:06
	← univate left	07:07
	← ia left	07:07
	→ ia_ joined	07:08
	← dgarr left	07:08
	← SockPants left	07:12
	→ qhoxie joined	07:13
	→ kpreid__ joined	07:13
	← kpreid_ left	07:13
	← neunon left	07:16
	Thell_ → Thell_\|Away	07:17
	→ univate joined	07:18
	→ Weasel[DK] joined	07:19
j416	camonz: you should read the git book to grasp terminology	07:21
	and basics of how git works	07:21
	find the sha1 of the last commit you wish to keep in the branch you are on	07:22
	then do:	07:22
	git branch newbranch ; git reset --hard <that sha1>	07:22
	be careful, a hard reset also touches things in your working dir	07:23
	→ Geralt joined	07:23
j416	be sure that you have committed everything that you want to save.	07:23
	→ thiago_home joined	07:23
	← roop left	07:23
	← bauruine left	07:24
	→ cjs joined	07:24
	← benjo2 left	07:31
	← sdboyer left	07:34
	→ giallu joined	07:35
	← patmaddox left	07:35
	← giallu left	07:35
	→ giallu joined	07:35
	← bambule left	07:36
cjs	So how does one import files into a bare repo? I guess you need to import in a non-bare repo and then push to the bare repo?	07:40
	→ ixti joined	07:40
	→ psankar joined	07:42
	← univate left	07:42
	→ kssddy joined	07:43
	← Davey left	07:43
	→ univate joined	07:43
	→ sdboyer joined	07:43
	→ patmaddox joined	07:44
	→ bousquet joined	07:45
	→ lucsky joined	07:46
	← patmaddox left	07:46
	← ia_ left	07:48
	→ solofight joined	07:48
	← dreiss left	07:49
	← solofight left	07:49
j416	cjs: you can create a new one using git init, or you can clone from another repo using git clone	07:49
	with options to make it a bare repo.	07:49
	→ solofight joined	07:51
	← segher left	07:58
	→ wolog joined	07:59
	→ lightcap joined	07:59
	← hummingkid left	07:59
	→ maattd joined	08:00
	→ ph^ joined	08:06
	← jspiros left	08:06
	→ jspiros joined	08:06
	← kpreid__ left	08:06
	→ kpreid_ joined	08:06
	← ajonat left	08:07
	→ ia joined	08:07
cjs	Right, but I've got a bare repo, and a bunch of files in another dir; can I import the stuff in that other dir directly into the bare repo?	08:08
	→ galderz joined	08:10
	← Azeroth-Working left	08:11
	← galderz left	08:11
	→ galderz joined	08:11
	← camonz left	08:13
j416	ah..	08:13
	don't think so, you'd have to commit them	08:13
	← bousquet left	08:14
cjs	That's what I figured.	08:21
	← allenwei left	08:21
j416	cjs: it's easy to just clone the bare repo, commit the files, and push, though.	08:23
	→ d3xter joined	08:24
	← maattd left	08:24
	→ johan-s joined	08:25
d3xter	hello	08:25
	→ zoniq_ joined	08:26
	← mbernstein left	08:27
	← JoeConyers left	08:28
	← thiago_home left	08:31
	→ Sky[x] joined	08:31
	← mithro left	08:32
	→ babilen joined	08:33
	→ bauruine joined	08:34
	→ tbf joined	08:38
cjs	Well, not quite so easy if the files in question consist of 300 GB of essentially uncompressible data. :-)	08:38
	→ mattions joined	08:38
	→ erlehmann joined	08:39
	← ia left	08:39
	→ ia joined	08:39
	→ xaxes joined	08:40
	→ GMFlash joined	08:41
	→ loops joined	08:41
xaxes	hey there.. Im trying to install a git-repo using gitosis. following a howto, I get to the part with the public-key.. I tried to create one with and without passphrase and followed up the howto.. now Im trying to clone the first gitosis-admin.git, and it's asking for a pass.. but neither "none" nor my set pass are working..	08:43
	somebody who could give me a hint how to get this working? :)	08:43
	← hyperair left	08:44
	→ bigmack83_ joined	08:44
charon	xaxes: does it ask for a (login) password or a (private key) passphrase?	08:44
xaxes	looks like a users-password	08:45
	← j416 left	08:45
charon	in that case you're either sshing to the wrong user (it needs to be the gitosis user, usually 'git' or 'gitosis'), or the authorized_keys setup is not working (perhaps you forgot to enable the hooks)	08:46
	er wait, this is before the first push. so it can't be the hooks.	08:46
xaxes	mhh .. I chmod the hooks to 755 , copied the id_rsa.pub to ~git/.ssh/authorized_keys	08:47
charon	what does ~gitosis/.ssh/authorized_keys look like? it should list the key that you imported in the gitosis-init step	08:47
	→ ravionrails joined	08:47
charon	don't do that by hand, use gitosis-init	08:47
sitaram	xaxes: you "copied the id_rsa.pub to ~git/.ssh/authorized_keys"?	08:47
xaxes	yes	08:48
charon	also, ObGitolite	08:48
	→ perlina joined	08:48
xaxes	no wait..	08:48
sitaram	xaxes: as charon said... why dont you try gitolite instead? (I wrote it, so I'm biased but even without bias I can say it does a lot more and it's a lot better documented	08:48
xaxes	I hadnt copied it this time .. my fault (only copied it the first trys)	08:48
	sitaram: gonna search for	08:49
sitaram	http://github.com/sitaramc/gitolite/blob/pu/README.mkd	08:49
	and the clone URL will be on that page somewhere I think	08:49
charon	xaxes: use the provided gitosis-init to do the first key import. the point being that the authorized_keys needs to do a tiny bit of extra magic	08:49
xaxes	yeah access controll down to branches! nice	08:49
	charon: I did	08:50
	http://scie.nti.st/2007/11/14/hosting-git-repositories-the-easy-and-secure-way followed this tutorial	08:50
ravionrails	is it possible to push projects under one repository, i m new to git	08:50
sitaram	xaxes: as they say, you ain't seen nothing yet http://github.com/sitaramc/gitolite/blob/pu/doc/3-faq-tips-etc.mkd#diff lists all the extra things gitolite does (about a dozen!)	08:51
	→ fcuk112 joined	08:51
sitaram	ravionrails: one project == one repository for most people; can you elaborate?	08:51
xaxes	sitaram: Ill look for gitolite;) the access management to branches is just perfect for my terms	08:51
	→ Keiya_ joined	08:52
ravionrails	sitaram: ok one more doubt \| what is the use of git init --bare command	08:52
xaxes	gonna read some stuff :)* thanks so far!	08:52
sitaram	xaxes: if you need that feature, gitosis is out anyway... welcome to the club :) I wrote gitolite because I needed that!	08:53
	ravionrails: creates a bare repo; http://sitaramc.github.com/concepts/bare.html	08:53
	← ia left	08:54
	← Keiya left	08:54
	Keiya_ → Keiya	08:54
	m-takagi → m-takagi_	08:55
johnw	sitaram: thanks for the link	08:57
xaxes	sitaram: can I jump into a query for deeper questions about gitolite? only few minutes	08:58
	more about auth than gitolite ;)	08:58
	→ anno^da joined	08:58
	→ shruggar joined	08:59
	← kpreid_ left	08:59
	→ kpreid_ joined	08:59
	→ mithro joined	09:03
	→ ntoll joined	09:03
	→ psoo joined	09:04
	→ hebz0rl joined	09:06
	→ drd20 joined	09:07
sitaram	sure	09:08
	sorry I was on a phone call, xaxes	09:08
xaxes	got it working, thanks anyway ;)	09:08
drd20	Is it possible to get git-svn to fetch the latest revision only, without manually specifiying the revision?	09:08
ravionrails	sitaram: thanks	09:08
sitaram	xaxes: "got it working"... "it" == ??	09:09
Grum	gerbils in a wheel!	09:09
	→ ia joined	09:10
xaxes	ssh key auth .. (got the same error, I asked for this morning) .. just set a dumb password to the user	09:10
sitaram	xaxes: oh... some systems treat "usermod -L" or eqvt as "no ssh pubkey login"; I've seen that before...!	09:11
	Grum: :)	09:12
	Grum: that would be "them" not "it"	09:12
Grum	the wheel is it!	09:12
xaxes	excuse my bad english ;)	09:12
Grum	something has to power teh interwebs	09:12
	→ poseidm1 joined	09:14
Tjh_	Grum: u knkow how funny it would be if that were true	09:15
Grum	you think google has servers? you guessed wrong! they have loads of gerbil wheels	09:15
	→ mjc joined	09:15
	← mjc left	09:15
Grum	next time you see a picture of google's servers look for the hay	09:16
	→ intripoon joined	09:17
	→ __iron joined	09:17
Tjh_	lol	09:19
sitaram	well they use pigeons for ranking websites already ( http://www.google.com/technology/pigeonrank.html ), and RFC 1149/2549 powers their TCP/IP, so why not gerbils	09:19
	← Geralt left	09:21
	← bigmack83_ left	09:22
	← bigmack83 left	09:22
	→ mandar joined	09:22
mandar	??	09:22
	← mandar left	09:22
Grum	behind you mandar!	09:22
	too late ;(	09:22
	→ ngw joined	09:23
sitaram	well I have to admit the RFC 1149 thing was a guess -- they're a little secretive about what else the pigeons do for them, to be honest	09:23
ngw	hi guys, how do I completely overwrite a repo with one of its branches ?	09:26
	→ zheng joined	09:28
	→ StarkD joined	09:29
StarkD	hi. how do I read this on windows? git://git.lomoco.org/projects/lomoco/lomoco.git	09:30
Grum	ngw: that doesnt appear to make much sense, you want to use a branch (which is not master) as master?	09:31
StarkD	I just need to read the content, not install it	09:31
	← obiwan_chinobi left	09:31
Grum	StarkD: install git; git clone; read source?	09:31
jacobat	Anyone else missing a "delete merged branch" flag to git merge?	09:31
Grum	jacobat: that could be nice yeah as long as it never becomes default :)	09:32
jacobat	Of course not, I just find myself merging and deleting branches all the time	09:32
	"git merge -d branch" :)	09:32
	→ Transformer joined	09:32
	→ db__ joined	09:33
db__	hihp	09:33
Grum	jacobat: post a patch to the mailinglist? :D	09:33
db__	i have a problem with merging files..when i pull, git tells me there is a conflict...when i then do a git mergetool and save the merged file git tells me, that there is still have not concluded merges	09:35
	← Transformer left	09:36
	→ bigmack83 joined	09:39
jacobat	Grum: I will if I ever get around to it ;)	09:41
	→ bigmack83_ joined	09:41
StarkD	Grum: git clone git://git.lomoco.org/projects/lomoco/lomoco.git	09:41
	← jaysern_ left	09:41
StarkD	bash: git: command not found	09:41
	← doener left	09:41
Grum	hence i said: install git	09:41
	← d3xter left	09:41
	→ koke joined	09:41
StarkD	aptitude install git	09:42
	isn't that enough?	09:42
	it installed fine	09:42
teuf	StarkD: you sure it's the right name?	09:42
StarkD	i'm running debian lenny	09:42
	teuf: no :)	09:42
teuf	it used to be named git-something	09:43
	apt-cache search git, apt-cache show ...	09:43
	(iirc)	09:43
	→ botanicus joined	09:44
	→ doener joined	09:44
Rhonda	StarkD: The package name is git-core	09:45
db__	git MERGE_MSG tells me, that a specific file needs a merge, but git mergetool tells me this file doesnt	09:45
	any ideas why?	09:45
Rhonda	StarkD: The git package in Debian is "GNU Interactive Tools"	09:45
	... which is something completely different.	09:46
StarkD	aha k	09:46
	git-core should be the right one	09:46
tokkee	db__: What does git-status tell you?	09:51
db__	# Your branch and 'origin/master' have diverged,	09:51
	# and have 1 and 2 different commit(s) each, respectively.	09:51
	→ babilen_ joined	09:51
tokkee	db__: That's it?	09:52
db__	no, some changes to commit and some untracked files are following	09:52
	ah, got it	09:52
	i had to recommit	09:52
	← kpreid_ left	09:53
db__	thanks :)	09:53
	→ kpreid_ joined	09:53
	→ __ed joined	09:53
__ed	Hello.	09:53
	I subscribe to a free codebase account, and I'm trying to create a local repository.	09:54
	it seems that all the local stuff is good, but when I'm trying to push, it returns an error:	09:54
	Permission denied (publickey,keyboard-interactive).	09:54
	fatal: The remote end hung up unexpectedly	09:54
Fatal	quick, redial!	09:54
Grum	you have no permission, fix your ssh :)	09:54
	← babilen left	09:54
__ed	I tried to set some stuff in %HOME%/.ssh/config	09:54
	but nothing more :/	09:55
Grum	you probably should be thinking of pub/privkeys instead of .ssh/config :)	09:55
	← Tk_L left	09:55
__ed	Grum: well, I did it, but where may I have to place thoses keys ?	09:55
Grum	you ideally load them in your keyagent :)	09:56
	well the private part, the public one should be on the remote end	09:56
__ed	ssh-keygen is provided with git for windows, so I just ran ssh-keygen, enter a passphrase, and that's all :o	09:56
	Grum: oh ok, so it could be possible to set a public key on codebase ?	09:57
Grum	i have no idea	09:57
	→ froschi joined	09:57
__ed	Grum: ok, thanks :)	09:57
Grum	i guess so, as you dont get to enter a password :)	09:57
	→ methanol joined	09:57
__ed	Grum: oh yeah, I find it !	09:58
	well, I will try. thank you ;)	09:58
	it works ! ;))	10:00
	→ Paraselene_ joined	10:01
Grum	\o/	10:01
	dwmw2_gone → dwmw2	10:01
	← lightcap left	10:02
ngw	Grum: yes	10:04
	← ia left	10:05
Grum	ngw: i have to ask, why?	10:05
ngw	in the sense that it's pretty old and people "forgot" to do merges	10:05
	→ ia joined	10:05
ngw	this means I have to explain again how to use git	10:06
	← tic left	10:06
Grum	i guess you have users who used svn before?	10:06
	→ tic joined	10:06
charon	ngw: there's no overwriting to be done; you just forget about all other branches	10:06
ngw	yes	10:06
	I ported everything to git but if I give attention to another company for like 1 month when I come back I have the armageddon	10:07
	charon: I can deploy the branch I need of course, but the master will just be useless this way	10:08
charon	you can rename the branch	10:08
	it causes some hassle for people who have pending work (read: branches) based on master though	10:08
	(much in the same way that overwriting would, so meh)	10:09
	→ jrmuizel joined	10:09
ngw	nothing is based on master	10:09
	basically they made a branch and "forgot" to switch it	10:09
charon	"switch"?	10:09
Grum	so all is on master?	10:09
	as they forgot to switch ;)	10:10
ngw	no, everything is on the branch	10:10
	I know it doesn't make sense :D	10:10
Grum	charon: SVN tainted souls :D	10:10
ngw	they all switched to the branch and started committing there	10:10
charon	ngw: not that it makes the situation much clearer for me though	10:10
ngw	that's all	10:10
charon	er, i wanted to address that to Grum.	10:10
	← jrmuizel left	10:10
charon	ngw: if you're lucky, the branch is even a descendant of master and it simply fast-forwards, in which case the "hassle" caveat above does not apply.	10:11
	← Sky[x] left	10:11
Grum	ngw: brutal way; git checkout branch; git branch -f master; git checkout master; git branch -D branch	10:11
charon	where "lucky" means: nobody made any commits on master; all the work happened on $branch	10:11
Grum	or you would just merge and toss away the branch	10:11
	→ jrmuizel joined	10:11
	→ _Elias joined	10:13
_Elias	Hi! I have a problem. I renamed a repository on git. Now I wanted to push new code to the repo but git tried to push it on the old name so it didn't work. What must be done here?	10:14
Grum	you didnt update the remote	10:14
	see .git/config	10:14
	or fix it using git remote :)	10:15
Ilari	Grum: Is there way to change remote URL using git remote now?	10:15
	→ tbuehlmann joined	10:15
Grum	Ilari: you can remove the remote and re-add it?	10:15
Ilari	Grum: Doesn't do the right thing.	10:16
	← tetha left	10:16
Grum	does that also remove the info from tracked branches?	10:16
	→ tetha joined	10:16
Ilari	Grum: Yes.	10:16
Grum	hurtsies!	10:16
	edit .git/config then :)	10:16
Ilari	_Elias: The second way is to change 'remote.<url>.url' using git-config.	10:16
	*git config	10:17
	→ marcoecc joined	10:17
Grum	usually remote.origin.url right	10:17
	→ Sky[x] joined	10:17
Grum	+? .. meh stupid fingers	10:17
_Elias	Thanks guys! Worked perfectly!	10:18
	babilen_ → babilen	10:21
ngw	hm, I can't push after	10:22
Grum	ngw: it will tell you to use force ... in this case, if you are sure, you should :D	10:22
	← aisipos left	10:23
	← modsognir left	10:23
charon	ngw: and tell your svn converts to NOT use git-pull to grab that updated origin/master. they need to reset it.	10:23
	→ yhager joined	10:23
	← johnw left	10:24
	← Twisted_Mentat left	10:24
	→ kensei joined	10:25
kensei	hello	10:25
	can GIT take difference between binary and text files ?	10:26
__ed	how could I delete a file from the repository ?	10:26
	kensei: what do you mean ?	10:26
kensei	e.g. not to convert on the linux client side the 0a0d characters for linux related one in case of binary files.	10:26
charon	kensei: see --binary option to git-diff, and 'binary' attribute in man gitattributes	10:27
	← solofight left	10:28
	← rchavik left	10:28
	→ rchavik joined	10:28
	← koke left	10:29
kensei	charon: and can I commit + push just the desired file(s) with autocrlf true option and others with false ?	10:30
	← cjs left	10:30
kensei	so the question is whether I can do settings for file level ?	10:31
charon	kensei: see the explanations for the 'crlf' option in man gitattributes (binary implies -crlf)	10:31
	→ curtana joined	10:31
	→ koke joined	10:31
charon	note that by default, git just guesses the kind of file (iirc, it checks for a null byte in the first few kbytes)	10:31
kensei	so the question is whether I can do settings for file level ?	10:31
charon	will you please read that manpage? yes, you can, but while i'm glad to point you at documentation, i won't read it for you	10:32
kensei	I will read it, but I wanted to know whether it's worth to read.	10:33
	but if you say it can handle it, I will read it.	10:33
	thanks anyway :)	10:33
	← JackWinter left	10:34
	→ marc_m joined	10:35
	← kensei left	10:35
	VVSiz_ → VVSiz	10:38
	← yhager_ left	10:40
	← ia left	10:41
charon	__ed: depends what you mean by "delete". to get rid of it in a nice, version-controlled way: git rm $file	10:42
	__ed: to completely forget that this file ever existed, as in the case of a copyright violation or whatever, see the examples in man git-filter-branch, but note that this is not an operation to be taken lightly (it causes trouble for people working on the repo)	10:42
__ed	charon: actually, I'm using a free codebase account, and size of repository is limited to 20Mb. on the first commit I uploaded the debug binary... and it uses something like 4Mb xD	10:44
	I wanna delete it from the repository, and from the whole INTERNET :P	10:44
charon	well, it can be hard to get rid of at the remote end if you do not have direct access	10:44
__ed	(to avoid usage of annoying disk space)	10:44
charon	but yes, it will disappear eventually through git-gc's cleanup efforts if you use the filter-branch approach	10:44
	← GMFlash left	10:44
	→ solofight joined	10:45
	→ modsognir joined	10:45
__ed	ok thank you a lot charon :))	10:45
charon	(after filter-branch, future clones do not have to copy it any more so it saves bandwidth immediately, but disk space only later)	10:45
	← Whtiger left	10:46
	← kpreid_ left	10:46
	→ kpreid_ joined	10:46
	← jrmuizel left	10:47
	← qhoxie left	10:57
	→ ia joined	10:58
	→ cebewee joined	10:59
	← zheng left	11:02
	← magcius left	11:04
	→ MrSamuel joined	11:05
MrSamuel	is it possible to check out part of a repository	11:05
	i.e. git checkout repository/subdirectory/	11:05
charon	MrSamuel: you probably mean clone (= svn checkout) a subdirectory, in which case the answer is: no	11:06
MrSamuel	i see	11:06
	→ roop joined	11:06
loops	MrSamuel, why do you ask?	11:06
	→ ehabkost joined	11:09
	→ hyperair joined	11:09
MrSamuel	loops: I want to transfer some files from a repository, but not the whole repository	11:10
	→ jfkw joined	11:10
	← jinzhu left	11:11
kkoehne_	Hi, I'm having a weird problem where on my default console git clone etc just works, while when executed in a perl script it doesn't seem to pick up the ssh credentials - it's always asking me for a password. Any idea on how I can debug this? How does git decide to use ssh/use ssh keys?	11:11
loops	MrSamuel, well then charon guessed your intentions correctly. Is it a problem of network bandwidth ?	11:11
kkoehne_	Btw, I'm working on Windows :(	11:11
MrSamuel	loops: yes, it would be simpler to check out the 10 files I need rather than the several thousand that I don't	11:12
	its fine thought I just used SCP	11:12
	it worked fine	11:12
loops	MrSamuel, I'm not sure of the status (it may even be merged) but someone is working on partial checkouts, to allow checking out just a subset of files, but you still would need a local repo first.	11:13
	→ reprore joined	11:14
doener	MrSamuel: if scp works for you, then you apparently don't need a clone to work on, but just a copy of the files, without history and VCS features	11:16
MrSamuel	yes	11:16
	that is correct	11:16
	→ kensei joined	11:17
kensei	why is it so much time to remove a git repository on windows ?	11:17
	first of all it's more time than in svn.	11:17
doener	MrSamuel: in that case, using "git archive" could do the trick. That can give you a tarball/zip archive of an arbitrary tree (maybe even a subset of it, never tried)	11:17
kensei	secondly it's really so much time apart from it.	11:17
	What do I do wrong ?	11:17
	← koke left	11:18
kensei	so the clone method is really quick in case of 10 branches to for a repository.	11:18
	but it's so long to delete.	11:18
doener	kensei: probably you never ran "gc", and have lots and lots of loose object files around. Removing them can be pretty slow	11:18
kensei	what's the reason for it?	11:18
loops	kensei, you may have done nothing wrong, Git doesn't perform as well on Windows as it does on a proper operating system ;oP	11:18
kensei	:P:P	11:19
	yeah, on Linux it's really quick	11:19
	after the same cloning.	11:19
doener	loops: well, with a sanely packed git repo, there should be fewer files to remove than with an equal svn repo or working copy	11:19
kensei	doener: doesn't git clone run garbage collection default ?	11:19
	doener: uhh sorry.	11:19
loops	doener, you gave a helpful answer above, which made a lot of sense... ignore my late night jabs at MS	11:19
kensei	It's TortoiseGIT client on windows.	11:20
	so maybe the developer of it doesn't use garbage collection in default state.	11:20
	maybe a feature request for them would be nice.	11:20
doener	loops: so the removal of the svn repo/working tree should at least take as long as the removal of a sanely packed git repo	11:20
	← hebz0rl left	11:20
doener	kensei: still got a clone of that repo?	11:21
loops	kensei, i think the Windows guys have their own mailing list, you might find more Windows help on that list if you don't get your answers here	11:21
	→ vital joined	11:21
doener	kensei: if so run "git count-objects -v" in it (no idea whether TortoiseGit has an option for that...)	11:21
	← vital__ left	11:21
loops	(and of course you can always ask on the main Git mailing list as well)	11:21
	← mattions left	11:22
	→ segher joined	11:23
	← Sky[x] left	11:25
	← Dashkal left	11:25
	→ b0fh_ua joined	11:26
b0fh_ua	Hi there! Can you please advice how can I find out the revision where given file was removed and restore it in the current head?	11:27
doener	b0fh_ua: git log --diff-filter=D -- path/to/file	11:27
	← Sonderblade left	11:27
doener	b0fh_ua: and you can restore it in the current head, as that references a commit, which is immutable	11:27
b0fh_ua	doener: I don't know the path - but the name	11:27
	→ Sonderblade_ joined	11:28
doener	b0fh_ua: but you can get a copy of an older version of that file into your index/working tree	11:28
	b0fh_ua: and then you could commit that ;-)	11:28
b0fh_ua	doener: that would help	11:28
	but it's not clear for me how to find out the file by it's name among set of folders	11:29
doener	b0fh_ua: git log --oneline --diff-filter=D --name-only	11:29
	← hgimenez left	11:29
doener	b0fh_ua: then just search for the filename in the pager	11:29
	→ hgimenez joined	11:29
	→ becomingGuru joined	11:30
b0fh_ua	okay, how can I restore it?	11:31
	git show?	11:31
doener	git checkout <commit> -- <path>...	11:31
kensei	doener: I've done a garbage collection before I pushed on Linux.	11:32
	← ravionrails left	11:32
kensei	so when I would like to clone it on windows and them remove, it shouldn't be so long.	11:32
	← cedricv left	11:32
	→ koke joined	11:33
b0fh_ua	cool	11:33
kensei	Can I do somehow a git ls-files command, but with not binary files output only ?	11:33
	→ Sho_ joined	11:33
kensei	e.g. git ls-files -z \| xargs -r -0 dos2unix	11:34
	but I'd like to take this operation for not binary files only.	11:34
	because this command wouldn't make sense for binary files.	11:34
	← sergiodj left	11:38
	← kpreid_ left	11:39
	→ jds joined	11:39
	→ kpreid_ joined	11:39
	← yarddog left	11:41
	→ andyjeffries joined	11:41
	→ capndiesel joined	11:41
	← b0fh_ua left	11:42
andyjeffries	Does anyone know why git hooks fail on Windows? I have a server side update hook to reject bad commit messages. It works when connecting with Macs (1.6.5.1) but not with Windows (1.6.3.2). When using a Mac we get to see the STDOUT of the hook so it explains what was wrong. When using a Mac we just see "hook declined".	11:42
	← broquaint left	11:43
	→ engla joined	11:44
	← froschi left	11:45
	→ eletuchy joined	11:48
	→ Ryback_ joined	11:51
	← psankar left	11:52
	→ psankar joined	11:53
	← engla left	11:55
	← babilen left	11:55
	← celling left	11:56
	→ Adlai joined	11:56
	← andyjeffries left	11:56
	→ priidu joined	11:57
	← psankar left	11:58
	→ reprore__ joined	12:00
	← db__ left	12:02
	← spaceonline left	12:02
	← Trey left	12:03
	→ dirk2 joined	12:03
	→ broquaint joined	12:03
	→ d0k joined	12:05
	← shfx left	12:08
	← MrSamuel left	12:12
	→ mattions joined	12:13
	← ia left	12:14
	→ ia joined	12:15
	→ ispeak joined	12:16
	← reprore left	12:18
	→ yhager_ joined	12:19
	→ tfarina joined	12:19
kensei	any idea to show the non binary files in a git repository with git option(s) ?	12:21
	← upul left	12:22
	→ babilen joined	12:22
	← mithro left	12:22
Ilari	kensei: You can redirect stdout from 'git show <revision>:<file>' and then view the result.	12:25
	→ snitko joined	12:25
	← babilen left	12:27
	→ babilen joined	12:27
	→ luxuss joined	12:29
	← _Elias left	12:32
	→ vadimus joined	12:32
	← kpreid_ left	12:32
	→ kpreid_ joined	12:32
	→ vbgunz joined	12:33
	→ warlock_mza joined	12:34
	← vadimus left	12:35
	→ froschi joined	12:36
	← intripoon left	12:37
	← yhager left	12:38
	→ Overcyn joined	12:39
	→ slabbeh joined	12:39
	← becomingGuru left	12:42
	Voker57 → _loggerhead	12:43
	← jspiros left	12:43
	← segher left	12:43
	← jpieper left	12:43
	← Soliton left	12:43
	_loggerhead → Voker57	12:43
	→ jspiros joined	12:44
	→ Soliton joined	12:44
	→ tekky joined	12:46
	← jessep left	12:47
	→ segher joined	12:48
	→ mbroeker joined	12:48
priidu	hi, a bit stupid situation, how can i restore rebase confict branch (i still have .git/rebase-apply) but made git checkout master for too yearly	12:50
	← koke left	12:51
wereHamster	priidu: restore to what state?	12:51
priidu	wereHamster, rebase conflict state (i got conflict)	12:52
	and then wanted to check something too early without doing git rebase --continue	12:52
wereHamster	git checkout --conflict -- .	12:52
	→ jessep joined	12:54
wereHamster	oh, you did checkout master. No idea then (just re-run the git rebase command?)	12:54
	← Keiya left	12:54
priidu	wereHamster, yeah i made checkout master, stupid me	12:54
	→ Keiya joined	12:55
wereHamster	hm, you could checkout HEAD@{1}, but I have no idea if that will get you the conflicts back	12:55
priidu	a, i try rebase again, i just helping out college with git and made mistake myself :-)	12:57
	← pheaver left	13:00
	→ Travis-42 joined	13:00
	→ pheaver joined	13:05
	→ jpieper joined	13:08
	→ NET\|\|abuse joined	13:09
	→ modsognir_ joined	13:12
	← modsognir left	13:13
	modsognir_ → modsognir	13:13
	→ hugoxrosa joined	13:15
cehteh	quiz: can i 'git gc' the current kernel git on a 32bit machine with 512mb ram or will it explode? :)	13:18
doener	depends on how much swap you have	13:18
wereHamster	you could try, it won't corrupt or destroy anything	13:18
	← pheaver left	13:19
cehteh	well its my gateway .. might become a grinding halt :)	13:19
	lets try :)	13:19
	→ dakota joined	13:20
cehteh	ionice -c3 nice git gc	13:20
	..	13:20
dakota	I have a branch that has commits. I want to merge some of these commits into another branch, but not all. What's the best way to do this?	13:20
teuf	dakota: git cherry-pick	13:20
	or create a temporary branch, use git rebase -i to remove the commits you don't want	13:21
	and merge that temp branch	13:21
cehteh	or rebase --interactive	13:21
	← marcoecc left	13:21
dakota	Let me look at cherry-pick	13:22
	← ia left	13:22
doener	but neither approach is going to merge _those_ commits, it's going to create new commits	13:22
dakota	yeah	13:22
	thats fine	13:22
	I just want some commits in the branch to be in the master branch	13:22
	but not all of them	13:22
	→ Keiya_ joined	13:22
	→ tstclair joined	13:23
	← kpreid_ left	13:25
dakota	cherry-pick worked	13:25
	→ kpreid_ joined	13:25
dakota	thanks	13:25
	← eletuchy left	13:26
	→ jogla joined	13:27
jogla	Hello	13:27
	Can i undo a rebase?	13:27
doener	reset back to the original history. The reflog should have an entry for it	13:28
jogla	I'm not sure if i understand it	13:29
doener	well, use "git reflog show <branch_head>" to look at the branch head's reflog and find the pre-rebase entry	13:29
	← kssddy left	13:30
jogla	Ahh, yes indead	13:30
	← jepler left	13:30
doener	then simply reset your branch head back to it: "git rebase --hard foo@{3}" or whatever is the right entry	13:30
	→ jepler joined	13:30
	→ hummingkid joined	13:30
wereHamster	reset --hard ..	13:30
doener	ehrm, yeah, oops :-)	13:30
jogla	Jmm	13:30
	But the new commits are not the newest	13:31
	→ eletuchy joined	13:31
jogla	for example my master branch was: A A A B B B	13:31
	Now its A A A N N B B B	13:31
	The branch I developed N in is still at A A A N N	13:31
	And i want to get back to A A A B B B in master	13:32
	← ispeak left	13:32
tango_	jogla: you want to get rid of N N in between? you'll have to use rebase interactive	13:32
jogla	Yes	13:33
	← drd20 left	13:34
	← VVSiz left	13:34
cehteh	PID USER PR NI VIRT RES SHR S PU %MEM TIME+ COMMAND	13:35
	1259 root 30 10 466m 205m 17m D 13.2 40.9 4:39.52 git	13:35
	... needs patience but works :)	13:35
wereHamster	only 200MB res..	13:36
cehteh	16% yet	13:36
	← kristian42 left	13:37
	→ ia joined	13:38
	← kpreid_ left	13:40
	← Keiya left	13:40
	← dakota left	13:41
	→ kristian42 joined	13:42
	← snitko left	13:42
	Keiya_ → Keiya	13:43
	← __iron left	13:45
	→ mrbob009 joined	13:45
mrbob009	what is a nice gui for git, im on debian	13:45
	← hgimenez left	13:45
KiBi	gitk	13:46
	→ __iron joined	13:46
	→ pheaver joined	13:46
mrbob009	KiBi, ok thank you : )	13:46
Fatal	collegues who hate command line seems to enjoy git-cola	13:46
	← hummingkid left	13:47
	→ DavidKlein joined	13:47
	→ Yuuhi joined	13:48
kensei	is it okay in gitolite conf to implement repo x	13:49
	RW+ = @admins @users	13:49
	so two group in one line ?	13:49
sitaram	kensei: yes	13:49
mrbob009	awsomE!	13:49
kensei	I rewrote for it the config file, but something doesn't work :(	13:49
jogla	Can i ask git-svn in what branch it is about to commit with dcommit?	13:50
sitaram	kensei: pasetbin	13:50
	(damn typos!) pastebin	13:50
	mrbob009: http://sitaramc.github.com/1-basic-usage/gitk.html	13:51
	← eletuchy left	13:51
d_sun	jogla: since svn does not really have branches the answer is simple	13:52
sitaram	mrbob009: gitk is mainly a history viewer, and is absolutely awesome in the number of ways it can show you your repo and help you quickly find the stuff you want	13:52
d_sun	.git/svn/info or s	13:52
	→ kukks joined	13:52
sitaram	Fatal: not just people who hate command line, I remember emails in which Linus also uses gitk :)	13:53
broonie	Yes, from his talk at LPC this year it's a big part of how he resolves conflicts.	13:53
Fatal	sitaram: I use gitk when I need to stage lines :)	13:53
sitaram	Fatal: gitk? stage lines? I think you mean "git gui"	13:53
Fatal	oh yes	13:53
	→ ab3 joined	13:54
kensei	sitaram: I can't pastebin it.	13:54
Fatal	sitaram: I was stuck in the original question :)	13:54
sitaram	Fatal: git comes with 3 gui programs. "git gui" does stuff which can mostly be done from CLI just as well. "git gui blame path/to/filename" does stuff that is not so easy, especially the drilldown, and then there's "gitk". See link above for some things it can do	13:55
	← ia left	13:55
sitaram	kensei: confidentiality? change some of the names and pastebin it, or get onto PM... or find some way of telling me what the problem is :)	13:55
kensei	hehe	13:56
	sitaram: I can't pastebin it because I don't have output.	13:56
wereHamster	then make some output ;)	13:56
kensei	I try to make a 'check for modification' after the configuration file changing.	13:56
	and the TortoiseGIT doesn't show nothing, that's the problem.	13:57
sitaram	kensei: eh what? I thought you were asking about gitolite config...	13:57
kensei	a commit number appears, and that's all.	13:57
	sitaram: yep	13:57
	I modified it and pushed on linux	13:57
sitaram	oh sorry I dont know TortoiseGIT -- however, git's native GUIs are quite fine too	13:57
kensei	and then I tried to pull the repository	13:57
	← reprore__ left	13:57
kensei	my own repository	13:57
	I did some modifications on windows.	13:57
	then when I try to see a diff output in TortoiseGIT	13:58
	a commit number appears	13:58
	nothing more :(	13:58
	everything worked fine, because this refactoring of gitolite config file :(	13:58
	← pheaver left	13:58
kensei	* because = before.	13:58
sitaram	gitolite is not that good as to reach inside TortoiseGIT and screw up something :)	13:59
kensei	no error/warning during pushing this config.	13:59
sitaram	try it from CLI or normal git gui and tell me what happens	13:59
	→ Axius joined	13:59
kensei	okay.	14:00
	but if pushing doesn't give back error/warning it does mean there aren't any problem, right ?	14:00
	so the configuration file is okay then, right ?	14:00
	← ab3 left	14:01
sitaram	kensei: as I said, I have no idea what TortoiseGIT considers a problem or how (and if) it even reports them. Sorry	14:01
jogla	d_sun: Well, i mean, into which folder	14:01
	Its the first line of git-svn dcommit that contains that information, but unfortunately, it's already too late when its wrong	14:02
d_sun	Directory.	14:02
sitaram	kensei: maybe TortoiseGIT ignores responses that it does not understand? Maybe it looks for one string, and if that exists, ignores everything else and all output... who knows!	14:02
d_sun	jogla: yes it might be hidden in the gitsvn config file (.git/svn/xxx?)	14:02
jogla	No	14:02
	There's only the url	14:02
d_sun	.git/config	14:02
jogla	I don't think so	14:02
kensei	sitaram: weird.	14:02
	→ aleksei joined	14:03
	← rchavik left	14:03
d_sun	jogla: it's in .git/config, I checked.	14:03
	url = svn://svn.berlios.de/portknocko/trunk	14:03
	just to give an example	14:03
	→ ab3 joined	14:04
jogla	d_sun	14:05
	No	14:05
	That's only the url of the repository	14:05
	url = svn://svn.berlios.de/portknock	14:05
	It looks like that for me	14:05
	→ mbernstein joined	14:05
jogla	and git branch -a listens all the branches available in the /branches folder in the svn repository	14:06
	Does it do that for you too?	14:06
	← Axius left	14:06
	→ malumalu joined	14:07
	→ bentob0x joined	14:07
	→ ia joined	14:08
	← loincloth left	14:10
	→ kpreid_ joined	14:11
	→ keystr0k joined	14:12
	→ WinterWeaver joined	14:12
	→ vasandgvd joined	14:13
	← luxuss left	14:14
jogla	For example: I just did a fresh checkout of an svn repository with git-svn clone:	14:15
	git-svn clone svn+ssh://... -T trunk -b branches -t tags	14:16
	now i cd into the directory	14:16
	$ git-svn dcommit	14:16
	Committing to svn+ssh://..../tags/v2.0rc9	14:16
	→ luxuss joined	14:17
jogla	If I had made changes, they would now go into the tag v2.0rc9, instead of the trunk	14:17
	I think this is because the last commit into this svn repository was tagging v2.0rc9	14:18
	← fcuk112 left	14:20
	→ marcoecc joined	14:21
charon	jogla: this was changed the other day, newer git-svn points master at trunk by default	14:21
jogla	Ahh	14:21
charon	b186a261b first tagged in 1.6.5-rc0	14:22
Gitbot	[git b186a261b]: http://tinyurl.com/yd5hdwh -- svn: initial "master" points to trunk if possible	14:22
	→ threeve joined	14:22
jogla	I'm at 1.5.6.5-3+lenny2	14:23
charon	that's kind of... old.	14:23
jogla	I'll get an update next year or something like that ;)	14:23
Grum	that is ancient	14:23
	Wed Aug 6 12:04:06 2008 O.o	14:24
jogla	Or there other things than trunk by default i would benefit of?	14:24
	← krynnotaur left	14:24
charon	no, we sat on our asses for a year and only implemented that one patch	14:24
	→ LiamH joined	14:24
jogla	That was not what I wanted to say	14:24
charon	seriously though, there are so many improvements it's almost not funny you're even asking ;)	14:24
	even if you only looked at git-svn, it learned some nice tricks, e.g. it can now reconstruct some classes of merges from the svn1.5 props	14:25
	(iirc from the list -- i haven't used that yet)	14:25
jogla	Cool	14:25
	I'll consider updating it	14:26
	→ patrikf joined	14:28
	← ab3 left	14:28
	→ ab3 joined	14:29
jogla	If I understood that correctly, when i type "git log", the first commit i see with git-svn-id is the branch where it would commit with dcommit, is that correct?	14:29
	← stuffcorpse left	14:30
	→ camonz joined	14:30
	→ stuffcorpse joined	14:30
	← warlock_mza left	14:31
	→ gbacon joined	14:32
	→ Yuuhi` joined	14:32
charon	jogla: not quite; it's the first one in 'git log --first-parent'	14:32
	(which is the same unless you used 'git merge', but matters a lot if you did)	14:33
jogla	Ahh	14:33
	← tekky left	14:33
	→ Whtiger joined	14:34
jogla	When i'm developing a feature in a branch in my local git repository, how would get the changes into master?	14:35
	I tried git rebase, but that isn't too good, I could have guessed that before	14:35
	Isn't there only git-merge left?	14:35
	→ Tk_L joined	14:36
wereHamster	jogla: git checkout master; git merge yourbranch	14:36
charon	jogla: if this is for git-svn: you're probably better off rebasing on master and then fast-fowarding master before dcommit	14:37
	the difference is that to svn, a rebase looks like a series of commits whereas a merge looks like a single squashed commit	14:37
	if it's for git, merge is usually better (because rebase rewrites history)	14:37
	→ adamm joined	14:38
charon	i.e.: git rebase master mybranch; git checkout master; git merge mybranch; git svn dcommit	14:38
	(the merge at the third step will fast-forward and thus not actually create a merge commit)	14:38
jogla	What does fast-forward mean in that context?	14:38
charon	man gitglossary	14:39
	← ia left	14:40
	→ ia joined	14:40
	← bigmack83_ left	14:40
	← bigmack83 left	14:40
	→ loincloth joined	14:42
	→ eletuchy joined	14:42
	→ TeckniX joined	14:43
	← Yuuhi left	14:44
	→ markoa joined	14:45
	→ cannonball joined	14:46
jogla	Thank you	14:46
	→ VVSiz joined	14:48
	← mattions left	14:49
	→ jmcantrell joined	14:51
jogla	at the moment I do "git-svn fetch" to see all changes made by others and then git-svn rebase, is that safe?	14:52
	Or should I do something different?	14:52
	→ krynnotaur joined	14:52
	→ scarabx joined	14:54
	→ fcuk112 joined	14:55
	→ GMFlash joined	14:55
	→ tek joined	14:57
	→ paltman joined	14:58
	← microm left	14:58
	→ bcardarella joined	14:58
	→ tamm0r joined	14:59
	→ Mezner joined	14:59
	→ kw joined	15:00
	← sh1mmer left	15:01
	← mrbob009 left	15:01
	→ voker57_ joined	15:03
	→ corni joined	15:03
	→ Geralt joined	15:05
	← ab3 left	15:06
	→ ab3 joined	15:07
	→ catphish joined	15:07
	→ parasti joined	15:08
	→ magcius joined	15:08
	→ flaguy48 joined	15:09
	← markoa left	15:09
	← jogla left	15:11
	→ orafu joined	15:12
	→ kumbayo joined	15:12
	← jksz left	15:13
	→ rolfb joined	15:13
	→ MrUnleaded joined	15:15
	→ warthog9 joined	15:16
	← scarabx left	15:16
	→ zuez joined	15:17
zuez	Silly question, having difficulty googling this. My post-receive emails come in with UNNAMED Project, what config flag is it to name the project?	15:17
d_sun	git-throw-champagne :p	15:18
	Perhaps editing .git/description fixes your issue.	15:19
	→ hummingkid joined	15:19
zuez	d_sun: Ah yes, thanks :-)	15:19
	→ jstemmer joined	15:19
	← Voker57 left	15:20
	← ab3 left	15:21
	→ ab3 joined	15:21
	← Stravy left	15:21
	→ Stravy joined	15:22
	→ HG` joined	15:22
	→ krawek joined	15:25
	← catphish left	15:25
	← GMFlash left	15:28
	← DemO_ left	15:30
	→ khmarbaise joined	15:31
	→ kyron joined	15:33
	← ia left	15:34
	← slabbeh left	15:35
	→ patmaddox joined	15:35
	← luxuss left	15:35
	→ ia joined	15:35
kyron	_Q_: I need to ignore/revert many source files that only had minor (non-functionnal) changes. I don't seem to have a "revert to previous version of this file" option in gitk (as gitk is the quickest way for me to identify such files. Anyone has a suggestion or will I have to use the command line tools to revert the files on by one?	15:36
	→ ctusar joined	15:36
d_sun	git revert HEAD?	15:36
	Thell_\|Away → Thell_	15:37
d_sun	well git deals in terms of commits, not single files.	15:37
	Thell_ → Thell	15:38
	← d_sun left	15:39
	→ d_sun joined	15:39
cbreak	you could use git checkout to get past versions of files	15:39
	and then just commit them together	15:39
MrUnleaded	can anyone tell me what this means? https://gist.github.com/ad172618df3070553e67 i think it may have to do with a graft i made but I am not certain.	15:41
kyron	cbreak: ok, I guess the checkout is pretty much what I want... would have been nice to be able to do this from within gitk (as a contextual menu item) ;)	15:41
	← krynnotaur left	15:41
d_sun	MrUnleaded: yes, it's due to grafts. Make sure there are none on the server side.	15:42
	→ JasonWoof joined	15:42
	← bauruine left	15:42
MrUnleaded	d_sun: i just made the graft and pushed it i read something regarding having to use filter-branch to make it a legit history graft?	15:42
	→ madewokherd joined	15:43
	← vasandgvd left	15:43
Arrowmaster	correct	15:43
	← kpreid_ left	15:43
MrUnleaded	is it just a simple "git filter-branch" or are some options needed?	15:44
	→ Trey joined	15:44
Arrowmaster	youll need some options	15:44
	i dont remember what though	15:45
d_sun	And a cool head, given it rewrites the history.	15:45
	← johan-s left	15:45
MrUnleaded	ohh i see it in the manual. thanks	15:45
	← marc_m left	15:45
	← ab3 left	15:46
	→ Turias joined	15:46
	← Keiya left	15:46
MrUnleaded	d_sun: yep i have used it before to fix up things :) thanks	15:47
	→ jaysern_ joined	15:47
	→ WebDragon joined	15:48
	← madewokherd left	15:49
	→ madewokherd joined	15:49
	→ dropandhop joined	15:50
dropandhop	hey all- I have a silly item that I would love your help on	15:50
	i'm trying to figure out why my git repository (although it works corrently to push and pull and clone) doesn't actually have the files that it is working with	15:51
Ilari	dropandhop: $faq non-bare	15:51
	→ tedoc2000 joined	15:51
	← ustunozgur left	15:51
d_sun	MrUnleaded: it makes other developers unhappy however :>	15:51
Ilari	dropandhop: ... Anyway, probably because push does not update the working copy.	15:52
	→ suman joined	15:52
dropandhop	ahhh- i'll read up on that, thanks!	15:52
	← ia left	15:52
	→ raichoo joined	15:53
MrUnleaded	d_sun: oh yea well i am trying to make the existing git repo compatible with git-svn as it was not originally used with git-svn... hopefully they will appreciate the added history...we shall see	15:53
	→ ia joined	15:54
	← cebewee left	15:54
	→ mastro joined	15:55
	← EricInBNE left	15:56
	→ kpreid_ joined	15:57
	→ futoase joined	15:58
dropandhop	$faq non-bare	16:00
	← jaysern_ left	16:00
dropandhop	sorry!	16:00
	is it possible to change this now that i have been working with git to push/pull/clone?	16:00
	→ GustavoRamos joined	16:00
	→ jessep_ joined	16:00
	← sis left	16:01
GustavoRamos	ello gitters :). i have some trouble installing gitosis on OpenSuSE, though it works with any other system like Ubuntu / Debian / CentOS. Anyone got to install it on SuSE or SLES?	16:01
	when i try to push, pull, any coomand that needs the server	16:01
	it gives me an error regarding gitosis-serve	16:01
	← imajes left	16:02
d_sun	not in $PATH?	16:02
GustavoRamos	it is, d_sun	16:02
	tek → tekky	16:02
GustavoRamos	triple-checked that	16:02
	:P	16:02
d_sun	well what is that error that you hide from us?	16:02
GustavoRamos	i'm not hiding nothing (afaik) :P	16:02
	i did everything right as i do on other distribuctions	16:03
	→ catalis joined	16:03
	→ sergiodj joined	16:03
kensei	hello	16:03
GustavoRamos	when i run gitosis-init it initializates	16:03
kensei	when I set up my gitweb server	16:03
	I get back the cgi script when I try to open the page.	16:03
	I get back the gitweb.cgi script content as a simple text file on the page.	16:03
GustavoRamos	but, when i try to connect client-side, it gives me that	16:03
	→ hipe joined	16:03
	→ reprore_ joined	16:04
GustavoRamos	sh: gitosis-serve: command not found // fatal: The remote end and hung up unexpectely	16:04
	that is what i get on git push	16:04
	or pull	16:04
	or anything	16:04
	?P	16:04
	?P*	16:04
	i've been stuck on this to 3 days now	16:05
	→ tryes joined	16:05
Ilari	GustavoRamos: Firstly, gitosis is obsoleted by gitolite. And it appears that gitosis-serve is not in $PATH.	16:05
	→ javatexan joined	16:05
GustavoRamos	Ilari: actually it _is_ on $PATH	16:05
	but thanks fot the gitolite info	16:05
	i may try it	16:05
	← loops left	16:06
Ilari	GustavoRamos: It is not. The PATH settings for interactive and noninteractive logins are different.	16:06
	*its	16:06
tryes	I'm using git to manage my dotfiles. I have a .gitignore with * as the first line, and then some patterns I want to negate. I want git not to ignore everything under .vim. !.vim/* doesn't appear to do this - what would be the correct pattern?	16:06
GustavoRamos	Ilari: i've set the $PATH on git user, /home/git/.bash_profile	16:06
Ilari	GustavoRamos: Interactive login only!	16:06
GustavoRamos	set on /etc/environment too	16:07
Ilari	GustavoRamos: Anyway, its not finding gitosis-serve. And it is one of gitosis commands. Most probably due to $PATH.	16:08
	← jessep left	16:08
	jessep_ → jessep	16:08
GustavoRamos	Ilari: didnt know that thing of non-interactive logins. How can i set them PATH?	16:08
	never had to do it...	16:08
	i use gitosis on ubuntu/debian	16:08
Ilari	GustavoRamos: No idea, since its 'sh'.	16:08
GustavoRamos	i can set the shell to bash, no probl	16:09
	→ Keiya joined	16:09
	← jessep left	16:09
GustavoRamos	Ilari: nevermind, bud	16:09
Ilari	GustavoRamos: IIRC, bash sources .bashrc on non-interactive login if it appears to come from somewhere.	16:09
GustavoRamos	i will try to use gitolite	16:10
sitaram	tryes: you may want to glance at http://sitaramc.github.com/articles/backup-and-sync-with-git.html	16:10
	← HG` left	16:10
	→ GMFlash_ joined	16:11
sitaram	tryes: as to your question, not sure but try putting "!.vim" first, then "!.vim/*" maybe?	16:11
	← Stravy left	16:11
	→ lhz joined	16:11
tryes	sitaram: yeah, I considered that sort of method - but I don't really think using symlinks has an advantage for me. I think my .vim/ problem is that .vim/* isn't actually recursive	16:12
	making a .vim/.gitignore and then saying !* might work? though I'd rather have everything in a central .gitignore	16:12
	→ Stravy joined	16:12
	← methanol left	16:12
tekky	heya sitaram hows it going?	16:14
sitaram	tryes: have you tried what I said, putting a "!.vim" first and then the "!.vim/*"? sorry I dont have time to try it but I thought it was worth mentioning	16:14
	tekky: good.... you?	16:14
tekky	sitaram: good good, still dont ahve my git setup how I like, but thats because I havent had time to rework it and setup my hooks :P	16:15
	anything exciting in the gitolite world?	16:15
tryes	sitaram: I tried that. I think it doesn't work for my purposes because I have .vim/a/, .vim/b/ etc, each with files inside. .vim/* doesn't apply recursively. I want a !.vim/** (in bash speak)	16:16
Ilari	tryes: OTOH, '*' is recursive...	16:17
	→ greboides joined	16:17
	← giallu left	16:17
Ilari	tryes: And .vim/.gitignore is higher priority than .gitignore	16:17
	← kkoehne_ left	16:17
	GMFlash_ → GMFlash	16:17
greboides	is .gitignore local to each branch?	16:18
dropandhop	IIari- I'm reading how it isn't a good idea for serveral different users to push/pull to a non-bare repo...is there any truth to that?	16:18
tryes	Ilari: yes, so creating a .vim/.gitignore would probably work. I guess I'll do that but I was hoping I could have everything in ~/.gitignore	16:18
	indeed, .vim/.ignore with the line !* does what I want	16:18
	I mean .vim/.gitignore	16:19
greboides	tryes: you can have everything on .gitignore, why not?	16:19
Ilari	greboides: Except !.vim/* in .gitignore isn't recursive rule.	16:19
greboides	Ilari: if you ignore a dir it is recursive if you dont track any files on it previously	16:20
	no need to *	16:21
doener	tryes: how about /* && !.vim	16:21
	tryes: making the toplevel "ignore everything" non-recursive	16:22
sitaram	tekky: lots of "wild" stuff :)	16:22
	→ engla joined	16:22
	← GMFlash left	16:22
	← kumbayo left	16:22
tekky	oh?	16:22
greboides	Ilari what exactly do you want to ignore?	16:23
Ilari	greboides: Not me.	16:23
mbernstein	is there a repo setting to make git ignore all file permissions ala svn? it's causing windows users to go nuts :(	16:23
greboides	oh, tryes	16:23
tryes	greboides: I have my home dir. I want to ignore everything except some listed files	16:23
doener	well, "recursive"... it's not actually about recursing, but that the match without a slash isn't "anchored" to the directory with the .gitignore file	16:23
	→ GMFlash joined	16:23
sitaram	tekky: when you get a chance glance through the "wildrepos" branch; there's a file whose name starts with "4-" in doc/	16:23
tryes	tryes: e.g. .bashrc, and problematically .vim and that entire recursive tree	16:23
greboides	tryes: you are doing it wrong	16:23
	do the opposite	16:23
	← kensei left	16:24
	← WinterWeaver left	16:24
Ilari	tekky: Also, I'm writing new git daemon that supports git-over-TLS and can tie to gitolite (lets to bypass SSH). :-)	16:24
greboides	and you can pipe git ls to .gitignore to automate it	16:24
tryes	greboides: that doesn't make sense. This way I can just git add . for instance, and I get a clean git status	16:24
doener	tryes: the /* && !.vim thing works for me	16:24
greboides	tryes: believe me	16:25
	before you git add . you will have to update .gitignore, just one more command on your workflow	16:25
tryes	doener: I was just trying it - indeed, it does exactly what I want. Thank you!	16:25
	→ niki_ joined	16:26
tryes	greboides: I rarely change the set of files I want to keep updated. this is just for configuration files I care about	16:26
greboides	tryes: perhaps i should use this :)	16:27
	→ rudi_s joined	16:28
sitaram	Ilari: we're still ok to delay my piece a little right? I'm still working through some of the wild issues with a willing "real use" tester :)	16:28
	← rolfb left	16:29
	← patmaddox left	16:29
	→ acorugedo joined	16:30
	← javatexan left	16:30
	→ javatexan joined	16:31
tekky	Ilari: sounds cool :) bypassing ssh would be nice for my users that dont have a clue :)	16:32
	← futoase left	16:35
GustavoRamos	Ilari: i have to install gitolite from my home pc, right? but it doesnt run linux. can i do that via cygwin?	16:36
sitaram	GustavoRamos: yes	16:37
	GustavoRamos: wait no not tested	16:37
GustavoRamos	mmm	16:37
sitaram	GustavoRamos: msysgit has been tested	16:37
GustavoRamos	sitaram: didnt notice u here m8 :)	16:37
	i have msysgit here somewhere	16:38
sitaram	GustavoRamos: so it should work with cygwin also... I dont see why it shouldnt; the dependency is bash on the workstation side	16:38
GustavoRamos	yeah, and cygwin has bash	16:38
	but i have one doubt	16:38
sitaram	GustavoRamos: that's ok, I'm a quiet, unassuming sorta guy -- easy to miss ;) <har de har!>	16:38
	→ carpet_the_walls joined	16:38
GustavoRamos	i have a 'git' user, no password, system user.	16:38
	i generated pub keys to that user	16:39
	do i need to get em and store on my workstation?	16:39
	→ Keiya_ joined	16:39
	→ methanol joined	16:39
carpet_the_walls	any idea why .git/info/exclude entries are not working for me please?	16:39
	Is there something special i have to do?	16:39
sitaram	GustavoRamos: I dont know what "generated pub keys to that user" means; you mean you generated a keypair or you copied some other users pubkey to that ID?	16:39
	→ mrbob009 joined	16:39
GustavoRamos	sitaram: generated a keypair to that user, sry	16:40
sitaram	GustavoRamos: normally users like "git" are on the server, not workstation. Is this on the server? is this the user you will be using to host gitolite?	16:40
GustavoRamos	the 'git' user is on server	16:41
	← __ed left	16:41
	→ __ed joined	16:41
	← khmarbaise left	16:41
GustavoRamos	and i dont get 'host' gitolite	16:41
	← agile left	16:41
	→ MrGando joined	16:41
	← acorugedo left	16:41
	→ acorugedo joined	16:42
	← acorugedo left	16:42
MrGando	Hello guys, I'm trying to use this guide ( someone here pointed me to it ) http://toroid.org/ams/git-website-howto , to create a shared repository for website development using git, however I'm having a lot of trouble	16:42
dropandhop	does anyone have any experience pushing/pulling into a non-bare repo?	16:42
	→ acorugedo joined	16:42
sitaram	host == serve :) this user@host "hosts gitolite" like that one "hosts apache" (serves)	16:42
	GustavoRamos: ^	16:42
GustavoRamos	yeah, 'git' will host my gitolite install	16:43
	:P	16:43
sitaram	GustavoRamos: then that user doesnt need any keys. It will only have other peoples pubkeys in its ~/.ssh/autuhorized_keys file	16:43
GustavoRamos	ook,	16:44
	so i need to generate a 'password-less' keypair on my gygwin user ?	16:44
sitaram	GustavoRamos: http://sitaramc.github.com/0-installing/9-gitolite-basics.html#IMPORTANT_overview_of_ssh	16:44
GustavoRamos	just to install gitolite	16:44
sitaram	GustavoRamos: yes... trust me it's the most painless way	16:44
	(until Ilari gets done with his git-over-TLS anyway!)	16:45
GustavoRamos	sitaram: sorry for my noobness m8	16:45
	← fcuk112__ left	16:45
GustavoRamos	will try it again	16:45
sitaram	GustavoRamos: cure for noobness is documentation; I have lots :)	16:45
GustavoRamos	i've read em, and must congrat u	16:45
sitaram	:)	16:46
GustavoRamos	very weell written	16:46
	:)	16:46
dropandhop	anyone have a momment to help me with some working-tree issue i'm having?	16:48
sitaram	GustavoRamos: thanks...	16:48
	dropandhop: not unless you ask the real question :)	16:48
dropandhop	hehe- that might help!	16:49
MrUnleaded	so i was wondering if there was a way to store notes or info about a longterm branch for example a note that a branch is subject to rebasing or what the branch is for.	16:49
dropandhop	so i have a bare repo setup that several people use (all part of the same group) to push/pull and it works great	16:49
	what i noticed is that I don't have a working dir setup and i	16:49
lack	MrUnleaded: You could check in a README file into that branch?	16:49
dropandhop	'd like to do that...while still using the repo to push/pull with several users	16:50
	i read there are issues with pushing to non-bare repos with multiple users...so i was hoping to get some advice	16:50
lack	dropandhop: So clone the repo yourself and keep that repo as a bare repo.	16:50
sitaram	dropandhop: best way is to use your own clone; keep the push-able one bare unless you know what youre' doing	16:50
dropandhop	manually clone it every once in a while?	16:51
lack	No, just once :)	16:51
MrUnleaded	yea i suppose i was just thinking it would be good to have soemthing like annotated tags but for branches	16:51
sitaram	clone it once; fetch once in a while after that	16:51
lack	dropandhop: Just pretend you're on a remote computer, just use a local path for the URL instead of whatever else you'd normally use. "git clone ../../path/to/bare.git" From then on, there's no difference, fetch, push, etc... Pretend you're just a regular user.	16:52
dropandhop	hmmm- so no automatic way for the working dir to be in sync?	16:52
lack	dropandhop: What exactly do you want this working dir for?	16:53
	← Keiya left	16:53
dropandhop	i saw a nice hook setup here that might work- http://toroid.org/ams/git-website-howto	16:53
	→ Bryson joined	16:54
	→ ciaran joined	16:54
dropandhop	the repo is on a web server...it's for building out web-apps...but i would like to share some of it work while it's in progress	16:54
	← psoo left	16:54
	→ Bryson_ joined	16:55
	→ Glenjamin joined	16:55
	← petrux left	16:55
dropandhop	so having an up-to-date working dir is key...and manually fetching/pulling to that working dir would make for issues	16:55
Glenjamin	hey guys, is there a way to get multiple git working trees?	16:55
	for the same repository	16:55
dropandhop	would this hook change work in my case- http://toroid.org/ams/git-website-howto	16:55
sitaram	Glenjamin: look in git.git/contrib somewhere for "new-workdir" or some such	16:56
wereHamster	Glenjamin: take a look at git-new-worktree in contrib/worktree	16:56
sitaram	wereHamster++	16:56
wereHamster	git-new-workdir	16:56
sitaram	oh	16:56
	← poseidm1 left	16:57
sitaram	I hate it when I was right and think I was wrong :)	16:57
	← ia left	16:58
	← sde_antrix1 left	16:58
mbernstein	core.filemode =false should make git ignore permission changes correct?	16:58
lack	dropandhop: Yes, that guide is probably what you want.	17:01
	→ hipe_ joined	17:02
	← hipe left	17:02
	← mrbob009 left	17:03
	← Bryson left	17:03
	Bryson_ → Bryson	17:03
	→ neoeinstein joined	17:05
	→ ia joined	17:07
	→ giallu joined	17:08
	→ fcuk112_ joined	17:08
	← kpreid_ left	17:08
	← fcuk112_ left	17:08
MrGando	Guys I'm trying to set up a shared git repository for web work , could anyone help me a bit ? I followed this tutorial which works for just one user making commits, but when I try to commit with other users I'm having problems	17:08
	→ fcuk112_ joined	17:09
MrGando	For starters, when I create my /var/repo.git , I do chgrp to that folder and chmod g+w to that folder... then git init --bare --shared	17:09
	← fcuk112_ left	17:09
	→ NickRiviera joined	17:09
NickRiviera	Hi everybody!	17:09
MrGando	but after that I do git status and get " fatal: This operation must be run in a work tree"	17:10
NickRiviera	has anyone experienced nbgit performance problems?	17:10
	→ patmaddox joined	17:10
	← wolog left	17:10
TML	MrGando: "git status" is for examining a work tree - I don't know of any way to make it work in a bare repo	17:11
curtana	MrGando, according to http://www.kernel.org/pub/software/scm/git/docs/gitcvs-migration.html you are doing the right thing	17:11
	← eletuchy left	17:11
curtana	(see "setting up a shared repository"	17:11
	) after you init, try to push into it (or fetch into it) to actually get some content in there	17:11
NickRiviera	anyone?	17:12
	→ mattweg joined	17:12
	→ bigmack83 joined	17:12
	→ fcuk112_ joined	17:13
MrGando	what does this mean " Make sure committers have a umask of at most 027, so that the directories they create are writable and searchable by other group members." ?? in "setting up a shared repository "	17:13
wereHamster	MrGando: do you know what a umask is?	17:13
	← tvw left	17:13
	→ tek joined	17:13
MrGando	wereHamster: Not really :S , could you tell me ? :)	17:14
curtana	MrGando, i that --shared on git-init takes care of that	17:14
	→ amirite joined	17:14
MrGando	curtana: I did git init --bare --shared so I think I got it then	17:14
wereHamster	MrGando: no, but wikipedia can: http://en.wikipedia.org/wiki/Umask	17:14
shruggar	how can I show all commits which added any file called *.php ?	17:14
MrGando	wereHamster: Ohhh I get it now, yeah I knew that , didin't know it was called Umask	17:15
amirite	i just tried merging master into my branch and it clobbered a bunch of my work -- to undo, I `git reset --HARD commitid` is that right?	17:15
wereHamster	shruggar: git log --diff-filter=A #and no idea how to limit it to *.php	17:15
	amirite: git reset --hard HEAD	17:16
	← tekky left	17:16
	→ bantic joined	17:17
MrGando	curtana: after I do this, I added a worktree "git config core.worktree /var/www/mywebsite"	17:17
wereHamster	amirite: add --name-only and then search for *php in the output	17:18
MrGando	and then setup a hook "hooks/post-receive" with git checkout -f, and chmod it to +x	17:18
curtana	interesting	17:18
	didn't knwo you could do that, cool	17:18
	← Keiya_ left	17:18
patrikf	is there a git-to-svn dictionary/cheatsheet?	17:19
greboides	tryes: thank you, your solution is much better	17:19
	← ericholscher left	17:19
	→ dreiss joined	17:20
GustavoRamos	sitaram: u still there?	17:21
wereHamster	patrikf: I only know of a git cheatsheet	17:21
	→ Pupeno_ joined	17:21
wereHamster	patrikf: http://zrusin.blogspot.com/2007/09/git-cheat-sheet.html	17:21
	← Pupeno left	17:21
sitaram	GustavoRamos: yes	17:21
GustavoRamos	i'm ashamed of asking this	17:21
	but, i cant get the ssh thing	17:21
	Pupeno_ → Pupeno	17:21
GustavoRamos	:S	17:21
patrikf	wereHamster: I need it the other way round. I'm used to how simple things are in git and don't want to spend much time finding out how they can be achieved in svn. ;-)	17:22
sitaram	GustavoRamos: no problem; happens. Let me try and explain	17:22
	GustavoRamos: oh wait; do you perhaps mean "cant get it to work in cygwin"?	17:22
GustavoRamos	nah	17:22
curtana	GustavoRamos, ssh thing? :)	17:22
	← Glenjamin left	17:22
GustavoRamos	i've installed msysgit now	17:22
	i'm on the cmd now	17:23
curtana	patrikf, most lines on the cheat sheet would read "you can't do this with svn"	17:23
	:)	17:23
wereHamster	patrikf: I'd stick with git-svn :)	17:23
GustavoRamos	i have a 'git' user on the server, which will be used to install gitolite	17:23
aleksei	patrikf: http://git.or.cz/course/svn.html	17:23
	→ khmarbaise joined	17:23
	→ Theravadan joined	17:23
GustavoRamos	do i need to have the pubkey of the git user on my workstation in order to install gitolite?	17:23
	sitaram: ^	17:23
Ilari	GustavoRamos: Are you trying to install gitolite on Windows?	17:24
sitaram	GustavoRamos: "on the cmd" should mean "right click, and choose "Git bash here" on some empty directory" please confirm that, (and not "cmd.exe")	17:24
	Ilari: no, from windows as client to server	17:24
GustavoRamos	sitaram: nope, just opened C:\msysgit\msysgit.bat or something	17:24
sitaram	GustavoRamos: dont do that	17:24
	GustavoRamos: creae a new, empty directory somewhere, right click on it, choose "Git Bash here"	17:25
	do everything in that window	17:25
GustavoRamos	sitaram: i'm in	17:26
sitaram	GustavoRamos: type "ssh-keygen" and hit enter for all prompts till it comes back to the cmdline	17:26
	← tbuehlmann left	17:26
	← acorugedo left	17:26
	→ acorugedo joined	17:27
GustavoRamos	sitaram: done	17:27
sitaram	GustavoRamos: make a note of the location of the "pub" file, which this command reports	17:27
GustavoRamos	okay, i know where it is	17:27
sitaram	GustavoRamos: is that something ending in "id_rsa.pub"?	17:28
GustavoRamos	yeah	17:28
sitaram	GustavoRamos: ok now try "ssh-copy-id -i ~/.ssh/id_rsa git@server" # this will ask you for the server's password, type it	17:28
GustavoRamos	i dont have a ssh-copy-id on git bash	17:29
sitaram	hmm	17:29
	I distinctly remember having seen it when I did my testing... wait	17:29
GustavoRamos	allrite	17:29
sitaram	no; my windows VirtualBox on this laptop is sorta dead, no show...	17:30
	GustavoRamos: ok we'll do it the long way: copy it to the server and all that manually	17:30
Ilari	GustavoRamos: Well, there's way around. Copy the id_rsa.pub to server (note, the .pub file, not the other one).	17:30
	→ warlock_mza joined	17:30
GustavoRamos	copy id_rsa.pub to /home/git/.ssh/ ?	17:31
	overwriting the existing one?	17:31
	← NET\|\|abuse left	17:31
	→ WebDragon\|away joined	17:31
Ilari	GustavoRamos: Copy it to /tmp?	17:31
GustavoRamos	Ilari: allrite, will scp it	17:31
Ilari	GustavoRamos: And no, don't overwrite existing one.	17:31
	← WebDragon left	17:32
	WebDragon\|away → WebDragon	17:32
sitaram	GustavoRamos: background: http://pastebin.com/d194b371b	17:32
	→ qhoxie joined	17:33
	→ rado1 joined	17:33
GustavoRamos	sitaram: Ilari: its there on /tmp	17:33
	just the id_rsa.pub file	17:33
sitaram	GustavoRamos: on server, cd ~/.ssh; cat /tmp/id_rsa.pub >> authorized_keys	17:34
GustavoRamos	as 'git', rite?	17:34
sitaram	yes	17:34
GustavoRamos	ok	17:34
sitaram	we dont need root etc for gitolite (assuming git itself is already installed)	17:35
GustavoRamos	okay	17:35
	its there	17:35
sitaram	back on client, try "ssh git@server pwd" and tell us what happens	17:35
floppyears	how does gitolite compare to gitweb ?	17:35
sitaram	floppyears: no connection	17:35
	→ r11t joined	17:35
sitaram	floppyears: quite different uses	17:36
	← Geralt left	17:36
GustavoRamos	sitaram: it asked me password	17:36
	but git had no password	17:36
	i set it	17:36
	and could log in	17:36
	→ Richardigel joined	17:37
sitaram	GustavoRamos: when did you set it? before you copied this id_rsa.pub file?	17:37
Richardigel	hi, how does git-diff know which one is the newline character? can i change that setting?	17:37
GustavoRamos	nope	17:37
	sitaram: nope	17:37
sitaram	GustavoRamos: when?	17:37
GustavoRamos	just now	17:37
	wasnt it supposed to ask me?	17:37
	← shruggar left	17:37
sitaram	GustavoRamos: no... it should not have	17:38
Ilari	GustavoRamos: If you can switch users from another account on that same host (without getting git password prompt), the git account should not have password at all.	17:38
sitaram	GustavoRamos: so when you type "ssh git@server pwd" on your workstation, it asks you for a password. What happens when you type it?	17:38
GustavoRamos	i just echoed the content of id_rsa.pub to /home/git/.ssh/authorized_keys	17:38
	when i ssh at my workstation	17:38
	it asks for pass	17:38
	→ tekky joined	17:39
sitaram	password. What happens when you type it?	17:39
GustavoRamos	sitaram: when i type the password i put it comes back to the normal screen	17:39
	doesnt show the pwd output	17:39
sitaram	no error message of any kind?	17:39
GustavoRamos	nope	17:39
sitaram	oh wow...	17:39
Ilari	GustavoRamos: And next line is from local command prompt?	17:40
GustavoRamos	Ilari: yep	17:40
curtana	maybe the server does not allow you to run a shell	17:40
	← __iron left	17:40
curtana	but only certain commands	17:40
GustavoRamos	curtana: nice idea	17:40
	let me take a look	17:40
	→ __iron joined	17:41
	← acorugedo left	17:41
GustavoRamos	curtana: are you a genious or something?	17:41
	lol	17:41
curtana	GustavoRamos, just a lowly sysadmin :)	17:41
GustavoRamos	it was redirecting to /bin/false as shell	17:41
	→ maattd joined	17:41
GustavoRamos	just put to /bin/bash	17:41
	lets test now	17:41
sitaram	GustavoRamos: so how did you do all that stuff with id_rsa.pub?	17:41
	→ kennethlove joined	17:42
GustavoRamos	curtana: sitaram: it now outputs the current workin dir	17:42
sitaram	curtana++ by the way	17:42
GustavoRamos	on the pwd command	17:42
	curtana: thx m8	17:42
sitaram	GustavoRamos: without asking for a psssword?	17:42
Ilari	GustavoRamos: But still prompts for password?	17:42
GustavoRamos	sitaram Ilari: yeah	17:42
	← tstclair left	17:42
sitaram	GustavoRamos: ?? we asked opposite questions...	17:42
GustavoRamos	sorry	17:43
	lol	17:43
	its still requesting pass	17:43
Ilari	GustavoRamos: 'chmod go-w ~git ~git/.ssh ~git/.ssh/authorized_keys'. Does that help?	17:43
sitaram	GustavoRamos: on server	17:43
	then retry command on client, of course	17:43
	→ bbeecher joined	17:44
GustavoRamos	still propting for pass	17:44
	let me try to generate the keys again	17:44
	Ilari curses ssh...	17:44
GustavoRamos	on different locations	17:44
carpet_the_walls	will a git ignore file containing log/* ignore just the contents of the log dir, or ignore the log dir and its contents? thanks	17:45
sitaram	Ilari: to be fair, I've never had trouble with "ssh-copy-id"; it's all these other systems... :(	17:45
Ilari	GustavoRamos: Try putting -vvvv on ssh command and from output confirm that it tries the correct key.	17:45
	← froschi left	17:46
curtana	GustavoRamos, if you are root then check /var/log/auth.log	17:46
	or wherever your syslog puts authentication messages	17:46
GustavoRamos	its there, curtana	17:46
	will cat it	17:46
	BFQ== Gustavo Ramos@GUSTAVORAMOS-PC	17:47
	maybe this is it?	17:47
	this is the ending of my .pub file	17:47
	spaces messes with it?	17:47
	← perlina left	17:47
sitaram	GustavoRamos: is that all one line or multiple lines? and have you tried what Ilari suggested (-vvvv)?	17:48
GustavoRamos	will try to log again now, sitaram	17:48
	← dreiss left	17:48
	→ tk_idle joined	17:48
	→ kpreid_ joined	17:50
tk_idle	hmm	17:50
	← tekky left	17:50
	tk_idle → tekky	17:50
	← kennethlove left	17:50
	→ bry joined	17:50
	→ smotchkkiss joined	17:51
	→ qhoxie_ joined	17:51
	← catalis left	17:51
	→ Alagar joined	17:52
	← aleksei left	17:52
GustavoRamos	sitaram: Ilari: curtana: windows really sux, m8's	17:52
	solved it	17:52
sitaram	how?	17:52
GustavoRamos	it wasnt letting the bash to write the keys properly	17:52
	permission issue	17:52
lack	Uninstalled windows?	17:52
sitaram	:)	17:53
GustavoRamos	lack: not yet	17:53
sitaram	GustavoRamos: explain please; I'm curious... what did you do to fix it?	17:53
GustavoRamos	sitaram: i'm a MCSE admin on windows 2008, so i have this problems in everyday basis	17:53
	commands lines do not share the same rights the win user has	17:53
sitaram	GustavoRamos: so how did you fix it?	17:54
GustavoRamos	so i had to set Everyone 'Full Access' on the .ssh folder on my machine	17:54
sitaram	client side...?	17:54
GustavoRamos	yep, ofc	17:54
sitaram	ok	17:54
	GustavoRamos: so now you can "ssh git@server pwd" and it prints /home/git or such without asking for a password?	17:54
GustavoRamos	sitaram: yes	17:54
sitaram	GustavoRamos: ok now "git clone git://github.com/sitaramc/gitolite"	17:54
	then "cd gitolite"	17:54
GustavoRamos	done	17:55
	← drry left	17:55
sitaram	GustavoRamos: ok now "src/gl-easy-install -q git server gustavo" # that third argument will be the default "admin"s name in the new gitolite config	17:55
	← bentob0x left	17:55
sitaram	GustavoRamos: "git" and "server" are two separate arguments, not combined with @ in between	17:55
GustavoRamos	yeah, i'm already running it	17:56
	but with no -q	17:56
	i want to see the magic	17:56
	:)	17:56
	← corni left	17:56
sitaram	GustavoRamos: :)	17:56
	GustavoRamos: it will create a new "keypair" called "gustavo" and "gustavo.pub" at some point; just hit enter for the passphrases for now -- you can always add passphrase later	17:56
	→ auslander joined	17:56
	→ wolog joined	17:57
GustavoRamos	its pushing	17:57
sitaram	GustavoRamos: it will also open an editor (probably vi). If you want all the defaults, just type :q to get out of it using defaults	17:57
	← tek left	17:57
GustavoRamos	sitaram: vi doesnt scares me :)	17:57
sitaram	:)	17:57
	ok	17:57
GustavoRamos	okay, i'm in pico instead	17:57
	what i have to edit here?	17:58
sitaram	GustavoRamos: nothing, if you're ok with all the defaults... glance through it if you like	17:58
	GustavoRamos: just exit the editor if you're ok with the settings	17:59
GustavoRamos	sitaram: ok	17:59
	← galderz left	18:00
GustavoRamos	sitaram: done	18:00
	it copied the admin part to another dir	18:00
	can i just take it to my local repo dir?	18:00
sitaram	GustavoRamos: I didn't get that... did the whole command complete?	18:01
	← d_sun left	18:01
GustavoRamos	sitaram: yep	18:01
sitaram	GustavoRamos: "cd ~/gitolite-admin; git remote -v"	18:01
	← qhoxie left	18:01
	→ jrmuizel joined	18:01
sitaram	GustavoRamos: wait	18:01
	→ t0rc joined	18:01
GustavoRamos	ok	18:01
sitaram	GustavoRamos: at the end of easy install run it will give you two URLs that you, and your users, should use	18:01
	← t0rc left	18:01
	← voker57_ left	18:01
sitaram	GustavoRamos: make a note of them	18:01
	GustavoRamos: yours will be "gitolite:reponame"; your users will have to use "git@server:reponame"	18:02
GustavoRamos	yeah, i dont get it	18:02
	how my workstation will resolve gitolite ?	18:02
sitaram	GustavoRamos: cat ~/.ssh/config	18:02
	→ t0rc joined	18:02
	→ voker57 joined	18:02
sitaram	on workstation of course	18:03
	→ marcusb joined	18:03
	← tamm0r left	18:03
GustavoRamos	cooool	18:03
	:)	18:03
sitaram	ssh feature	18:03
	← marcusb left	18:03
	← Richardigel left	18:03
	← t0rc left	18:03
GustavoRamos	and if i have to admin my repo from other pc ?	18:03
	or need to format this one?	18:03
sitaram	GustavoRamos: all explained in doc/6	18:03
GustavoRamos	sitaram: okay, will read it then	18:03
sitaram	GustavoRamos: one step at a time...	18:03
	→ qzio joined	18:03
sitaram	GustavoRamos: doc/6 is about that ssh thing, not your later question	18:04
	→ qhoxie joined	18:04
qzio	is it possible to see what a commit did, like when i pull i get a simple list of files that are changed/deleted	18:04
	← ia left	18:04
sitaram	GustavoRamos: to admin it from elsewhere, generate a key there, bring it here, name it "gustavo@otherPC.pub", place it ~/gitolite-admin/keydir, then "git add keydir; git commit; git push"	18:04
qzio	git show somecommit shows all the lines, i wan't the shorter thingie where it shows what files are modified/deleted/added	18:04
GustavoRamos	sitaram: okay	18:05
sitaram	GustavoRamos: you're basically adding a second key for yourself	18:05
	← jrmuizel left	18:05
	← reprore_ left	18:05
	dwmw2 → dwmw2_gone	18:05
	→ ia joined	18:05
GustavoRamos	sitaram: any further steps for installing ?	18:05
sitaram	GustavoRamos: install is done	18:05
GustavoRamos	just a quick question: when i reboot the server, how can i turn the thing on?	18:05
	← voker57 left	18:06
MrGando	Guys , I'm trying to setup a shared repo, but each time a user pushes to it, the index changes of "group" what could be going on there ?	18:06
sitaram	GustavoRamos: sshd	18:06
	GustavoRamos: that's all we need -- if sshd comes up, we're all set	18:06
qzio	MrGando: did you use git init --bare --shared=true ?	18:06
GustavoRamos	sitaram: allrite	18:06
MrGando	qzio: I did , git init --bare --shared	18:06
sitaram	GustavoRamos: you administer it by making changes to conf/gitolite.conf in the new "gitolite-admin" clone, adding keys to keydir/ in the same clone, etc...	18:07
MrGando	qzio: what could be happening , this is my config file http://pastebin.com/d757454e0	18:08
GustavoRamos	sitaram: for example, if i need to create the repo 'foo' with RW+ access to 'bar' i will upload the 'bar' .pub to keys, and edit the .conf to add the repo config?	18:08
sitaram	GustavoRamos: yes	18:08
	→ justinko joined	18:08
	← ia left	18:08
sitaram	GustavoRamos: if the file is "sitaram.pub" in keydir, then the user in conf/gitolite.conf is "sitaram"	18:09
	→ ben_h joined	18:09
GustavoRamos	sitaram: okay, i will test it with more users later	18:09
sitaram	GustavoRamos: rest of the syntax is described in conf/example.conf in thr gitolite repo (the one you cloned from github)	18:09
qzio	MrGando: seems like you didn't do bare? [core]; bare = false	18:09
justinko	i'm trying to push to a remote repo and it get's "stuck":	18:09
	Counting objects: 5811, done.	18:09
	Delta compression using up to 2 threads.	18:09
	^Cmpressing objects: 99% (5515/5533)	18:09
qzio	and i have sharedrepository = 2 in my config	18:10
	→ reprore joined	18:10
qzio	anyone know how to get the summary from a commit?	18:10
MrGando	qzio: Really ? this is really weird, i did $git init --bare --shared	18:10
	qzio: literally	18:10
qzio	--shared=true	18:10
MrGando	qzio: I think it's the same ? or not ?	18:10
	→ kW_ joined	18:12
	→ WebDragon\|away joined	18:12
MrGando	qzio: I mean git init --bare --shared == git init --bare --shared=true ?	18:12
qzio	yeah maybe	18:13
	im by no means an expert, i'm just saying your config looks different then mine :)	18:13
lack	qzio: Maybe - git log -1 --summary <commit>	18:14
MrGando	qzio: I see, could you paste your config ? are you working on a shared repo ?	18:14
qzio	MrGando: Thanks! exactly	18:14
	hm, is there a way to get colors? i have colors on by default...	18:14
	← NickRiviera left	18:14
MrGando	qzio: it would be great to see your config :)	18:14
	← qhoxie_ left	18:15
	← bgerber left	18:15
	← WebDragon left	18:15
	WebDragon\|away → WebDragon	18:15
	← reprore left	18:16
qzio	MrGando: http://pastebin.com/m45781750	18:16
	→ godsflaw joined	18:16
	← engla left	18:17
	→ bgerber joined	18:17
	→ qhoxie_ joined	18:18
	← sergiodj left	18:19
	← kw left	18:20
	→ brizly joined	18:21
	← Alagar left	18:23
	→ voker57 joined	18:23
	→ ia joined	18:24
	← lamont left	18:25
	→ WALoeIII joined	18:26
	→ lamont joined	18:26
	→ tvw joined	18:27
	← ben_h left	18:27
	← curtana left	18:28
	→ t0rc joined	18:28
	← qhoxie left	18:28
	← ngw left	18:29
	← Sho_ left	18:29
	→ aspotashev joined	18:29
	← zoniq_ left	18:30
	← javatexan left	18:30
carpet_the_walls	in the earlier days of git, did uncommitted changes remain local to the branch they were created in?	18:30
	→ qhoxie joined	18:31
	← GMFlash left	18:32
	← justinko left	18:33
	← hipe_ left	18:33
	← t0rc left	18:33
	→ javatexan joined	18:33
	→ Alagar joined	18:33
	→ hipe joined	18:33
	← Alagar left	18:34
doener	carpet_the_walls: branch heads reference commits, so by definition, they contain no uncommitted changes	18:34
	→ mrbob009 joined	18:35
	→ v0n joined	18:35
	→ t0rc joined	18:36
	→ drizzd joined	18:39
	→ maattd_ joined	18:40
	← qhoxie_ left	18:40
	← kpreid_ left	18:43
	→ qhoxie_ joined	18:43
	→ sergiodj joined	18:44
carpet_the_walls	doener: right, so this page confuses me, why are these people using the stash in this way? isnt it totally unnecessary? http://stackoverflow.com/questions/89487/why-isnt-the-git-stash-unique-per-branch	18:44
	relevent extract: "ex., while working on a feature branch, I will often notice minor bugs or cosmetic impurities in the code that aren’t relevant to that branch. Well, I just fix those right away. When time comes to commit, I selectively commit the relevant changes but not the fixes and cosmetics. Instead I stash those, which allows me to switch to my minor-fixes-on-stable branch, where I can then apply the stash and commit each minor fix separately	18:45
	(Depending on the changes in question, I will also stash some of them yet again, to switch to a different feature branch, where I apply those.)"	18:45
	FreakGuard → Tass`	18:45
Arrowmaster	seems like a reasonable workflow to me	18:46
	→ davedev joined	18:47
doener	carpet_the_walls: yeah, using stash there isn't really needed if you switch right away. Just "git checkout <other_branch_head>" is enough	18:47
	← maattd left	18:47
	maattd_ → maattd	18:47
carpet_the_walls	Arrowmaster: very confused, why do they need the stash? couldn't they selectivly make a commit on one branch, switch branch, and make some more selective commits - no need for stash	18:47
	→ kpreid_ joined	18:48
doener	carpet_the_walls: and if "git checkout <other_branch_head>" refuses the switch, because you have modifications to files that differ between HEAD and other_branch_head, you can use "checkout -m"	18:48
	← marcoecc left	18:48
carpet_the_walls	doener: thanks, fairly new to git, but these 2 comments made me question what i had learnt already	18:48
Arrowmaster	i didnt say i thought it was needed, but its reasonable	18:48
doener	carpet_the_walls: reasons I could see for using stash: The user has no idea that the -m flag exists.	18:48
davedev	i have some files i am woking on which has not been commited. i need to do a pull. the files i am editing are not being modified by this pull. how can i do a pull without having unstage my changes.	18:49
doener	carpet_the_walls: or: he wants the extra bit of safety from using stash instead of "checkout -m"	18:49
	→ hakr joined	18:49
doener	carpet_the_walls: using "checkout -m" (like stash/stash apply) can lead to conflicts. But with "checkout -m", if you mess up, misresolve and run "git add <path>" you're out of luck. With the stash, you can just do "git reset --hard && git stash apply" again	18:50
	← ia left	18:50
doener	carpet_the_walls: but as Aristotle didn't give any rationale for using stash, I guess he simply doesn't know about the -m flag	18:50
carpet_the_walls	doener: ok, thanks for all the help :-)	18:50
	→ ia joined	18:52
	← qhoxie left	18:54
	→ Alex_S joined	18:55
	→ vdidel_ joined	18:55
GustavoRamos	warning: LF will be replaced to CRLF in { ... }	18:55
	→ dreiss joined	18:55
GustavoRamos	anyone knows what error this is?	18:55
	^	18:55
doener	that's not an error, but a warning	18:55
	→ qhoxie joined	18:55
GustavoRamos	doener: but what it means?	18:55
	do u know?	18:55
doener	you have core.autocrlf enabled, and there's a file with crlf line endings that you're trying to put into the repo, so git converts it to lf line endings	18:56
GustavoRamos	cool	18:56
	← kyron left	18:57
drizzd	unfortunately, git-gui interprets this as an error :-(	18:57
GustavoRamos	drizzd: i'm not using the gui	18:57
	i'm using the cli	18:57
drizzd	yeah, I'm just saying	18:57
	→ Alagar joined	18:58
	← Alex_S left	18:58
	→ justin-george joined	18:59
	→ vinse joined	18:59
	→ imajes joined	18:59
	→ bugfux joined	19:00
	← mastro left	19:00
	← dropandhop left	19:00
	← Alagar left	19:00
	← krawek left	19:00
	→ Alagar joined	19:00
	→ krawek joined	19:01
	← mrbob009 left	19:01
	← drizzd_ left	19:03
	← sergiodj left	19:06
	← qhoxie_ left	19:06
	→ sergiodj joined	19:06
	→ viiitor joined	19:06
	← aresnick left	19:07
viiitor	Hello! Is there any way to shrink .git folder size? My repository has around 1mb of files, and .git has 33mb :O	19:07
	→ tstclair joined	19:07
	→ qhoxie_ joined	19:07
wereHamster	viiitor: run git gc	19:09
	← roop left	19:10
	← neoeinstein left	19:10
	← vbgunz left	19:11
	→ urbanmonk joined	19:11
	← Tk_L left	19:11
	← davedev left	19:12
	→ neoeinstein joined	19:12
	← priidu left	19:12
	← damog left	19:12
	→ damog joined	19:12
	← Alagar left	19:13
	→ reprore joined	19:15
	← khmarbaise left	19:15
	→ JackWinter joined	19:16
hipe	git 101: hello i have a bunch of files with a bunch of changes, but right now i just want to commit one to history, because i am about to change it. I assume I do "git add filename.txt" , then how do i commit just this one changed file ?	19:16
Arrowmaster	viiitor: git repack -adf —-window=250	19:16
	→ kensei joined	19:16
Arrowmaster	hipe: git commit	19:17
	← qhoxie left	19:17
	← javatexan left	19:17
hipe	Arrowmaster: ah yes. now when i say 'git status' the three categories (and colors!) i see are starting to make sense. thanks!	19:17
Arrowmaster	hipe: look at git status, it will tell you exactly which files are going to be commited when you run git commit	19:17
	→ Alagar joined	19:18
Arrowmaster	hipe: this is why 'git commit -a' is not the default, its very useful	19:18
	→ Cromulent joined	19:19
hipe	awesome!	19:19
	→ cubuanic joined	19:19
	← tekky left	19:20
	→ qhoxie joined	19:21
	→ Sigma joined	19:22
	← maattd left	19:23
	← kpreid_ left	19:24
	→ aisipos joined	19:25
	← kensei left	19:25
	→ hipe_ joined	19:26
	← hipe left	19:26
	→ tekky joined	19:26
	→ bauruine joined	19:26
	→ kpreid_ joined	19:26
	Adlai just used git-bisect to find one buggy commit out of 77 commits	19:27
viiitor	Arrowmaster: git repack -adf —-window=250 didn't changed anything...	19:27
	I mean, it changed something, but I still have 33mb in my .git	19:27
Adlai	took under 5 minutes :D	19:27
Travis-42	is it possible to set the message for the next commit, without committing?	19:27
Arrowmaster	viiitor: then youve really got 33mb of changes commited	19:27
wereHamster	viiitor: did you use rebase to remove files from the history?	19:27
viiitor	wereHamster: Nope	19:28
wereHamster	viiitor: what about git gc --aggressive --prune=now	19:28
	← keystr0k left	19:28
	← tekky left	19:29
	→ Twisted_Mentat joined	19:29
viiitor	wereHamster: trying	19:30
	wereHamster: No changes... Maybe someone commited some crap into the repository, a long time ago...	19:31
	Is there any way to check it (and remove?)	19:31
wereHamster	viiitor: there are scripts that search the history for big files.	19:31
	← qhoxie_ left	19:32
	→ keystr0k joined	19:32
viiitor	wereHamster: Is there any that you can recommend me?	19:32
	→ jMCg joined	19:32
	← keystr0k left	19:32
jMCg	Hello happy people.	19:32
wereHamster	I'd go with the first one that google finds :)	19:32
Ilari	...	19:32
	← Cromulent left	19:33
viiitor	Ok	19:34
	wereHamster: Thanks :) I'll search	19:34
	← hyperair left	19:34
	← stamina left	19:35
	→ qhoxie_ joined	19:35
	← imajes left	19:35
jMCg	I'm tring to setup a git repo over HTTP(S) -- I've created it from git svn init https://roscm.esotericsystems.at/svn/dws && git svn fetch && git init --bare -- but I'm having trouble cloning it remotely.	19:35
wereHamster	trouble == ?	19:36
	→ hyperair joined	19:36
	← viiitor left	19:37
Ilari	jMCg: Are you trying to run git init --bare inside git repository working tree???	19:37
jMCg	error: while accessing https://SVN_SYNC@roscm.esotericsystems.at/git/dws.git/info/refs	19:37
	Ilari: no. On the server in the master repo.	19:38
Ilari	jMCg: Don't use http:// with git.	19:38
	jMCg: Use git:// or ssh:// instead.	19:38
jMCg	Cannot do that for a number of reasons.	19:38
	→ stamina joined	19:39
Ilari	jMCg: Well, maybe it needs git update-server-info	19:40
jMCg	Ah, maybe I should've said that I've done that, and that the effect was uh.. nothing... damn, I'm slow.	19:40
	→ tweakt joined	19:41
	→ bambule joined	19:41
tweakt	I created a local branch (git checkout -b mybranch) but I didn't specifiy -track, how can I fix this so git pull works on my local branch (pull from remote and merge in one step) ?	19:42
	← hyperair left	19:42
	→ khmarbaise joined	19:42
MrUnleaded	so i made a graph and tried to run git filter-branch graphid..HEAD and it says that the refs were unchanged	19:42
	→ hyperair joined	19:42
	← parasti left	19:43
	fr\| → fr	19:44
wereHamster	MrUnleaded: you made a graph? What's a graph?	19:44
	← qhoxie left	19:45
	→ Geralt joined	19:45
	→ MacGyverNL_ joined	19:46
	→ tfarina_ joined	19:46
	← SRabbelier left	19:46
	→ SRabbelier1 joined	19:46
	→ \|Rolenun\| joined	19:46
	← SRabbelier1 left	19:48
	← hyperair left	19:48
	← sergiodj left	19:48
	← lamont left	19:48
	← mattweg left	19:48
	← Stravy left	19:48
	← mbernstein left	19:48
	← kukks left	19:48
	← DavidKlein left	19:48
	← tfarina left	19:48
	← jfkw left	19:48
	← Paraselene_ left	19:48
	← botanicus left	19:48
	← ciaran left	19:48
	← jMCg left	19:48
	← MacGyverNL left	19:48
	← tjafk left	19:48
	← rphillips left	19:48
	← Rolenun left	19:48
	← gernot left	19:48
	← tarbo left	19:48
	← ramus` left	19:48
	← ivan left	19:48
	← lfranchi left	19:48
	← ashH left	19:48
	← dominikh left	19:48
	← Keith-VB01 left	19:48
	→ lfranchi joined	19:48
	→ SRabbelier joined	19:48
	→ sergiodj joined	19:49
MrUnleaded	wereHamster: .git/info/graphs	19:49
	err .git/info/grafts	19:49
wereHamster	ah, grafts ..	19:49
	→ jmd joined	19:49
	← kpreid_ left	19:49
	→ kpreid__ joined	19:49
	→ hyperair joined	19:50
	→ ramus` joined	19:50
MrUnleaded	when i push the branch to another repo and try to check out from that repo it gives some errrors	19:50
wereHamster	I think if you want to have grafts applied: filder-branch --all --tag-filter cat	19:50
	→ ashH joined	19:50
	→ rphillips joined	19:50
	→ mbernstein joined	19:50
	→ ciaran joined	19:51
	→ jMCg joined	19:51
	→ lamont joined	19:51
	→ mattweg joined	19:51
	→ Stravy joined	19:51
	→ kukks joined	19:51
	→ DavidKlein joined	19:51
	→ tfarina joined	19:51
	→ jfkw joined	19:51
	→ Paraselene_ joined	19:51
	→ botanicus joined	19:51
	→ MacGyverNL joined	19:51
	→ tjafk joined	19:51
	→ Rolenun joined	19:51
	→ gernot joined	19:51
	→ dominikh joined	19:51
	→ ivan joined	19:51
	→ dominikh_ joined	19:52
	→ tarbo joined	19:52
	← greboides left	19:52
	← jMCg left	19:52
MrUnleaded	alright i can try it	19:52
	← ivan left	19:52
	← dominikh left	19:52
	← gernot left	19:53
	→ qhoxie joined	19:53
	← JackWinter left	19:53
	← tvw left	19:53
	← bantic left	19:53
	← bigmack83 left	19:53
	← patmaddox left	19:53
	← MrGando left	19:53
	← loincloth left	19:53
	← hugoxrosa left	19:53
	← babilen left	19:53
	← tetha left	19:53
	← sdboyer left	19:53
	← breitz left	19:53
	← fualo left	19:53
	← ianmcorvidae left	19:53
	← tmz left	19:53
	← s4msung left	19:53
	← d-snp left	19:53
	← squentin left	19:53
	← KeeperOfTheSoul left	19:53
	← Mpenz left	19:53
	← Teo` left	19:53
	← LoRe left	19:53
	← BearPerson left	19:53
	← gionn left	19:53
	← jakob left	19:53
	← Ilari left	19:53
	← macbar left	19:53
	← lucs left	19:53
	← bs left	19:53
	← torben left	19:53
	← pilif\|away left	19:53
	← StarkD left	19:53
	← jjuran left	19:53
	← mikkom_ left	19:53
	← Woody2143 left	19:53
	← unixtippse left	19:53
	← Stravy left	19:53
	← MacGyverNL left	19:53
	→ ivan joined	19:54
	← smotchkkiss left	19:54
	→ lucs joined	19:54
	← tbf left	19:54
	→ Stravy joined	19:54
	→ aptituz joined	19:55
	→ jakob joined	19:55
	→ keystr0k joined	19:55
	→ juan_arandaalva1 joined	19:56
	← bauruine left	19:56
	← Alagar left	19:56
	← damog left	19:56
	← justin-george left	19:56
	← brizly left	19:56
	← lhz left	19:56
	← hummingkid left	19:56
	← LiamH left	19:56
	← jepler left	19:56
	← mbroeker left	19:56
	← broquaint left	19:56
	← capndiesel left	19:56
	← tic left	19:56
	← anno^da left	19:56
	← erlehmann left	19:56
	← jlilly left	19:56
	← hakunin left	19:56
	← halfline left	19:56
	← rfay left	19:56
	← Haarg left	19:56
	← henr_k left	19:56
	← Psi-Jack left	19:56
	← pcgod left	19:56
	← zomg left	19:56
	← aptituz_ left	19:56
	← cantoma left	19:56
	← kampasky_ left	19:56
	← kusma left	19:56
	← corecode left	19:56
	← Cesario left	19:56
	← DrNick left	19:56
	← TheUni left	19:56
	→ TheUni joined	19:56
	→ jMCg joined	19:57
	← stepnem left	19:57
	→ Alagar joined	19:57
	→ stepnem joined	19:57
	→ gernot joined	19:57
	→ ianmcorvidae joined	19:58
	→ Psi-Jack joined	19:58
	→ eagleeye joined	19:58
	→ broquaint joined	19:58
	→ tic joined	19:58
	→ henr_k joined	19:59
	→ pcgod joined	19:59
	eagleeye → zomg	19:59
	→ jepler joined	19:59
	→ kampasky joined	19:59
	← Alagar left	19:59
	→ Alagar joined	19:59
	→ Evaraj joined	20:00
	→ AAA_awright_ joined	20:00
	→ DrNick joined	20:01
	← mstormo left	20:01
	← krunk- left	20:01
	← David-T left	20:01
	→ David-T joined	20:02
	← fcuk112_ left	20:02
	→ krunk- joined	20:02
	← nano- left	20:02
	→ fcuk112_ joined	20:02
	→ nano- joined	20:02
	→ mstormo joined	20:02
	→ rfay joined	20:02
	← stuffcorpse left	20:02
	← Strogg left	20:02
	→ stuffcorpse joined	20:03
	← qhoxie_ left	20:03
	← v0n left	20:04
	← vdidel_ left	20:04
	→ Strogg joined	20:04
	← fcuk112 left	20:04
MrUnleaded	can anyone explain how to fix this https://gist.github.com/f60037ebe2aa5f95701d i added a graft then pushed and now no one can fetch from the repo	20:05
	← Rolenun left	20:05
	← tfarina left	20:05
	→ juan_arandaalva2 joined	20:05
	← DavidKlein left	20:05
	← vinse left	20:05
	→ Keith-VB02 joined	20:06
	→ pedrobearr joined	20:08
	← juan_arandaalvar left	20:09
	← pedrobearr left	20:10
	← juan_arandaalva1 left	20:10
	→ qhoxie_ joined	20:10
	← kpreid__ left	20:12
	→ aresnick joined	20:12
	← stamina left	20:13
	← Geralt left	20:14
	← Sonderblade_ left	20:16
	← Paraselene_ left	20:16
	→ krynnotaur joined	20:18
	← __ed left	20:18
	← Alagar left	20:19
	→ __ed joined	20:19
	→ GMFlash joined	20:19
	← qhoxie left	20:19
	← neoeinstein left	20:21
	→ neoeinstein joined	20:22
	← juan_arandaalva2 left	20:22
	→ capndiesel joined	20:23
	→ Paraselene_ joined	20:24
	→ jrmuizel joined	20:24
	→ damog joined	20:24
	→ sgh joined	20:24
	→ JackWinter joined	20:24
	→ bantic joined	20:24
	→ bigmack83 joined	20:24
	→ patmaddox joined	20:24
	→ MrGando joined	20:24
	→ loincloth joined	20:24
	→ hugoxrosa joined	20:24
	→ babilen joined	20:24
	→ tetha joined	20:24
	→ StarkD joined	20:24
	→ sdboyer joined	20:24
	→ breitz joined	20:24
	→ fualo joined	20:24
	→ tmz joined	20:24
	→ s4msung joined	20:24
	→ d-snp joined	20:24
	→ squentin joined	20:24
	→ KeeperOfTheSoul joined	20:24
	→ Mpenz joined	20:24
	→ Teo` joined	20:24
	→ LoRe joined	20:24
	→ BearPerson joined	20:24
	→ gionn joined	20:24
	→ Ilari joined	20:24
	→ macbar joined	20:24
	→ bs joined	20:24
	→ pilif\|away joined	20:24
	→ mikkom_ joined	20:24
	→ torben joined	20:24
	→ unixtippse joined	20:24
	→ Woody2143 joined	20:24
	→ Alagar joined	20:24
	→ juan_arandaalvar joined	20:24
	→ qhoxie joined	20:24
	← Evaraj left	20:24
	← __ed left	20:25
	→ __ed joined	20:25
	→ archis joined	20:27
	← jrmuizel left	20:27
	← archis left	20:28
	→ kpreid_ joined	20:28
	← AAA_awright left	20:29
	→ juan_arandaalva1 joined	20:30
	← aresnick left	20:30
	← babilen left	20:31
	← __ed left	20:31
	← ia left	20:31
	→ __ed joined	20:31
	← rudi_s left	20:32
	→ spearce joined	20:32
	→ ia joined	20:32
	← sgh left	20:33
	→ becomingGuru joined	20:33
	← ph^ left	20:34
	→ ph^ joined	20:34
	← qhoxie_ left	20:34
	← juan_arandaalvar left	20:35
	dominikh_ → dominikh	20:36
	← __ed left	20:37
	→ __ed joined	20:38
	← WebDragon left	20:40
	← JakeSays left	20:40
	← paltman left	20:40
	← bcardarella left	20:41
	→ JakeSays joined	20:41
	← segher left	20:42
	→ cbreak\|evil joined	20:42
	← khmarbaise left	20:44
	→ qhoxie_ joined	20:45
	→ juan_arandaalvar joined	20:45
	← dirk2 left	20:45
	← tjafk left	20:46
	→ tjafk joined	20:46
wereHamster	MrUnleaded: looks like repository corruption. Can you run git fsck --full in the remote repo?	20:47
MrUnleaded	wereHamster: it is on github it did this after i pushed the graft	20:47
	→ WebDragon joined	20:48
	← tstclair left	20:49
	← univate left	20:50
	→ tstclair joined	20:50
	← ia left	20:50
	← GustavoRamos left	20:51
	→ GustavoRamos joined	20:52
wereHamster	MrUnleaded: in that case, try to contact github support	20:52
	btw, does a clean clone work?	20:52
	→ ia joined	20:52
jmd	wereHamster, The same way as a dirty one, except more water.	20:52
	← WebDragon left	20:53
	← cbreak\|evil left	20:53
	← __ed left	20:53
	← jpieper left	20:53
	← MrUnleaded left	20:53
	← bambule left	20:53
	← haider left	20:53
	← vital left	20:53
	← Ingmar left	20:53
	← Arafangion left	20:53
	← SquidMan left	20:53
	← jdahm left	20:53
	← kupsch left	20:53
	← spacebat left	20:53
	← docgnome left	20:53
	← s0ber_ left	20:53
	← Tjh_ left	20:53
	← cworth left	20:53
	← shabble left	20:53
	← sneakret_ left	20:53
	← jnl left	20:53
	← sbob left	20:53
	← awx left	20:53
	← \\Steve left	20:53
	← ArjenL left	20:53
	← dotemacs left	20:53
	← runasand left	20:53
	← dkr21 left	20:53
	← drfree left	20:53
	← rotty left	20:53
	← thijso left	20:53
	← k-man left	20:53
	← phako left	20:53
	← samjam left	20:53
	← nomadium left	20:53
	← hegge left	20:53
	← com4 left	20:53
	← PerlJam left	20:53
	← _rane left	20:53
	← pmcnabb_ left	20:53
	← jhelwig left	20:53
	← KiBi left	20:53
	← teknotus left	20:53
	← pigeon left	20:53
	← kmap left	20:53
	← Ratler left	20:53
	← madmoose left	20:53
	← daed left	20:53
	← markuspalmanto left	20:53
	← kelvie left	20:53
	← jgoulah left	20:53
	← blazer left	20:53
	← majoh left	20:53
	← Fatal left	20:53
	← jrockway left	20:53
	← redondos left	20:53
	← optixx left	20:53
	← kom_ left	20:53
	← Thumper_ left	20:53
	← Will\|work left	20:53
	← broonie left	20:53
	← chty left	20:53
	← Derander left	20:53
	← doki_pen left	20:53
	← IRSeekBot left	20:53
	← radii left	20:53
	← gdsx left	20:53
	← siraj left	20:53
	← aef left	20:53
	← reaVer left	20:53
	← ahf left	20:53
	← imarcusthis left	20:53
	← JamesA left	20:53
	← SethX left	20:53
	← vmiklos left	20:53
	← drizzd left	20:53
	← kW_ left	20:53
	← VVSiz left	20:53
	← malumalu left	20:53
	← Soliton left	20:53
	← unreal left	20:53
	← tg left	20:53
	← laj left	20:53
	← felipe left	20:53
	← ius left	20:53
	← LotR left	20:53
	← teukka left	20:53
	← siprbaum left	20:53
	← vesech_ left	20:53
	← pcc1 left	20:53
	← inclement left	20:53
	← bartman left	20:53
	← fdv left	20:53
	← dsop left	20:53
	← wanders left	20:53
	← karihre left	20:53
	← exg left	20:53
	← RurouniJones left	20:53
	← binjured left	20:53
	← EgS left	20:53
	← emias left	20:53
	← erg left	20:53
	← cYmen left	20:53
	← maxb left	20:53
	← metze left	20:53
	← helmut left	20:53
	← straszheim left	20:53
	← alus left	20:53
	← rektide left	20:53
	← dbatbold left	20:53
	← alip left	20:53
	← bburhans left	20:53
	← jspiros left	20:53
	← madduck left	20:53
	← impulze left	20:53
	← bob2 left	20:53
	← juan_arandaalvar left	20:53
	← qhoxie_ left	20:53
	← qhoxie left	20:53
	← Alagar left	20:53
	← krynnotaur left	20:53
	← jepler left	20:53
	← ianmcorvidae left	20:53
	← stepnem left	20:53
	← ramus` left	20:53
	← hyperair left	20:53
	← Twisted_Mentat left	20:53
	← jstemmer left	20:53
	← flaguy48 left	20:53
	← Mezner left	20:53
	← gbacon left	20:53
	← Ryback_ left	20:53
	← solofight left	20:53
	← tho left	20:53
	← murr4y left	20:53
	← merlin83 left	20:53
	← chrizz left	20:53
	← amirite left	20:53
	← thiago left	20:53
	← ludde left	20:53
	← Wolfman2000 left	20:53
	← gambler left	20:53
	← crab left	20:53
	← selckin left	20:53
	← me22 left	20:53
	← xenoterracide left	20:53
	← jkp left	20:53
	← vkroll left	20:53
	← dirker left	20:53
	← da5id left	20:53
	← Xaositec1 left	20:53
	← nick_h left	20:53
	← jujule2 left	20:53
	← milli left	20:53
	← ekontsevoy left	20:53
	← murbank left	20:53
	← Solefald left	20:53
	← shd left	20:53
	← silas left	20:53
	← josh^^_ left	20:53
	← jettero left	20:53
	← ayaka_t left	20:53
	← stick left	20:53
	← hansent\|away left	20:53
	← osfameron left	20:53
	← yatiohi left	20:53
	← charon left	20:53
	← _ikke_ left	20:53
	← Jonas__ left	20:53
	← andres left	20:53
	← joeytwiddle left	20:53
	← sieni left	20:53
	← tmm1 left	20:53
	← Rhonda left	20:53
	← tychoish left	20:53
	← Husio left	20:53
	← bnovc left	20:53
	← El_Angelo left	20:53
	← MrMagic left	20:53
	← jjore_ left	20:53
	← joevano left	20:53
	← prs left	20:53
	← Grum left	20:53
	← snuxoll left	20:53
	← dmlloyd left	20:53
	← pom left	20:53
	← uau left	20:53
	← Gitbot left	20:53
	← ruphy left	20:53
	← Leonidas left	20:53
	← jarh left	20:53
	← [i]chuck left	20:53
	← rtyler left	20:53
	← scrooloose left	20:53
	← spb left	20:53
	← juan_arandaalva1 left	20:53
	← Keith-VB02 left	20:54
Ilari	MrUnleaded: Pushed graft? Bad thing...	20:54
	MrUnleaded: Because they don't push.	20:54
	wereHamster: Netsplitted.	20:54
	→ univate joined	20:54
	← neoeinstein left	20:56
	→ gdrage joined	20:57
	→ neoeinstein joined	20:57
	← aisipos left	20:57
	→ Keith-VB03 joined	20:57
	← agib left	20:57
	← cbreak left	20:57
	→ WebDragon joined	20:57
	→ juan_arandaalvar joined	20:57
	→ qhoxie_ joined	20:57
	→ cbreak joined	20:57
	→ __ed joined	20:57
	→ qhoxie joined	20:57
	→ Alagar joined	20:57
	→ krynnotaur joined	20:57
	→ jepler joined	20:57
	→ ianmcorvidae joined	20:57
	→ stepnem joined	20:57
	→ ramus` joined	20:57
	→ hyperair joined	20:57
	→ bambule joined	20:57
	→ Twisted_Mentat joined	20:57
	→ drizzd joined	20:57
	→ kW_ joined	20:57
	→ amirite joined	20:57
	→ jstemmer joined	20:57
	→ MrUnleaded joined	20:57
	→ flaguy48 joined	20:57
	→ Mezner joined	20:57
	→ VVSiz joined	20:57
	→ gbacon joined	20:57
	→ malumalu joined	20:57
	→ jpieper joined	20:57
	→ Soliton joined	20:57
	→ jspiros joined	20:57
	→ Ryback_ joined	20:57
	→ vital joined	20:57
	→ solofight joined	20:57
	→ Ingmar joined	20:57
	→ tho joined	20:57
	→ murr4y joined	20:57
	→ Tjh_ joined	20:57
	→ unreal joined	20:57
	→ k-man joined	20:57
	→ merlin83 joined	20:57
	→ chrizz joined	20:57
	→ tg joined	20:57
	→ SethX joined	20:57
	→ thiago joined	20:57
	→ Arafangion joined	20:57
	→ laj joined	20:57
	→ phako joined	20:57
	→ SquidMan joined	20:57
	→ ludde joined	20:57
	→ Wolfman2000 joined	20:57
	→ gambler joined	20:57
	→ jdahm joined	20:57
	→ kupsch joined	20:57
	→ crab joined	20:57
	→ selckin joined	20:57
	→ spacebat joined	20:57
	→ docgnome joined	20:57
	→ felipe joined	20:57
	→ me22 joined	20:57
	→ xenoterracide joined	20:57
	→ ius joined	20:57
	→ s0ber_ joined	20:57
	→ LotR joined	20:57
	→ cworth joined	20:57
	→ shabble joined	20:57
	→ jkp joined	20:57
	→ sneakret_ joined	20:57
	→ PerlJam joined	20:57
	→ doki_pen joined	20:57
	→ drfree joined	20:57
	→ jnl joined	20:57
	→ madmoose joined	20:57
	→ Ratler joined	20:57
	→ kmap joined	20:57
	→ sbob joined	20:57
	→ teknotus joined	20:57
	→ rotty joined	20:57
	→ thijso joined	20:57
	→ awx joined	20:57
	→ _rane joined	20:57
	→ Fatal joined	20:57
	→ dkr21 joined	20:57
	→ chty joined	20:57
	→ broonie joined	20:57
	→ blazer joined	20:57
	→ markuspalmanto joined	20:57
	→ samjam joined	20:57
	→ optixx joined	20:57
	→ IRSeekBot joined	20:57
	→ kelvie joined	20:57
	→ siraj joined	20:57
	→ Will\|work joined	20:57
	→ radii joined	20:57
	→ KiBi joined	20:57
	→ pmcnabb_ joined	20:57
	→ redondos joined	20:57
	→ jhelwig joined	20:57
	→ majoh joined	20:57
	→ gdsx joined	20:57
	→ jgoulah joined	20:57
	→ reaVer joined	20:57
	→ daed joined	20:57
	→ com4 joined	20:57
	→ jrockway joined	20:57
	→ imarcusthis joined	20:57
	→ nomadium joined	20:57
	→ ahf joined	20:57
	→ kom_ joined	20:57
	→ pigeon joined	20:57
	→ runasand joined	20:57
	→ Thumper_ joined	20:57
	→ \\Steve joined	20:57
	→ Derander joined	20:57
	→ aef joined	20:57
	→ haider joined	20:57
	→ ArjenL joined	20:57
	→ hegge joined	20:57
	→ JamesA joined	20:57
	→ dotemacs joined	20:57
	→ vmiklos joined	20:57
	→ pcc1 joined	20:57
	→ emias joined	20:57
	→ bburhans joined	20:57
	→ siprbaum joined	20:57
	→ wanders joined	20:57
	→ helmut joined	20:57
	→ vesech_ joined	20:57
	→ dsop joined	20:57
	→ bartman joined	20:57
	→ binjured joined	20:57
	→ inclement joined	20:57
	→ rektide joined	20:57
	→ erg joined	20:57
	→ alus joined	20:57
	→ dbatbold joined	20:57
	→ cYmen joined	20:57
	→ fdv joined	20:57
	→ maxb joined	20:57
	→ karihre joined	20:57
	→ RurouniJones joined	20:57
	→ alip joined	20:57
	→ straszheim joined	20:57
	→ teukka joined	20:57
	→ exg joined	20:57
	→ metze joined	20:57
	→ EgS joined	20:57
	→ spb joined	20:57
	→ scrooloose joined	20:57
	→ rtyler joined	20:57
	→ yatiohi joined	20:57
	→ madduck joined	20:57
	→ silas joined	20:57
	→ Jonas__ joined	20:57
	→ Xaositec1 joined	20:57
	→ El_Angelo joined	20:57
	→ Leonidas joined	20:57
	→ ruphy joined	20:57
	→ MrMagic joined	20:57
	→ sieni joined	20:57
	→ Solefald joined	20:57
	→ josh^^_ joined	20:57
	→ Gitbot joined	20:57
	→ joevano joined	20:57
	→ jjore_ joined	20:57
	→ snuxoll joined	20:57
	→ uau joined	20:57
	→ jarh joined	20:57
	→ Rhonda joined	20:57
	→ _ikke_ joined	20:57
	→ nick_h joined	20:57
	→ shd joined	20:57
	→ dmlloyd joined	20:57
	→ ekontsevoy joined	20:57
	→ Husio joined	20:57
	→ murbank joined	20:57
	→ joeytwiddle joined	20:57
	→ pom joined	20:57
	→ bob2 joined	20:57
	→ da5id joined	20:57
	→ jujule2 joined	20:57
	→ tmm1 joined	20:57
	→ prs joined	20:57
	→ andres joined	20:57
	→ [i]chuck joined	20:57
	→ Grum joined	20:57
	→ ayaka_t joined	20:57
	→ bnovc joined	20:57
	→ milli joined	20:57
	→ impulze joined	20:57
	→ hansent\|away joined	20:57
	→ stick joined	20:57
	→ osfameron joined	20:57
	→ dirker joined	20:57
	→ tychoish joined	20:57
	→ charon joined	20:57
	→ vkroll joined	20:57
	→ jettero joined	20:57
	← zuez left	20:57
	← Keith-VB03 left	20:58
	← solofight left	20:58
	→ benjo2 joined	20:58
	← qhoxie left	20:58
	qhoxie_ → qhoxie	20:58
	→ aisipos joined	20:58
	→ zuez joined	20:58
	→ agib joined	20:58
GustavoRamos	any pretty git frontside like on github.com?	20:58
	← cbreak left	20:59
	→ cbreak\|evil joined	20:59
	→ mattweg_ joined	20:59
Ilari	GustavoRamos: Gitweb is the standard one, but not pretty...	20:59
GustavoRamos	Ilari: i meant functional P	21:00
	:P*	21:00
	→ juan_arandaalva1 joined	21:01
	→ vinse joined	21:01
	← warlock_mza left	21:01
	→ jaalto joined	21:01
	← mattweg left	21:01
	mattweg_ → mattweg	21:02
jaalto	I want to test if pull succeeds from REMOTE in temporary branch. How Do I do that?	21:02
PerlJam	jaalto: that doesn't quite make enough sense to me. You want to make a temp branch and merge one of the branches from REMOTE?	21:03
	→ WebDragon\|away joined	21:04
jaalto	PerlJam: The "origin" points to remote. I want to test if pulling from origin::master is safe (succeeds), in a temporary branch before I try to pull is in local "master"	21:04
PerlJam	"pulling in a branch" is that part that doesn't make sense.	21:05
	pull == fetch + merge. fetch just gets all of the commits in the repo that need getting (for all branches)	21:05
jaalto	PerlJam: That is I wan to to test the effect of "git pull" in a temporary branch that is copy of current local "master"	21:05
PerlJam	Sounds like you want to fetch remote master and merge to a local branch.	21:06
jaalto	PerlJam: "git fetch origin ; git branch test master ; <what after that>?"	21:06
	→ qhoxie_ joined	21:07
	→ pigdude joined	21:07
	→ smotchkkiss joined	21:07
	→ montylounge joined	21:09
Ilari	jaalto: What about local uncommitted changes?	21:10
	← WebDragon left	21:10
	← jmd left	21:11
	GustavoRamos → GustavoR\|aweh	21:11
	→ cbreak joined	21:11
	← becomingGuru left	21:11
	← Bryson left	21:12
	→ Bryson_ joined	21:12
	Bryson_ → Bryson	21:12
	← tstclair left	21:14
	← pigdude left	21:14
	→ bry_ joined	21:15
	→ xanonus joined	21:15
	→ yhager joined	21:15
	← qhoxie left	21:16
	qhoxie_ → qhoxie	21:16
	→ Elmaron joined	21:17
Elmaron	error: pathspec '' did not match any file(s) known to git.	21:18
	hum. o.O	21:18
Grum	but no-one knows what you did!	21:18
	← juan_arandaalvar left	21:18
Elmaron	what I did: cp'ed another bare repo into .git inside the directory where the original files reside (so it would be non-bare)	21:18
	then I edited config to be bare = false and planned to do a git checkout to reattach it to the original files that are obviously available again.	21:18
	and now it hates me :<	21:19
	I don't really have an idea what that means actually. I'm also not sure if what I tried is supposed to work	21:19
	would be nice if it did though :\|	21:19
	← capndiesel left	21:19
Elmaron	so that error happened when I typed "git checkout ./" inside the directory with the original files where the bare repo made non-bare resides in the .git sub folder	21:20
	→ thiago_home joined	21:20
Elmaron	or which I want to make non-bare	21:20
	hi thiago_home	21:20
	← kpreid_ left	21:20
	→ Bryson_ joined	21:21
	→ kpreid_ joined	21:21
	← montylounge left	21:22
	→ juan_arandaalvar joined	21:22
	→ tstclair joined	21:22
	→ WinterWeaver joined	21:22
	→ drubies joined	21:23
	→ kennethlove joined	21:23
	← patmaddox left	21:24
	← kennethlove left	21:24
	→ kennethlove joined	21:24
	← methanol left	21:25
	→ erlehmann joined	21:25
	→ jkp_ joined	21:26
	← cbreak\|evil left	21:26
	← juan_arandaalva1 left	21:28
	← qzio left	21:29
	← erlehmann left	21:29
	← univate left	21:29
	← gdrage left	21:29
	← dominikh left	21:29
	← kukks left	21:29
	← jfkw left	21:29
	← botanicus left	21:29
	← lamont left	21:29
	→ karptonite joined	21:29
	→ fcuk112 joined	21:29
	← yhager_ left	21:30
	→ b0fh_ua joined	21:30
	→ rudi_s joined	21:31
	→ corecode joined	21:31
	→ dominikh joined	21:31
b0fh_ua	Hi all! I have used rsync to copy my working tree and .git from host A to host B. Host B contained very old version of the project, and now I have a lot of old (untracked) files in the working tree.	21:31
	→ jfkw joined	21:32
	→ qhoxie_ joined	21:32
b0fh_ua	git reset --hard doesn't help	21:32
	what else I could try to get the clean project from git? remove entire files and do "git checkout" ?	21:32
	← yhager left	21:33
	← smotchkkiss left	21:33
	← JakeSays left	21:33
	← spearce left	21:33
	← Mpenz left	21:33
	← fualo left	21:33
	← bs left	21:33
	← torben left	21:33
	← pilif\|away left	21:33
	← StarkD left	21:33
	← tetha left	21:33
	← bigmack83 left	21:33
	← mikkom_ left	21:33
	← Woody2143 left	21:33
	← LoRe left	21:33
	← MrGando left	21:33
	← unixtippse left	21:33
	← d-snp left	21:33
	← squentin left	21:33
	← breitz left	21:33
	← macbar left	21:33
	← damog left	21:33
	← KeeperOfTheSoul left	21:33
	← loincloth left	21:33
	← bantic left	21:33
	← tmz left	21:33
	← Ilari left	21:33
	← Teo` left	21:33
	← gionn left	21:33
	← JackWinter left	21:33
	← s4msung left	21:33
	← BearPerson left	21:33
	← hugoxrosa left	21:33
	← sdboyer left	21:33
	← Paraselene_ left	21:33
Grum	git clean :p	21:33
	← cbreak left	21:33
	→ johnny joined	21:33
	→ pavelz_ joined	21:34
	→ tetha joined	21:34
	→ botanicus_ joined	21:35
	→ erlehmann joined	21:35
	→ gdrage joined	21:35
	→ univate joined	21:35
	→ lamont joined	21:35
	→ kukks joined	21:35
	→ botanicus joined	21:35
	→ sdboyer joined	21:35
pavelz_	hi .. small question, is there a way to push everything from one repository, to another one?	21:35
Elmaron	is git checkout supposed to modify files?	21:35
	→ juan_arandaalva1 joined	21:35
Fissure	yes	21:35
	← fcuk112 left	21:35
Elmaron	why?	21:35
	→ JackWinter joined	21:36
	→ yhager joined	21:36
	→ KeeperOfTheSoul joined	21:36
mbernstein	it changes your working directory	21:36
	it doesn't actually modify files	21:36
Fissure	because if it didn't it wouldn't be very useful	21:36
b0fh_ua	Grum: excellent, thanks a lot!	21:36
pavelz_	i have 2 repos on on the server, and one on the laptop i want to pushbutton copy sync all commits to the server from 6 branches	21:36
	→ unixtippse joined	21:36
	→ StarkD joined	21:36
	→ s4msung joined	21:36
Elmaron	mbernstein: it did	21:36
	→ Mpenz joined	21:37
Elmaron	mbernstein: I also thought it would do that	21:37
	→ d-snp joined	21:37
	→ Ilari joined	21:37
Elmaron	but it just downgraded me to the files inside the repo, trashing some days of work	21:37
	→ lamont` joined	21:37
	→ LoRe joined	21:37
	→ bs joined	21:37
	→ Teo` joined	21:37
	← lamont left	21:37
Elmaron	at least I think it was that checkout command	21:37
mbernstein	if you had a file, it was already modified ... unless you stash or commit, changes to a branch you're in move to the branch you checkout	21:37
	→ mikkom_ joined	21:37
b0fh_ua	another question - if I do have the git repository and the team being committing to the repository, I need to "push" the changes to SVN at the end of the day. How can I make sure each comit to SVN will be done from corresponding user (all members of team have SVN accounts as well)	21:37
mbernstein	since they aren't comitted, which is one of the cooler features of git xD	21:37
b0fh_ua	can git svn serve this?	21:37
	← Bryson left	21:38
	Bryson_ → Bryson	21:38
	→ toxx joined	21:38
	→ torben joined	21:38
pavelz_	so many cool features so confusing. changesets though are awesome	21:38
	→ damog joined	21:38
Elmaron	mbernstein: you have to explain that again :/	21:38
Fissure	b0fh_ua: don't think so	21:38
	→ krynnota_ joined	21:38
	← krynnota_ left	21:38
	← damog left	21:38
	← kukks left	21:38
	← gdrage left	21:38
	← botanicus left	21:38
	← erlehmann left	21:38
	← univate left	21:38
	botanicus_ → botanicus	21:38
mbernstein	Elmaron: okay, let's say you're orking in branch feature1	21:38
Fissure	Elmaron: did you use checkout with a branch name or a path? the command name is overloaded	21:38
mbernstein	you edit a file called test. then you say, oh, this is more of a different feature, let's branch and make feature2.	21:38
Fissure	(one of git's design warts, imho)	21:38
	← jkp left	21:39
mbernstein	the change you made to the file test wasn't comitted to feature1 - instead, it now is a modified file in feature2	21:39
	→ damog joined	21:39
	→ erlehmann joined	21:39
	→ gdrage joined	21:39
	→ univate joined	21:39
	→ kukks joined	21:39
	← kpreid_ left	21:39
	WebDragon\|away → WebDragon	21:39
	→ kpreid_ joined	21:40
Elmaron	Fissure: I tried to get the git repo deal again with my local files	21:40
	→ drry joined	21:40
Elmaron	I read that I need to checkout for this. so I tried "git checkout ./" first	21:40
	it came up with that wicked pathspec error	21:40
	then I tried "git checkout -f master". now the repo works, but seems like it thought it had to spit out those out files onto my hard disk	21:40
	probably that's intended behaviour but I'm just a bloody noob	21:41
	← keystr0k left	21:41
Elmaron	is there a ask before modifying any file on hard disk mode?	21:41
	I could really need this >.>	21:41
Fissure	you mean the "don't use the -f switch" mode?	21:41
	→ Paraselene_ joined	21:41
Elmaron	Fissure: the thing is	21:41
	I get a lot of error messages I do not even understand slightly	21:41
	all I wanted is to copy back a public repo as I accidentially wiped my local one	21:41
Fissure	so... clone it?	21:42
Elmaron	and at some point you just get a bit annoyed and try some things just to get it work	21:42
	→ smotchkkiss joined	21:42
Elmaron	Fissure: I don't know what cloning exactly does in difference to cp, so I thought a cp and then making it non-bare should work aswell.	21:42
	probably it does but I'm to noobish to do it without losing data	21:42
	→ Dashkal joined	21:42
	← Mpenz left	21:42
	→ MrGando joined	21:43
Elmaron	anyway, I also lost data already without using the -f switch >.>	21:43
Grum	what data?	21:43
Elmaron	I should probably put access rights that way that git just cannot modify a single file except its darn repo so it will stay away from my files	21:43
Fissure	well yes, cp + making non-bare will work, but why do things the hard way?	21:43
Elmaron	Grum: real hard disk data outside the repo I was committing from and which git is supposed to safe by keeping older revisions etc	21:43
	→ loincloth joined	21:43
	← loincloth left	21:43
	→ loincloth joined	21:44
Grum	git does keep all revisions indeed	21:44
Elmaron	Fissure: because I'm curious. but git makes me lose real data a lot faster than I'm expecting	21:44
	yea	21:44
	→ bantic joined	21:44
Grum	it doesnt make you loose any data?	21:44
Elmaron	but there are some cases where it will trash your data	21:44
Grum	no?	21:44
Elmaron	yes?	21:44
	only if you use it wrong ofc	21:44
	but I can't help it, I'm just doing that sometimes	21:44
	→ fualo joined	21:44
Fissure	if you _tell_ git "please overwrite my files with the current version from the repo", it will	21:44
Elmaron	what I'm saying is just that it seems too easy to me to lose data without that being obvious	21:44
Grum	not unless you fuck something up	21:44
	then you cant whine. make backups	21:44
Fissure	because it assumes you know what you're doing	21:44
Grum	erm	21:44
	it tells you, cannto checkout, cannot merge, cannot whatever	21:45
Elmaron	Grum: git is supposed to be my backup >.>	21:45
	yea	21:45
Grum	right ... so you dont backup your git .. smart move :D	21:45
Elmaron	well	21:45
	→ macbar joined	21:45
Elmaron	there's a reason to that:	21:45
	→ montylounge joined	21:45
Elmaron	the git is publicly on a server, I could just wipe it off if I broke it, redownload and retry (which I already did)	21:45
	→ paltman joined	21:45
Elmaron	I just didn't expect it to touch my actual hard disk files >.>	21:45
	and now it did. stupid thing :<	21:45
Grum	erm you did a what?	21:46
	checkout, clone ?	21:46
	clone doesnt work fi the dir is there, checkout says if it will throw away files and then refuses	21:46
	reset .. well .. erm .. brains?	21:46
Fissure	checkout -f master, he said above	21:46
Elmaron	Grum: that's what I dislike about you git folks... you think everything's obvious about git but it isn't	21:46
	← erlehmann left	21:47
johnny	i'm new to git.. but i found the way it works quite pleasing..	21:47
	i'm glad checkout works the way it does .. :)	21:47
Elmaron	I also do	21:47
	← paltman left	21:47
	← ia left	21:48
Fissure	well if you get an error message, don't understand it, and go ahead with the operation anyway, you can't expect it to hold your hand and figure out what you actually meant	21:48
Grum	pebcak :(	21:48
	← qhoxie left	21:48
	qhoxie_ → qhoxie	21:48
Elmaron	when I'm not doing something less obvious (e.g. copying a repo, pushing/pulling) and break things	21:48
	and it never really happened to me that I lost repo data	21:48
	but it happened twice already that I lost real hdd data	21:48
	and that's really ugly imho :\|	21:48
johnny	read the docs first?	21:49
Elmaron	Fissure: this is right	21:49
	← krawek left	21:49
	→ krawek_ joined	21:49
Elmaron	Fissure: still, you just don't expect it to mess around with your hdd files when you're not using "rm" or something	21:49
	→ ia joined	21:49
Elmaron	(although I didn't even expect it to do that when I used that cmd earlier on as I expected it just to delete inside the repo)	21:49
	johnny: good intention but they are long and I'm not getting everything... I'm always taking a look at the man page before	21:49
	→ bbeecher` joined	21:50
	→ krynnota_ joined	21:50
Elmaron	but as git is supposed to store older revisions and as I had a copy of the git repo I thought I'd just try	21:50
pavelz_	git is awesome!	21:50
	← krynnota_ left	21:50
	← torben left	21:50
	← bs left	21:50
	← yhager left	21:50
	← WinterWeaver left	21:50
	← mattweg left	21:50
	← agib left	21:50
	← __ed left	21:50
	← jpieper left	21:50
	← MrUnleaded left	21:50
	← bambule left	21:50
	← haider left	21:50
	← dotemacs left	21:50
	← ArjenL left	21:50
	← jnl left	21:50
	← Arafangion left	21:50
	← Tjh_ left	21:50
	← kupsch left	21:50
	← runasand left	21:50
	← dkr21 left	21:50
	← k-man left	21:50
	← thijso left	21:50
	← com4 left	21:50
	← _rane left	21:50
	← sbob left	21:50
	← majoh left	21:50
	← hegge left	21:50
	← madmoose left	21:50
	← sneakret_ left	21:50
	← jrockway left	21:50
	← nomadium left	21:50
	← drfree left	21:50
	← phako left	21:50
	← samjam left	21:50
	← pmcnabb_ left	21:50
	← daed left	21:50
	← kelvie left	21:50
	← Thumper_ left	21:50
	← shabble left	21:50
	← redondos left	21:50
	← JamesA left	21:50
	← KiBi left	21:50
	← jgoulah left	21:50
	← broonie left	21:50
	← awx left	21:50
	← pigeon left	21:50
	← \\Steve left	21:50
	← doki_pen left	21:50
	← reaVer left	21:50
	← aef left	21:50
	← gdsx left	21:50
	← radii left	21:50
	← imarcusthis left	21:50
	← kmap left	21:50
	← Derander left	21:50
	← chty left	21:50
	← blazer left	21:50
	← siraj left	21:50
	← markuspalmanto left	21:50
	← kom_ left	21:50
	← IRSeekBot left	21:50
	← vmiklos left	21:50
	← jhelwig left	21:50
	← teknotus left	21:50
	← Will\|work left	21:50
	← Fatal left	21:50
	← SquidMan left	21:50
	← rotty left	21:50
	← optixx left	21:50
	← s0ber_ left	21:50
	← Ratler left	21:50
	← vital left	21:50
	← ahf left	21:50
	← SethX left	21:50
	← PerlJam left	21:50
	← spacebat left	21:50
	← jdahm left	21:50
	← cworth left	21:50
	← docgnome left	21:50
	← Ingmar left	21:50
	← unixtippse left	21:50
	← xanonus left	21:50
	← teukka left	21:50
	← siprbaum left	21:50
	← vesech_ left	21:50
	← malumalu left	21:50
	← drizzd left	21:50
	← pcc1 left	21:50
	← inclement left	21:50
	← tg left	21:50
	← ius left	21:50
	← laj left	21:50
	← bartman left	21:50
	← VVSiz left	21:50
	← fdv left	21:50
	← dsop left	21:50
	← wanders left	21:50
	← karihre left	21:50
	← exg left	21:50
	← RurouniJones left	21:50
	← binjured left	21:50
	← EgS left	21:50
	← emias left	21:50
	← erg left	21:50
	← cYmen left	21:50
	← maxb left	21:50
	← metze left	21:50
	← helmut left	21:50
	← straszheim left	21:50
	← rektide left	21:50
	← dbatbold left	21:50
	← alip left	21:50
	← bburhans left	21:50
	← Soliton left	21:50
	← unreal left	21:50
	← kW_ left	21:50
	← LotR left	21:50
	← alus left	21:50
	← felipe left	21:50
	← madduck left	21:50
	← impulze left	21:50
	← bob2 left	21:50
	← jspiros left	21:50
	← krawek_ left	21:50
	← Paraselene_ left	21:50
	← mikkom_ left	21:50
	← Ilari left	21:50
	← StarkD left	21:50
	← botanicus left	21:50
	← qhoxie left	21:50
	← rudi_s left	21:50
	← benjo2 left	21:50
	← vkroll left	21:50
	← dirker left	21:50
	← da5id left	21:50
	← Xaositec1 left	21:50
	← crab left	21:50
	← ludde left	21:50
	← tho left	21:50
	← flaguy48 left	21:50
	← amirite left	21:50
	← nick_h left	21:50
	← jujule2 left	21:50
	← milli left	21:50
	← Twisted_Mentat left	21:50
	← ramus` left	21:50
	← xenoterracide left	21:50
	← Wolfman2000 left	21:50
	← chrizz left	21:50
	← murbank left	21:50
	← ekontsevoy left	21:50
	← Solefald left	21:50
	← shd left	21:50
	← jstemmer left	21:50
	← silas left	21:50
	← josh^^_ left	21:50
	← jettero left	21:50
	← ayaka_t left	21:50
	← murr4y left	21:50
	← stick left	21:50
	← hansent\|away left	21:50
	← osfameron left	21:50
	← yatiohi left	21:50
	← charon left	21:50
	← _ikke_ left	21:50
	← Jonas__ left	21:50
	← Leonidas left	21:50
	← andres left	21:50
	← joeytwiddle left	21:50
	← sieni left	21:50
	← tmm1 left	21:50
	← Rhonda left	21:50
	← tychoish left	21:50
	← selckin left	21:50
	← Husio left	21:50
	← bnovc left	21:50
	← El_Angelo left	21:50
	← gambler left	21:50
	← MrMagic left	21:50
	← stepnem left	21:50
	← jjore_ left	21:50
	← joevano left	21:50
	← jepler left	21:50
	← prs left	21:50
	← Grum left	21:50
	← snuxoll left	21:50
	← dmlloyd left	21:50
	← pom left	21:50
	← me22 left	21:50
	← uau left	21:50
	← Gitbot left	21:50
	← ruphy left	21:50
	← jarh left	21:50
	← [i]chuck left	21:50
	← merlin83 left	21:50
	← rtyler left	21:50
	← scrooloose left	21:50
	← spb left	21:50
	← Mezner left	21:50
	← Ryback_ left	21:50
	← thiago left	21:50
	← ianmcorvidae left	21:50
	← hyperair left	21:50
	← Alagar left	21:50
	← gbacon left	21:50
	← krynnotaur left	21:50
	→ geeKISSexy joined	21:50
	→ shtylman_ joined	21:51
pavelz_	rebase sucks though, its a non-feature fix for broken public projects. IMO	21:51
	← juan_arandaalvar left	21:51
johnny	git does store older revs.. you can even bring back things you forcefully removed.. if you try hard enough..	21:51
	→ Teo`` joined	21:51
	→ zuez_ joined	21:51
	→ hugoxrosa joined	21:51
	← Teo` left	21:52
	→ krawek_ joined	21:52
	→ brendon_work joined	21:52
	→ Paraselene_ joined	21:52
	→ torben joined	21:52
	→ mikkom_ joined	21:52
	→ bs joined	21:52
	→ Ilari joined	21:52
	→ StarkD joined	21:52
	→ unixtippse joined	21:52
	→ yhager joined	21:52
	→ botanicus joined	21:52
	→ qhoxie joined	21:52
	→ rudi_s joined	21:52
	→ WinterWeaver joined	21:52
	→ xanonus joined	21:52
	→ mattweg joined	21:52
	→ agib joined	21:52
	→ benjo2 joined	21:52
	→ __ed joined	21:52
	→ Alagar joined	21:52
	→ krynnotaur joined	21:52
	→ jepler joined	21:52
	→ ianmcorvidae joined	21:52
	→ stepnem joined	21:52
	→ ramus` joined	21:52
	→ hyperair joined	21:52
	→ bambule joined	21:52
	→ Twisted_Mentat joined	21:52
	→ drizzd joined	21:52
	→ kW_ joined	21:52
	→ amirite joined	21:52
	→ jstemmer joined	21:52
	→ MrUnleaded joined	21:52
	→ flaguy48 joined	21:52
	→ Mezner joined	21:52
	→ VVSiz joined	21:52
	→ gbacon joined	21:52
	→ malumalu joined	21:52
	→ jpieper joined	21:52
	→ Soliton joined	21:52
	→ jspiros joined	21:52
	→ Ryback_ joined	21:52
	→ vital joined	21:52
	→ Ingmar joined	21:52
	→ tho joined	21:52
	→ murr4y joined	21:52
	→ Tjh_ joined	21:52
	→ unreal joined	21:52
	→ k-man joined	21:52
	→ merlin83 joined	21:52
	→ chrizz joined	21:52
	→ tg joined	21:52
	→ SethX joined	21:52
	→ thiago joined	21:52
	→ Arafangion joined	21:52
	→ laj joined	21:52
	→ phako joined	21:52
	→ SquidMan joined	21:52
	→ ludde joined	21:52
	→ Wolfman2000 joined	21:52
	→ gambler joined	21:52
	→ jdahm joined	21:52
	→ kupsch joined	21:52
	→ crab joined	21:52
	→ selckin joined	21:52
	→ spacebat joined	21:52
	→ docgnome joined	21:52
	→ felipe joined	21:52
	→ me22 joined	21:52
	→ xenoterracide joined	21:52
	→ ius joined	21:52
	→ s0ber_ joined	21:52
	→ LotR joined	21:52
	→ cworth joined	21:52
	→ shabble joined	21:52
	→ jettero joined	21:52
	→ vkroll joined	21:52
	→ charon joined	21:52
	→ tychoish joined	21:52
	→ dirker joined	21:52
	→ osfameron joined	21:52
	→ stick joined	21:52
	→ hansent\|away joined	21:52
	→ impulze joined	21:52
	→ milli joined	21:52
	→ bnovc joined	21:52
	→ ayaka_t joined	21:52
	→ Grum joined	21:52
	→ [i]chuck joined	21:52
	→ andres joined	21:52
	→ prs joined	21:52
	→ tmm1 joined	21:52
	→ jujule2 joined	21:52
	→ da5id joined	21:52
	→ bob2 joined	21:52
	→ pom joined	21:52
	→ joeytwiddle joined	21:52
	→ murbank joined	21:52
	→ Husio joined	21:52
	→ ekontsevoy joined	21:52
	→ dmlloyd joined	21:52
	→ shd joined	21:52
	→ nick_h joined	21:52
	→ _ikke_ joined	21:52
	→ Rhonda joined	21:52
	→ jarh joined	21:52
	→ uau joined	21:52
	→ snuxoll joined	21:52
	→ jjore_ joined	21:52
	→ joevano joined	21:52
	→ Gitbot joined	21:52
	→ josh^^_ joined	21:52
	→ Solefald joined	21:52
	→ sieni joined	21:52
	→ MrMagic joined	21:52
	→ ruphy joined	21:52
	→ Leonidas joined	21:52
	→ El_Angelo joined	21:52
	→ Xaositec1 joined	21:52
	→ Jonas__ joined	21:52
	→ silas joined	21:52
	→ madduck joined	21:52
	→ yatiohi joined	21:52
	→ rtyler joined	21:52
	→ scrooloose joined	21:52
	→ spb joined	21:52
	→ EgS joined	21:52
	→ metze joined	21:52
	→ exg joined	21:52
	→ teukka joined	21:52
	→ straszheim joined	21:52
	→ alip joined	21:52
	→ RurouniJones joined	21:52
	→ karihre joined	21:52
	→ maxb joined	21:52
	→ fdv joined	21:52
	→ cYmen joined	21:52
	→ dbatbold joined	21:52
	→ alus joined	21:52
	→ erg joined	21:52
	→ rektide joined	21:52
	→ inclement joined	21:52
	→ binjured joined	21:52
	→ bartman joined	21:52
	→ dsop joined	21:52
	→ vesech_ joined	21:52
	→ helmut joined	21:52
	→ wanders joined	21:52
	→ siprbaum joined	21:52
	→ bburhans joined	21:52
	→ emias joined	21:52
	→ pcc1 joined	21:52
	→ vmiklos joined	21:52
	→ dotemacs joined	21:52
	→ JamesA joined	21:52
	→ hegge joined	21:52
	→ ArjenL joined	21:52
	→ haider joined	21:52
	→ aef joined	21:52
	→ Derander joined	21:52
	→ \\Steve joined	21:52
	→ Thumper_ joined	21:52
	→ runasand joined	21:52
	→ pigeon joined	21:52
	→ kom_ joined	21:52
	→ ahf joined	21:52
	→ nomadium joined	21:52
	→ imarcusthis joined	21:52
	→ jrockway joined	21:52
	→ com4 joined	21:52
	→ daed joined	21:52
	→ reaVer joined	21:52
	→ jgoulah joined	21:52
	→ gdsx joined	21:52
	→ majoh joined	21:52
	→ jhelwig joined	21:52
	→ redondos joined	21:52
	→ pmcnabb_ joined	21:52
	→ KiBi joined	21:52
	→ radii joined	21:52
	→ Will\|work joined	21:52
	→ siraj joined	21:52
	→ kelvie joined	21:52
	→ IRSeekBot joined	21:52
	→ optixx joined	21:52
	→ samjam joined	21:52
	→ markuspalmanto joined	21:52
	→ blazer joined	21:52
	→ broonie joined	21:52
	→ chty joined	21:52
	→ dkr21 joined	21:52
	→ Fatal joined	21:52
	→ _rane joined	21:52
	→ awx joined	21:52
	→ thijso joined	21:52
	→ rotty joined	21:52
	→ teknotus joined	21:52
	→ sbob joined	21:52
	→ kmap joined	21:52
	→ Ratler joined	21:52
	→ madmoose joined	21:52
	→ jnl joined	21:52
	→ drfree joined	21:52
	→ doki_pen joined	21:52
	→ PerlJam joined	21:52
	→ sneakret_ joined	21:52
	← zuez left	21:52
	← zuez_ left	21:52
	→ Woody2143 joined	21:52
	→ efftee joined	21:53
	← ft left	21:54
	→ fcuk112 joined	21:54
	← elliottcable left	21:54
	← b0fh_ua left	21:54
	← shtylman left	21:54
	← lucsky left	21:54
	← LRN left	21:54
	← Elmaron left	21:54
johnny	seen people accomplish pretty amazing things with theirr repo data..	21:54
	altho if you git gc.. you obviously are going to have less problems..	21:54
	err	21:54
	you are going to have more problems..	21:54
	← karptonite left	21:54
	← naderman left	21:54
	← patcito left	21:54
	← ntoll left	21:54
	→ patcito__ joined	21:54
	→ Elmaron joined	21:54
	→ Keith-VB06 joined	21:54
Grum	Elmaron: but seriously, you use -f what do you expect ? it still to tell you now to do it so you have to use -f twice? :)	21:54
	*not to do it	21:54
	→ LRN joined	21:54
	← krynnotaur left	21:55
	← tchan left	21:55
	→ krynnota_ joined	21:55
	← lfranchi left	21:55
	← cytrinox left	21:55
	→ lfranchi joined	21:55
Elmaron	Grum: I expect that I can use it without -f and get a better error message/hint what to do and better google results/better IRC answers what I can do to get around without trying the infernal -f switch	21:55
	← mpr left	21:55
	→ cytrinox joined	21:55
	efftee → ft	21:55
Fissure	overwriting the work tree is the whole point of git checkout	21:55
	Elmaron: well usually if you want to delete a file in the repo you want to delete it from your work tree too	21:55
Elmaron	and I expect a versioning system not to overwrite my files, but maybe that's just me	21:55
	krynnota_ → krynnotaur	21:55
	→ tchan joined	21:55
	← wereHamster left	21:55
	→ wereHamster joined	21:56
	← mnt left	21:56
Elmaron	I get that it might have some use when you're pulling data, but I'm just a publisher and not a puller, so for me that's kinda unneeded..	21:56
	→ mpr joined	21:56
	← Psi-Jack left	21:56
	→ Psi-Jack joined	21:56
	← jspiros left	21:56
	→ jspiros_ joined	21:56
	← ciaranm left	21:56
	← mika left	21:56
	→ ciaranm joined	21:56
Grum	do i have to paste the error message? :D	21:56
	→ mika joined	21:56
Elmaron	which error message?	21:56
	← jkp_ left	21:56
	→ jkp joined	21:56
	→ ntoll joined	21:57
Elmaron	error: pathspec '' did not match any file(s) known to git. <= this one?	21:57
	→ _Vi joined	21:57
Grum	error: You have local changes to 'x'; cannot switch branches.	21:57
	that is the error you get if you have modified local files	21:57
_Vi	How to get "git://" URI of http://projects.radhuset.org/gitweb/?p=mirrors/zen-stable.git ?	21:58
Fissure	pavelz_: what? rebase is a great tool	21:58
	→ Mpenz joined	21:58
Grum	Elmaron: that error is just because you are doing stuff with git that shouldnt be done if you have no idea how it works :)	21:58
Fissure	_Vi: if it's not on the page, it's either not there or you have to guess	21:59
thiago_home	_Vi: go to the website and read it. It should say what the address is.	21:59
doener	Elmaron: you asked git to get something from the index. Your repo has no index, so there was no match	21:59
_Vi	thiago_home, Where it should be there? At the top? Near "description", "owner", "last change"?	21:59
Elmaron	Grum: what would have been the right approach to solve that error?	21:59
	so that git commit works again on that repo	21:59
Grum	why did you get it in the first place?	21:59
Fissure	Elmaron: i don't think i'd want to use a version control system that couldn't overwrite my files even when i asked it	22:00
thiago_home	_Vi: below "last change", in the "URL" field	22:00
Elmaron	Grum: I tried to reattach a bare repo to its hard disk files so it becomes non-bare	22:00
	Fissure: that's an assumption which I think is odd	22:00
Grum	Elmaron: erm a bare repo has no files	22:00
thiago_home	_Vi: like here: http://git.kernel.org/?p=git/git.git;a=summary	22:00
Grum	so how did you ever get the 'files' into the bare repo?	22:00
	using GIT_WORK_DIR?	22:01
Elmaron	Grum: I cloned a non-bare repo into a bare one	22:01
doener	Grum: he has a directory with files that could act as a working tree, and wants to turn that into a repo	22:01
Elmaron	*wanted	22:01
_Vi	thiago_home, There's no "URL" field. And in the page source there only few unusable "git://" occurrences.	22:01
Elmaron	now they're overwritten anyway	22:01
Fissure	Elmaron: just 10 minutes ago i reverted an old commit... having to manually grab the patch for that and apply it would be pretty annoying, no?	22:01
thiago_home	_Vi: that's where it should be. If it's not there, then you have to either guess or ask someone who knows this repository.	22:02
Elmaron	Fissure: indeed, but that error message seems just unhelpful to me	22:02
johnny	patches accepted?	22:02
	/me wonders	22:02
Grum	doener: so he started with a normal repo; then cloned to bare; then tossed away the .git from the normal repo and then used the bare one instead of the .git he just purged?	22:02
doener	Elmaron: that's not really a uhm, "common" operation, but after the cp + config core.bare false, you would have only needed a "git reset" (without arguments), I guess	22:02
Elmaron	nice >.>	22:03
johnny	i guess i'd just git clone /path/to/bare /checkout ...	22:03
	and not do that cp stuff..	22:03
doener	Grum: that's one possibility. Another one that looks a lot saner: Two different boxes, both used to develop the project without git in the past	22:03
Grum	he should have used either GIT_DIR or GIT_WORK_TREE	22:03
Elmaron	Grum: I lost the normal repo on accident	22:03
doener	Grum: on box got turned into a repo, and now he wants to turn the other one into a repo, too	22:04
	← bbeecher left	22:04
doener	Grum: just init'ing the second one _might_ lead to a slightly messy history	22:04
Grum	git init; git fetch from remote; git commit; git push would have solved it?	22:04
Elmaron	Grum: I do my source code distribution from that folder aswell that doesn	22:04
doener	Grum: no, "git init; git add -A; git commit; git pull; git push" would have. But that might have left you with an ugly history	22:04
_Vi	thiago_home, And it looks like this host don't listen 9418/tcp port. May be there are no repositories there?	22:04
Elmaron	+'t contain the repo, so I delete it from there. I just used the wrong path and deleted it also from my original development source code folder and not just from the source code distribution folder I'm turning into an archive later on	22:05
	→ parasti joined	22:05
Grum	you can always fix history	22:05
thiago_home	_Vi: maybe they're somewhere else	22:05
	_Vi: maybe they're SSH only	22:05
	→ mathepic joined	22:07
	→ mnt joined	22:07
	→ squentin_ joined	22:07
	→ breitz joined	22:07
	→ BearPerson joined	22:07
	→ gionn joined	22:07
	→ pilif\|away joined	22:07
	← krawek_ left	22:07
doener	Elmaron: of course, the sane way would be: mv proj proj~; git clone git://server/proj.git; rm -rf proj; cp -a proj~/ proj/;	22:07
	→ krawek joined	22:07
Elmaron	doener: the server isn't running git with a listen port	22:07
	← toxx left	22:07
Elmaron	instead, the repo is available per http download	22:07
doener	Elmaron: so "git clone http://..."?	22:08
	← tlrobinson left	22:08
	← ivan left	22:08
Elmaron	doener: hmk	22:08
_Vi	Second question: "strace git fetch zenstable", (a bunch of messages), 'write(4, "0032have 6d9"', 'write(4, "0000"', then 'read(3, ' and it freezes.	22:08
doener	Elmaron: same thing, I just had to choose some uri-scheme	22:08
	s/uri-scheme/protocol/	22:08
_Vi	(It's not that mirror, it it's official location)	22:08
	doener needs to go to bed...	22:08
	← d0k left	22:09
	→ ivan joined	22:09
	squentin_ → Guest97518	22:09
doener	Elmaron: the idea is: recreate the repo, then replace the files. Instead of trying any kind of arcane magic ;-)	22:09
_Vi	Why this could happen? What should I do to update from remote repository?	22:09
	→ _Elias joined	22:09
Elmaron	doener: certainly a more safe way for my files x.x	22:10
	hm	22:10
	is there an easy way to run git sudo'ed as a specific user?	22:10
	(even when started just with "git")	22:10
	→ cxo joined	22:10
Elmaron	I'd like to sandbox it so it can never modify my files again	22:10
Grum	just dont ever use -f?	22:10
Elmaron	Grum: I bet there are other ways I haven't found yet to delete my files. I'm pretty good at that	22:11
	lamont` → lamont	22:11
Grum	yes .. rm .. no backups	22:11
cxo	Hey can someone show me how to figure out a merge conflict	22:11
	→ stamina_ joined	22:11
	→ bcardarella joined	22:11
	Guest97518 → squentin	22:12
	→ juan_arandaalvar joined	22:12
	← adamm left	22:13
doener	Elmaron: well, you could set the suid bit for the git executable... but that applies to everyone starting git, so think twice about the consequences...	22:13
Grum	just makign a backup and never using -f .. that works fine :)	22:13
	→ redbaritone joined	22:13
	→ qhoxie_ joined	22:13
	← kpreid_ left	22:13
	← redbaritone left	22:13
	→ kpreid__ joined	22:14
Ilari	cxo: Open files in text editor. There should be merge conflict markers.	22:14
Elmaron	doener: thanks :) that will work	22:14
cxo	Ilari, i just want to understand the syntax, thats all	22:15
Ilari	cxo: Merge conflict markers are <<<< ==== >>>>	22:15
cxo	<<<<< HEAD: file.txt	22:15
doener	Grum: hm, reset --hard, "git checkout [<commit>] -- <path>", git merge, git pull, git rm, git mv, git rebase, git <whatever>, ... ;-)	22:15
cxo	^^ is that the local file?	22:15
Ilari	cxo: First version starts, file.txt of revision HEAD	22:16
doener	Grum: also of those may touch the working tree (for valid reasons, of course)	22:16
Ilari	cxo: It is local side.	22:16
cxo	Ilari, ok	22:16
	← WebDragon left	22:16
Grum	lets put it at; make backups; read manual before you use something	22:16
doener	Grum: some people touch, others prefer to sit there and look :-D	22:17
	← jonmasters left	22:17
doener	s/look/watch/	22:17
	← hugoxrosa left	22:18
cxo	Ilari, thanks, now i get it	22:19
	← Mezner left	22:21
	← RickXy left	22:22
	← GMFlash left	22:22
	← qhoxie left	22:22
	qhoxie_ → qhoxie	22:22
	← ia left	22:24
	← threeve left	22:24
	← drubies left	22:24
	patcito__ → patcito	22:24
	→ ia joined	22:25
	← montylounge left	22:26
	→ agile joined	22:26
	Teo`` → Teo`	22:26
	← juan_arandaalva1 left	22:27
	← jmcantrell left	22:27
	→ AkumaStreak joined	22:28
	→ pklingem1 joined	22:28
	← doener left	22:29
	← mathepic left	22:29
	→ GMFlash_ joined	22:30
	← gdrage left	22:33
	← jsquared left	22:36
	← qhoxie left	22:36
	→ viiitor joined	22:40
	→ xnox joined	22:42
xnox	hello all =) is it possible to do git grep across all commit history	22:43
	I am searching for a function which was removed long time ago and I want to find it again	22:43
	← ctusar left	22:44
patrikf	xnox: depending on the size of your project, "git log -p" + search in your favorite pager might be the easiest solution	22:45
cxreg	git log -S"string" will show you when it was introduced, which might be what you want anyway	22:45
Adlai	xnox, try using gitk's search	22:45
	→ tom joined	22:46
tom	can anyone help me with this error when pulling: fatal: cannot read object 79b34c511d45e5a32361d1d9bbe1247bde62d9ad 'social': It is a submodule!	22:46
xnox	Thank you!	22:47
	I'll now use both -S and -p option	22:48
	← xnox left	22:48
	← cxo left	22:48
	→ CarlFK joined	22:48
	← neoeinstein left	22:48
cxreg	i missed your second statement, -S will show when it was removed as well as added	22:49
	→ segher joined	22:49
Elmaron	git commit seems to start vi	22:49
	how does it do that?	22:49
	→ djszapi joined	22:49
Elmaron	and where is that file I'm editing?	22:49
cxreg	Elmaron: it starts GIT_EDITOR unless you've specified -m	22:49
Elmaron	I have git running with the suid bit now and it seems vi is not affected by this	22:49
	→ neoeinstein joined	22:49
Elmaron	so vi is editing a file that is apparently read-only for it :p	22:49
cxreg	nice	22:50
	what OS?	22:50
Elmaron	archlinux	22:50
	→ johan-s joined	22:51
	→ psoo joined	22:51
	← suman left	22:52
	→ qhoxie joined	22:52
	→ aresnick joined	22:52
	← krawek left	22:53
	→ krawek joined	22:53
	← Tjh_ left	22:53
cxreg	well it looks like a standard fork/execvp	22:53
Elmaron	cxreg: more details needed?	22:53
cxreg	git version?	22:53
Elmaron	1.6.5.5	22:53
	ah hum	22:54
	where is git creating that file?	22:54
	← loincloth left	22:54
Elmaron	if it's on the hard disk it might be at a place where it has no write access	22:54
cxreg	the temp file?	22:54
	in builtin-commit.c	22:54
Elmaron	yea	22:54
	← Sigma left	22:54
Elmaron	no, place on hard disk	22:54
	is it creating that file inside /tmp or inside the repository's main dir or somewhere else?	22:54
	→ loincloth joined	22:54
	← loincloth left	22:55
tom	$ git rm -rf social	22:56
	rm 'social'	22:56
	fatal: git-rm: social: Is a directory	22:56
	how can i remove this?	22:56
	the problem is that git submodule add .... social says "'social' already exists in the index"	22:57
johnny	git rm -r	22:57
Elmaron	hm	22:58
	is it creating that file in /tmp?	22:58
	-it +git	22:58
cxreg	from what i can tell, it's in .git	22:59
	looks like .git/COMMIT_EDITMSG	22:59
Elmaron	then vi has to be running with the bash user's rights because git definitely has write access in there but the bash user definitely has not	22:59
	← pklingem1 left	23:00
	← Overcyn left	23:01
	cxreg hasnt tried git with suid	23:01
patrikf	why would you setuid git, anyway?	23:01
	→ timcharper joined	23:01
	← viiitor left	23:01
patrikf	sounds like a nice way to give potential atteckers root access right away	23:01
johnny	i'd like to be able to cycle over some directories and git pull..	23:01
	for websites	23:02
	gonna have to be root somewhere..	23:02
	unless cpanel used some more decent acl structure.. :(	23:02
timcharper	hello, how do I test if a commit is an ancestor of another commit? (would prefer not to do (git rev-list \| egrep ^$commit). I've tried a few different things, not getting :S	23:02
	→ pingveno joined	23:02
	→ Octalot joined	23:02
	→ eletuchy joined	23:02
	→ pheaver joined	23:02
	→ bigmack83 joined	23:02
	→ spearce joined	23:02
	→ kusma_ joined	23:02
	→ tmz joined	23:02
	→ jjuran joined	23:02
	→ bauruine joined	23:02
	→ justin-george joined	23:02
	→ brizly joined	23:02
	→ hummingkid joined	23:02
	→ anno^da joined	23:02
	→ jlilly joined	23:02
	→ halfline joined	23:02
	→ Haarg joined	23:02
	→ cantoma joined	23:02
timcharper	how does (git branch --contains) do it?	23:03
cxreg	patrikf: well, setuid != setuid root	23:03
	he wasn't clear which user was being swiched to	23:03
patrikf	still sounds like a bad idea	23:03
cxreg	i'm not debating that :-)	23:03
patrikf	(if not for privilege escalation, then for breaking git for everyone)	23:04
	pheaver → Guest27633	23:04
	→ imajes joined	23:05
	← kpreid__ left	23:07
	→ kpreid_ joined	23:07
	→ mattweg_ joined	23:07
thiago_home	timcharper: if a commit $a is ancestor of commit $b, there is a path from b to a	23:07
	← Ryback_ left	23:08
thiago_home	remember that Git is a Directed Acyclic Graph	23:08
	← smotchkkiss left	23:08
timcharper	thiago_home: thank you for engaging. I know about the DAG. Trouble is, if $a is not an ancestor of $b, there still is a path between them via their divergence point	23:08
thiago_home	so if $a is an ancestor of $b, if you do git log $b..%a, the result will be empty	23:09
timcharper	(which both .. and ... use)	23:09
thiago_home	the .. operation is subtraction. So there's nothing in $a that isn't in $b	23:09
timcharper	oh, duh... thank you	23:10
	→ dgarr joined	23:10
	← GMFlash_ left	23:11
ndim	Gnah. New repo, for commits in a single branch. Now I want to "git rebase -i" the commits such that the latest commit is integrated into the initial commit. Is that possible, and how?	23:12
	← tstclair left	23:12
thiago_home	there's a mode for rebase to rebase the root commit.	23:12
	take a look at the man page.	23:12
	← joeytwiddle left	23:12
	→ botanicus_ joined	23:13
	← botanicus left	23:13
	← mattweg left	23:13
	mattweg_ → mattweg	23:13
timcharper	thiago_home: here's what I was trying to accomplish. thanks again for the help... perhaps I need more sleep as my thinker isn't working optimally. http://gist.github.com/254592	23:13
	← brendon_work left	23:13
ndim	thiago_home: Ah. "root" is the keyword to look for. Thanks!	23:13
	→ joeytwiddle joined	23:13
	botanicus_ → botanicus	23:13
	← WinterWeaver left	23:13
	← malumalu left	23:13
	← joeytwiddle left	23:13
	← MrGando left	23:14
	→ joeytwiddle joined	23:14
	→ MrGando joined	23:14
thiago_home	timcharper: instead of 'cat .git/HEAD', use git symbolic-ref HEAD	23:14
timcharper	oh, that's a much better way. thanks	23:15
thiago_home	also, you don't need to use awk to split the line	23:15
	if you do "read var1 var2", then the shell splits on the space	23:15
	← _Elias left	23:16
thiago_home	you can also improve the efficiency of the rev-list by adding the -1 switch	23:16
	you don't need to know all commits. All you need to know is if it's empty or not. So one commit is enough to know it isn't empty.	23:17
	→ ngw joined	23:17
	thiago_home didn't know the @{now} trick	23:18
thiago_home	finally I know how to get the dates off the reflog	23:18
timcharper	thiago_home: very nice - it doesn't seem to help performance noticeably, but maybe in larger repos it would be noticeable.	23:18
	:)	23:18
	I'm trying the read trick... do you pipe the line into read ?	23:19
	"echo ref big-description \| read a b && echo $a" yields blank	23:19
thiago_home	$ echo ref big-description \| read a b && echo $a	23:20
	ref	23:20
	I meant:	23:20
	git reflog show $branch@{now} \| while read ref rest; do [...] done	23:20
tom	ok guys i am stuck with this error when pulling, who can help me? fatal: cannot read object deca4999ed893ee169a1280101d045e1178f0d7e 'social': It is a submodule!	23:20
	→ babilen joined	23:20
	← Turias left	23:20
thiago_home	the line is "$ref $rest"	23:20
timcharper	tom - did somebody convert a path in your git repository ? (i've seen that error before)	23:20
	→ eugo joined	23:21
tom	timcharper: we didn't change any paths...	23:21
timcharper	thiago_home: that read trick is totally phat. I never knew you could do two vars. I'm going to go remove a ton of awk calls in my bash scripts now :)	23:22
thiago_home	timcharper: this trick is saving you two forks	23:22
	one for echo and one for awk	23:22
	← bantic left	23:22
ndim	And with "read a b restofline" you can even skip any trailing stuff on the line.	23:22
Wolfman2000	Afternoon/evening. I just merged two branches together, and I think I've hit the point where I should tag this part. Should I tag what I have before I push it back to the server?	23:22
thiago_home	if you want another hint (not for your current script): don't use grep for comparisons	23:23
	if you can, use case	23:23
	→ joce joined	23:23
Thell	hey guys. got a repo management question for you.	23:23
thiago_home	i.e., replace something like: if echo "$var" \| grep -q / 2>/dev/null; then	23:23
tom	timcharper: it doesn't even matter if i have a .gitmodules file or not, it just throws that error	23:24
thiago_home	with: case "$var" in /) true ;; *) false ;; esac	23:24
timcharper	thiago_home: that's rocking, thank you	23:24
	tom: yeah, that error wouldn't have anything to do with .gitmodules i don't think	23:24
Thell	Merging in a long running upstream branch, we are quite behind on. We have the option of merging in 'per commit' from that branch, per commit group (logical incremental blocks) or one big merge	23:24
thiago_home	shell scripts can be quite fast, if you avoid the forking. The more you keep inside the shell itself, the faster it will run.	23:24
tom	timcharper: well it's about submodules..	23:24
Thell	The one big merge option is nixed out already... that'd be bad	23:25
	← Yuuhi` left	23:25
Thell	But would it be just as bad to git merge each individial commit?	23:25
timcharper	I have two theories: 1) somebody committed a submodule revision change in the superproject, but didn't push the submodule, meaning your superproject references it, but git has no way to pull the change	23:25
	ok... no that would fail if you did "git submodule update"	23:26
	sorry	23:26
	2) you have a path that was / is a submodule. Somebody removed the submodule and replaced it with a path, or someone removed the path and replaced it with a submodule	23:26
Thell	I guess if we git co -b merge_intermediate master && then git merge each individual commit && git co master && git merge --log --no-ff it should be fairly clean in the end, yes?	23:26
timcharper	those issues are a mess to sort out	23:26
	← psoo left	23:26
tom	timcharper: it's still the same submodule from github on both source and destination of the pull	23:27
timcharper	tom: OK - this happens after you invoke "git pull", right?	23:27
	it's not happening when it's attempting to update your submodules ?	23:27
tom	timcharper: yes, during git pull	23:27
	← brizly left	23:28
timcharper	you don't have a git hook setup to automatically run "git submodule update" ?	23:28
tom	timcharper: no	23:28
timcharper	ok	23:28
	what is the submodule path ?	23:28
tom	timcharper: i can do git submodule update without errors	23:28
timcharper	(in your super project)	23:28
	yeah... I'm sure you can	23:29
tom	timcharper: it's the "social" directory	23:29
timcharper	ok, as in ./social and not ./vendor/social ?	23:29
tom	as in ./social	23:29
timcharper	ok	23:29
	run git show ./social	23:29
tom	timcharper: no output	23:29
	maybe i removed it during trying to pull, i can try in another dir...	23:30
timcharper	that's one idea	23:31
	ok, what does this do ?	23:31
	git ls-tree --full-tree -r HEAD ./social	23:31
tom	-Subproject commit 89476bce1c6e090e797197d2d19a91cc9bdf5139	23:31
	+Subproject commit 79b34c511d45e5a32361d1d9bbe1247bde62d9ad	23:31
	(that's part of git show ./social)	23:31
timcharper	ok, so the ls-tree command, the first portion is 160000, right ?	23:31
tom	ls-tree prints out usage	23:32
timcharper	oh... what version git ?	23:32
	→ D[a]vey joined	23:32
tom	1.5.6.5	23:32
timcharper	you're running old, son!	23:32
	param must've been added in 1.6.x	23:33
	git ls-tree --full-tree -r HEAD \| grep ./social	23:33
tom	i know that's crappy debian	23:33
timcharper	that work ?	23:33
tom	there's no --full-tree	23:33
timcharper	lame	23:33
	→ Tjh_ joined	23:34
timcharper	ok... git ls-files --stage \| grep social	23:34
tom	160000 deca4999ed893ee169a1280101d045e1178f0d7e 0 social	23:34
timcharper	there we go	23:34
Tjh_	hey i wanted to fork soemthing the best way to do it to have a remote branch? or create a local branch named "upstream" ??	23:34
tom	means what?	23:34
Elmaron	error: failed to push some refs to 'ssh://mainrepo@server.com/www-data/.git' To prevent you from losing history, non-fast-forward updates were rejected	23:34
	← MrGando left	23:35
timcharper	it's definitely a submodule currently	23:35
	now..	23:35
	what's the remote branch name you're trying to pull ?	23:36
	run `git fetch` and make sure it's up-to-date	23:36
	← carpet_the_walls left	23:36
	← ntoll left	23:36
tom	timcharper: i am pulling from another directory	23:36
	shall i do "git fetch" there?	23:36
timcharper	can you add it as a remote?	23:37
	git remote add otherdir ../myotherdir/.git	23:37
	← fcuk112 left	23:37
	→ WinterWeaver joined	23:38
	← TeckniX left	23:38
tom	timcharper: ok	23:38
	→ ab3 joined	23:38
tom	did git fetch	23:38
	→ fcuk112 joined	23:38
timcharper	ok, so you have a remote branch now ?	23:39
	what is it called ?	23:39
tom	* [new branch] master -> other/master	23:39
timcharper	excellent	23:39
Tjh_	also how do ignore a file?	23:39
timcharper	and git merge other/master fails, right ?	23:39
thiago_home	Tjh_: add it to the .gitignore file	23:39
timcharper	Tjh_: git help gitignore	23:39
tom	timcharper: yes, 'social': It is a submodule	23:40
timcharper	ok	23:40
Tjh_	timcharper: k ty	23:40
timcharper	git ls-tree -r other/master ./social	23:40
tom	timcharper: empty	23:40
timcharper	hmmmm	23:40
tom	(no output)	23:40
	→ fcuk112__ joined	23:41
timcharper	git log -p HEAD..other/master ./social	23:41
	→ aresnick_ joined	23:41
	← urbanmonk left	23:41
Tjh_	if i have a remote branch tracking something is there a real need to make a local branch that pulls from the remote too?	23:41
	← bcardarella left	23:41
	→ patmaddox joined	23:41
tom	timcharper: this shows some commit with the code	23:42
timcharper	(it looks as if the submodule was removed... but not sure why it's causing an error for you)	23:42
	ah hah!	23:42
	there you have it	23:42
	that is what is causing the error	23:42
	somebody added code when git used to have a submodule	23:42
	try renaming social and then doing a merge	23:42
	(that is a big pitfall in git... i've hit it before and it stinks, especially when there's 20 developers who are all stuck because of it)	23:43
tom	timcharper: fatal: source directory is empty, source=social, destination=social2	23:43
	that's on git mv social social2	23:43
timcharper	ok, ^git ^	23:43
thiago_home	call it "antisocial"	23:44
tom	?	23:44
thiago_home	:-)	23:44
MrUnleaded	can anyone explain how to fix this https://gist.github.com/f60037ebe2aa5f95701d i added a graft then pushed and now no one can fetch from the repo	23:44
tom	;)	23:44
thiago_home	MrUnleaded: because of the graft	23:44
timcharper	tom: it's a bash history trick, sorry. Remove "git "	23:44
thiago_home	MrUnleaded: to "fix" it, scp your pack to the remote repository	23:44
	MrUnleaded: pushing with grafts enabled can cause that problem	23:44
	MrUnleaded: did you get an error message about sideband multiplexer?	23:44
MrUnleaded	thiago_home: yes	23:45
tom	timcharper: ok, and then merge again says "It is a submodule"	23:45
thiago_home	it's what I thought	23:45
	just upload your pack to the repository	23:45
MrUnleaded	i dont think i can scp it is github	23:45
timcharper	how annoying. can you just reset --hard to it?	23:45
thiago_home	you can push -f to a revision that worked	23:45
timcharper	(do you need to merge or just catch your repo up ? )	23:46
thiago_home	then remove your graft, and push again	23:46
	← aresnick left	23:47
MrUnleaded	will that push the grafted history as well?	23:47
thiago_home	no	23:47
	grafts aren't pushed	23:47
	that's exactly why you're facing this problem now	23:47
MrUnleaded	how can i make the graft "real"	23:47
timcharper	tom: (git reset --hard other/master) <- that will wipe your uncommitted changes and force your branch to be a given revision	23:47
thiago_home	MrUnleaded: git filter-base	23:47
	MrUnleaded: without arguments, it'll simply make grafts permanent	23:48
	MrUnleaded: note that this changes the SHA-1 of everything past the graft.	23:48
timcharper	thiago_home: I'm starting to be glad I never learned grafts	23:48
MrUnleaded	filter base? hrm i read(or misread) that filter-branch did that	23:48
thiago_home	MrUnleaded: so you need to push -f and everyone else needs to reset. They can't pull or rebase.	23:48
MrUnleaded	thiago_home: ok thank you	23:48
thiago_home	MrUnleaded: sorry, filter-branch	23:48
timcharper	tom: best of luck buddy. sorry, I gotta get back to what I was doing	23:48
MrUnleaded	i tried filter-branch but it didnt change the refs	23:49
tom	timcharper: hm. ok, thanks for your help anyway	23:49
	timcharper: one quick question	23:49
MrUnleaded	thiago_home: it is only me at this point in the repo	23:49
tom	timcharper: do i have to have .gitmodules in the repos committed?	23:49
	timcharper: when using submodules in general	23:49
timcharper	yes	23:49
thiago_home	MrUnleaded: you probably need to tell filter-branch which branches to filter	23:49
	MrUnleaded: you don't need to tell it any other filters to apply	23:50
timcharper	tom: it tells git the URL where to fetch submodules from, as only the revision is stored in the git object system	23:50
	(tree system? not sure what the name for it is)	23:50
tom	timcharper: it could be that i had submodule social and I added "social/somefile" but it wasn't in the submodule but in the main repository in social/somefile :\|	23:50
MrUnleaded	thiago_home: oh ok i think i may have had a similar problem before when filter-branch wasnt doing anything	23:50
tom	it stinks, i think i'll just remove all submodules	23:50
thiago_home	MrUnleaded: if you've run filter-branch once, you may have to rm -rf .git/refs/original	23:50
tom	and start over with one repos	23:51
timcharper	tom: I seem to remember 'git add my/submodule/' used to add the files, rather than the revision	23:51
	you had to be careful about the trailing slash	23:51
	it's no longer the case with latest version of git	23:51
MrUnleaded	thiago_home: ok	23:51
timcharper	ok... chau chau	23:51
tom	timcharper: bye, thanks	23:51
	→ archis joined	23:52
	→ aresnick joined	23:52
	← fcuk112_ left	23:52
	← WinterWeaver left	23:58

Logs Search ←Prev date Next date→

Channels Documentation