IRCloggy #git 2018-05-25

Provider of IRC logs since 2005.

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

	2018-05-25
Zarthus	probably a for loop on `git branch --remote`	00:00
rafasc	clone already does that by default	00:00
	← rafasc left	00:03
	→ maroloccio joined	00:05
	← nitric_ left	00:06
ajf-	I cherry-picked a bunch of commits that master had differently from develop (which I got using git log master ^develop) into a new branch named develop-cp based off develop	00:07
	← Puffball left	00:07
ajf-	and now doing git log master ^develop-cp shows the same differences, when it should not since I cherry-picked those commits	00:07
	I can see that the SHAs resulting from those cherry-picks are different than the originals, maybe because they had conflicts?	00:07
	← Onionnion left	00:08
	→ thiago joined	00:09
	← fassl left	00:09
	← afuentes left	00:10
medfly	thanks. I started with a partial clone which was probably the reason things were weird for me. Fetching the rest.	00:10
	← ProCycle left	00:11
	→ banisterfiend joined	00:11
	← tmsmith left	00:11
	← Narrat left	00:12
	← BallChang-CN left	00:14
	← pR0Ps left	00:14
	← shabius left	00:16
	← dreiss left	00:16
	← beginnertest left	00:16
	→ pR0Ps joined	00:17
	← lilherc left	00:18
	→ shabius joined	00:19
	← dviola left	00:19
	← Oatmeal left	00:20
	← m0viefreak left	00:22
	→ venmx joined	00:23
	→ zizzfizzix joined	00:23
	← zizzfizzix left	00:23
	→ zizzfizzix joined	00:23
	→ jessica523 joined	00:23
	← jessica523 left	00:23
	← DaGoaty left	00:25
	→ Nizumzen joined	00:26
	→ SwiftMatt joined	00:27
	← zizzfizzix left	00:28
	→ zizzfizzix joined	00:28
	← zizzfizzix left	00:28
	→ zizzfizzix joined	00:28
	← zizzfizzix left	00:29
	→ Guest91580 joined	00:29
	← akushner left	00:29
	← cagomez left	00:29
	→ cagomez joined	00:30
	← hugobrendow left	00:30
	→ hugobrendow joined	00:31
	→ orbyt_ joined	00:32
	← cagomez left	00:34
	→ JonnyAt joined	00:34
	← venmx left	00:35
	→ pity joined	00:36
	← maroloccio left	00:37
	← vdamewood left	00:41
	→ lf94 joined	00:42
	→ BallChang-CN joined	00:43
	← linuxmodder- left	00:48
	→ xmbq joined	00:49
	→ dviola joined	00:52
	→ venmx joined	00:57
	← medfly left	01:01
	← agowa338 left	01:01
	← bork left	01:03
	→ bork joined	01:04
	← tre99 left	01:05
	← dviola left	01:08
	→ dviola joined	01:08
	← tvw left	01:09
	→ dendazen joined	01:10
	← robattila256 left	01:11
	← Sasazuka left	01:11
	→ fission6 joined	01:12
	← frobnic left	01:12
	→ frobnic joined	01:12
	→ tre99 joined	01:12
	← lf94 left	01:13
	← Guest81203 left	01:14
	→ nbmc joined	01:14
	→ Milos joined	01:15
	← nbmc left	01:18
	→ nbmc joined	01:18
	→ Puffball joined	01:18
	→ finalbeta joined	01:22
	→ igemnace joined	01:26
	→ vdamewood joined	01:28
	← _xor left	01:31
	→ Lyqyd joined	01:32
	→ rivalomega joined	01:35
	← craftyguy left	01:36
	→ craftyguy joined	01:36
	← SwiftMatt left	01:37
	← venmx left	01:37
	← rivalomega left	01:39
	← fission6 left	01:41
	← vdamewood left	01:43
	← mel00010 left	01:43
	→ goweol joined	01:44
	← ilbot3 left	01:45
	→ ferdna joined	01:46
	→ doubtful joined	01:47
	← Puffball left	01:50
	→ _xor joined	01:55
	← Praxi left	01:55
	→ ilbot3 joined	01:57
	→ andyhuzhill joined	01:57
	← nutron left	02:04
	← al-damiri left	02:05
	→ nutron joined	02:07
	→ Goplat joined	02:09
	← sentriz left	02:12
	→ sentriz joined	02:12
	← _28_ria left	02:17
	→ nurdie joined	02:17
	← j416 left	02:19
	← crmne left	02:21
	→ crmne joined	02:22
	← Nizumzen left	02:22
	← kneeki left	02:23
	→ Nizumzen joined	02:23
	← nurdie left	02:23
	→ mizu_no_oto joined	02:25
	→ zlsyx joined	02:26
	← RougeR left	02:26
	← durham left	02:27
	← drodger left	02:33
	→ lagothri1 joined	02:35
	→ j416 joined	02:37
	← lagothrix left	02:37
	← zlsyx left	02:39
	→ drodger joined	02:39
	→ zulutango joined	02:39
	← mizu_no_oto left	02:39
	→ Bobguy joined	02:40
	← aidalgol left	02:41
	← Bobdude left	02:44
	→ YuGiOhJCJ joined	02:45
	→ mud joined	02:50
	→ jessica523 joined	02:51
	← pR0Ps left	02:51
	→ aidalgol joined	02:52
	→ pR0Ps joined	02:53
	← Guest21082 left	02:54
	→ mizu_no_oto joined	02:59
	→ arahael joined	03:02
	← gordonfish left	03:03
	← mizu_no_oto left	03:03
	→ nurdie joined	03:03
	→ _28_ria joined	03:07
	← m00sehead left	03:09
	← jcarpenter2 left	03:10
	← thiago left	03:11
	← _28_ria left	03:12
	← arahael left	03:13
	→ arahael joined	03:13
	→ howdoi joined	03:15
	← oojacoboo left	03:22
	→ oojacoboo joined	03:22
	← _Patrick_ left	03:24
	→ _Patrick_ joined	03:29
	→ lf94 joined	03:33
	→ cagomez joined	03:33
	← orbyt_ left	03:33
	← Nizumzen left	03:39
	→ orbyt_ joined	03:40
	→ preyalone joined	03:41
	→ jcarpenter2 joined	03:42
	← Mattiaslndstrm left	03:43
	→ Gurkenglas joined	03:47
	← tre99 left	03:51
	← \void left	03:55
	← lf94 left	03:56
	→ lf94 joined	03:57
	→ tre99 joined	03:58
	→ \void joined	03:59
	→ ZyX-I joined	03:59
	← bjsnider left	04:03
	← Gurkenglas left	04:03
	→ Raging_Hog joined	04:03
	← nuka-cola_ left	04:04
	→ mikemcowie joined	04:04
	← cagomez left	04:11
	← mad_hatter left	04:12
	→ rkazak joined	04:13
	← orbyt_ left	04:13
	← mud left	04:17
	← mikemcowie left	04:17
	→ dreiss joined	04:18
	← fr33domlover left	04:21
	← ajf- left	04:22
	← johnny56 left	04:22
	→ johnny56_ joined	04:22
	← dreiss left	04:24
	← doubtful left	04:24
	→ doubtful joined	04:25
	→ pnepe6 joined	04:25
	← dendazen left	04:26
	← amirpro left	04:27
	→ Nizumzen joined	04:32
	← doug16k left	04:32
	→ thiago joined	04:34
	→ linuxmodder- joined	04:37
	← doubtful left	04:37
	← linuxmodder- left	04:37
	→ linuxmodder- joined	04:38
	← linuxmodder- left	04:39
	→ linuxmodder- joined	04:39
	→ doubtful joined	04:40
	← doubtful left	04:40
	← linuxmodder- left	04:40
	→ linuxmodder- joined	04:41
	← linuxmodder- left	04:41
	→ linuxmodder- joined	04:42
	→ cramalho joined	04:44
	→ mad_hatter joined	04:45
	→ doug16k joined	04:46
	→ pabs3 joined	04:46
pabs3	I accidentally did a `git reset --hard @` after a `git stash pop`. is there any way to get that git stash restored?	04:47
grawity	scroll up to where it shows "Dropped refs/stash@{0} (some commit hash here)"	04:48
_ikke_	pabs3: git stash pop should show you the hash	04:48
grawity	run `git stash store $HASH`	04:48
	→ justrohu joined	04:48
	→ keepLearning512 joined	04:48
justrohu	Hello I have a query regarding tags	04:49
	→ muelleme joined	04:49
justrohu	I have a master and development branch	04:49
	→ pally joined	04:50
	→ freimatz joined	04:51
justrohu	I have applied tag to a commit on master branch ... now after more additions I want to view code which I have tagged how do i do this	04:51
	please help	04:51
_ikke_	git show <tag>	04:52
	for example	04:52
pabs3	bummer, the tree from my stash has been lost: fatal: unable to read tree 2014e0c6cda108c735ccf10d214b495ba865bdbc	04:53
_ikke_	Hmm, odd	04:54
justrohu	_ikke_, thank you	04:54
	← thiago left	04:54
_ikke_	pabs3: I wouldn't expect that so soon	04:55
	→ TheRuckus joined	04:55
justrohu	What is Tag is used for	04:55
_ikke_	justrohu: It's to give certain commits a specific name, mostly used to tag versions	04:56
justrohu	clear	04:57
	thank you	04:57
	→ rivalomega joined	04:58
	→ jungsubk joined	05:02
	← keepLearning512 left	05:05
	← muelleme left	05:06
	→ keepLearning512 joined	05:06
	← jimmyrcom left	05:07
arahael	pabs3: Is it in the reflog? If it's there, it really shouldn't have been lost so soon.	05:07
	← jungsubk left	05:08
pabs3	doesn't look like it	05:08
	anyway, restored from a backup	05:08
	← Guest49611 left	05:14
	→ crtcji joined	05:16
	← keepLearning512 left	05:16
	← pally left	05:18
	← rivalomega left	05:18
	→ rivalomega joined	05:18
	→ gordonfish joined	05:18
	← djh_ left	05:19
	→ pally joined	05:20
	→ ArcaTech joined	05:21
	← TheRuckus left	05:21
	→ dimi1947 joined	05:23
	→ sauvin joined	05:24
	← pabs3 left	05:24
	← crtcji left	05:27
	→ Worldexe joined	05:30
	← igemnace left	05:32
	← rkazak left	05:32
	→ crtcji joined	05:35
	→ KeyJoo joined	05:38
	→ pfleck joined	05:38
	← KeyJoo left	05:38
	→ KeyJoo joined	05:39
	← crtcji left	05:40
	→ dre_ joined	05:40
	← sleepingforest left	05:40
	← phinxy left	05:42
	→ subhojit777 joined	05:45
	→ mohabaks joined	05:48
	← freimatz left	05:50
	← pfleck left	05:51
	→ pfleck joined	05:59
	← preyalone left	06:01
	→ muelleme joined	06:02
	→ darkcodi joined	06:02
	← darkcodi left	06:03
	← Lyqyd left	06:03
	→ darkcodi joined	06:04
	← muelleme left	06:07
	→ keepLearning512 joined	06:09
	→ jntme joined	06:09
	→ muelleme joined	06:10
	→ chele joined	06:11
	← inovas left	06:11
	← YuGiOhJCJ left	06:15
	→ inovas joined	06:17
	← darkcodi left	06:19
	← pfleck left	06:20
	→ schleppel joined	06:23
	← keepLearning512 left	06:23
	→ tarkus joined	06:24
	→ JeroenT joined	06:26
	← muelleme left	06:27
	← Bobguy left	06:28
	→ pfleck joined	06:30
	→ dreiss joined	06:31
	→ abba joined	06:32
	→ eduardas_m joined	06:32
	→ RougeR joined	06:36
	← sz0 left	06:36
	← Worldexe left	06:37
	← mohabaks left	06:39
	← linuxmodder- left	06:39
	← JimmyRcom_ left	06:40
	→ Tobbi joined	06:41
	← veegee left	06:43
	← pally left	06:45
	→ l3dx joined	06:48
	← subhojit777 left	06:49
	← ewitz left	06:49
	→ testuser joined	06:50
	→ ewitz joined	06:50
	→ john-34 joined	06:52
	← nurdie left	06:54
	→ JimmyRcom_ joined	06:56
	Guest8084 → Cork	06:57
	→ g00s joined	07:01
	← JimmyRcom_ left	07:01
	→ pally joined	07:01
	← Raging_Hog left	07:03
	→ Raging_Hog joined	07:03
	→ tvw joined	07:04
	← ferdna left	07:06
	→ Phylock joined	07:08
	→ mel00010 joined	07:08
	→ dege joined	07:08
	← jessica523 left	07:10
	→ amirpro joined	07:12
	→ MaliusArth joined	07:13
	← dreiss left	07:13
	← Wulfe813 left	07:13
	→ jessica523 joined	07:13
	← \void left	07:14
	→ oxymoron93 joined	07:15
	→ Tobbi_ joined	07:16
	← luckman212 left	07:18
	← pally left	07:19
	← jntme left	07:19
	→ pally joined	07:20
	← pally left	07:20
	→ charolastra joined	07:22
	← Guest55350 left	07:23
	→ muelleme joined	07:23
	→ keepLearning512 joined	07:24
	→ jntme joined	07:24
	← rivalomega left	07:25
	→ luckman212 joined	07:25
	← ArcaTech left	07:27
	→ djh joined	07:28
	← muelleme left	07:28
	← Nizumzen left	07:30
	← duderonomy left	07:31
	→ Neo4 joined	07:35
	→ mikemcowie joined	07:36
	→ texinwien_ joined	07:36
	← pfleck left	07:37
	← texinwien left	07:40
	← amirpro left	07:44
	→ amirpro joined	07:44
	← dviola left	07:45
	→ DaGoaty joined	07:47
	← dre_ left	07:48
	← amirpro left	07:48
	→ choice joined	07:48
choice	Hello! Can I tell git to pull a file from the working dir that is not tracked?	07:49
	→ amirpro joined	07:49
choice	Otherwise I will just scp it.	07:49
	← tarkus left	07:50
osse	pull from the working dir of where?	07:50
choice	Of the origin.	07:50
osse	no	07:50
	→ PEG joined	07:50
choice	Ok, using scp then.	07:51
	→ tarkus joined	07:53
osse	a file that is not tracked can neither be pushed nor pulled	07:53
	because you don't really push/pull files, you push commits	07:53
choice	True. But git might have had some convinience function 'copyfilefromremoteworkingdir'.	07:54
	→ mosab joined	07:55
_ikke_	nope	07:59
	git is not a file synchornization tool :-)	07:59
	even though people tend to treat it as one	07:59
	→ floppydh joined	08:03
	← jntme left	08:04
cbreak	choice: if it's not committed, it's probably not ready to be transfered yet	08:06
	→ mosab_ joined	08:07
cbreak	especially if it's untracked	08:07
choice	It's untracked because it's the config file. I just wanted a copy of the config file so I can edit it to my local needs.	08:07
	So I fetched it via scp now.	08:08
cbreak	choice: usually, config file templates are either created by the program when you first start it	08:09
	or they are committed as explicit template file with documentation on how to customize it	08:09
	← mosab left	08:09
	mosab_ → mosab	08:09
	→ skisela joined	08:09
choice	Yeah, there is a config template. But I wanted to use the config of a specific machine because its very similar to my local machine.	08:10
	← Tobbi_ left	08:10
	→ Tobbi_ joined	08:11
	→ pfleck joined	08:12
	← DaGoaty left	08:14
	← JeroenT left	08:19
	→ duderonomy joined	08:19
	→ phinxy joined	08:20
	→ jntme joined	08:21
	← Guest41156 left	08:23
	→ muelleme joined	08:24
	→ JeroenT joined	08:24
	← JeroenT left	08:25
	← pfleck left	08:26
	→ dreiss joined	08:27
	← KeyJoo left	08:28
	← muelleme left	08:29
	→ duderono_ joined	08:30
	→ manuelschneid3r joined	08:30
	← duderonomy left	08:31
	→ igemnace joined	08:31
	→ ustekne joined	08:32
	← choice left	08:34
	← igemnace left	08:38
	→ igemnace joined	08:38
	→ wandering_vagran joined	08:38
	← keepLearning512 left	08:38
	← igemnace left	08:38
	→ igemnace joined	08:39
	→ keepLearning512 joined	08:40
	← tarkus left	08:40
	→ dre_ joined	08:42
	→ tarkus joined	08:43
	← _rgn left	08:49
	→ _rgn joined	08:49
	→ RichiH joined	08:52
	← antfoo left	08:54
	← arecaceae left	08:54
	→ pfleck joined	08:54
	→ arecaceae joined	08:55
	→ JeroenT joined	08:56
	← keepLearning512 left	08:56
	→ keepLearning512 joined	08:58
	→ doev joined	08:59
	← pfleck left	08:59
	→ _ADN_ joined	09:00
	← dhollinger left	09:00
	→ rfuentess joined	09:00
	→ dhollinger joined	09:01
	→ venmx joined	09:01
	← BallChang-CN left	09:01
	← keepLearning512 left	09:03
	← JeroenT left	09:04
	← dege left	09:05
	← doug16k left	09:07
	← rfuentess left	09:09
	← goweol left	09:10
	→ JeroenT joined	09:12
	→ afuentes joined	09:14
	← dreiss left	09:15
	← g00s left	09:16
	→ antfoo joined	09:16
	→ theoceaniscool joined	09:18
	→ rfuentess joined	09:18
	← igemnace left	09:20
	← dpyro left	09:20
	→ doug16k joined	09:20
	← doug16k left	09:20
	→ Naq joined	09:21
	→ doug16k joined	09:21
	→ keepLearning512 joined	09:21
	← Naq left	09:21
	→ raven-au joined	09:22
	← ustekne left	09:22
	→ pfleck joined	09:24
	→ rivalomega joined	09:25
	→ luke_penn joined	09:26
	← energizer left	09:26
	← luke_penn left	09:26
	→ BallChang-CN joined	09:28
	← pfleck left	09:28
	← rivalomega left	09:30
	← ZyX-I left	09:30
	← RougeR left	09:31
	→ ocds joined	09:31
	← andyhuzhill left	09:35
	← catsup left	09:36
	→ catsup joined	09:36
	← duderono_ left	09:37
	← Goplat left	09:37
	← catsup left	09:37
	→ duderonomy joined	09:37
	← raven-au left	09:37
	→ catsup joined	09:37
	← beerdrop left	09:38
	→ raven-au joined	09:39
	← justrohu left	09:40
	← jntme left	09:41
	← tarkus left	09:41
	← raven-au left	09:41
	→ jntme joined	09:41
	keep_learning → keep_away	09:42
	→ raven-au joined	09:43
	→ thebloggu joined	09:44
	→ ronskisika joined	09:45
	← Raging_Hog left	09:45
	← duderonomy left	09:45
	← jntme left	09:46
	→ duderonomy joined	09:47
	← fatalhalt left	09:48
	← mel00010 left	09:49
	→ leeN joined	09:50
	→ mel00010 joined	09:51
	→ mosab_ joined	09:51
	→ beerdrop joined	09:53
	→ justrohu joined	09:53
	← mosab left	09:54
	mosab_ → mosab	09:54
	→ keepLear_ joined	09:54
	← keepLearning512 left	09:55
	← pity left	09:56
	→ tarkus joined	09:57
	→ Gurkenglas joined	09:58
	← jessica523 left	09:59
	← lankanmon left	10:01
	→ keepLearning512 joined	10:05
	→ MarioBranco joined	10:05
	← keepLear_ left	10:05
	→ tmsmith joined	10:06
	← thebloggu left	10:07
	← Kaisyu left	10:10
	→ shady_traveller joined	10:14
	← Tobbi_ left	10:15
	→ rafasc joined	10:17
	← beerdrop left	10:18
	← tmsmith left	10:21
	→ JellybeanCantrel joined	10:21
	← JellybeanCantrel left	10:21
	→ linuxmodder joined	10:21
	→ Mike11 joined	10:23
	→ plexigras joined	10:24
	→ smallville7123 joined	10:24
	← inovas left	10:27
	→ camsbury joined	10:27
	← dimi1947 left	10:29
	→ kes joined	10:30
pix9	hey folks how get list of commit hash, commited after certain commit ( need this to validate commit hash for given commit")	10:30
	← exotime left	10:30
	← camsbury left	10:31
	→ cousteau joined	10:33
	← ghost43 left	10:33
osse	pix9: after where? In all possible branches ?	10:33
	→ inovas joined	10:33
pix9	hmm	10:33
	scenarios is I am creating script to push the code to prod	10:34
	← duderonomy left	10:34
	→ ghost43 joined	10:34
pix9	here I am trying to verify ig the given commit hash is valid or not	10:34
cousteau	so let me get this right. `git checkout <paths...>` changes the tree but doesn't switch branch, and `git checkout branch` with no paths or --patch switches branch but does not modify the tree?	10:34
	or modifies the tree but not the edited files?	10:34
pix9	at same time I don't want some one to revert the code to told commit	10:34
osse	pix9: git rev-parse --verify {hash}	10:34
	→ m00sehead joined	10:35
pix9	osse will this ensure that hash is not the olde that what is current in production?	10:35
	→ beerdrop joined	10:35
osse	pix9: no it will just make sure it's a valid commit hash	10:36
rafasc	cousteau: checkout always modifies the tree.	10:36
cousteau	right now I have both master and corrections pointing to HEAD, with uncommitted changes, and I want to change to branch master without losing the changes, and since I'm paranoid I want to make sure that `git checkout master` won't undo my changes	10:36
osse	correction: git rev-parse --verify 'abcd1234^{commit}'	10:36
	← justrohu left	10:36
osse	cousteau: it will work just fine	10:37
pix9	hmm I want to do both validate and make sure hash doesn't belong to historic commit	10:37
rafasc	cousteau: master and corrections pointing to HEAD makes no sese.	10:38
	sense	10:38
osse	pix9: i don't understand.	10:38
pix9	in terms of svn let's say my production is on revision number 5 now someone passes revision number 4 to my script for code update, it should (script) fail as the code is will be reverted to olders revision that one which is in production.	10:39
cousteau	so `git checkout master -- .` will delete my changes, but `git checkout master` won't?	10:39
pix9	it is easy in svn as there numbers	10:39
	← Gurkenglas left	10:39
pix9	I want to achive same in my git script, which pushes code to production.	10:39
rafasc	cousteau: yes. If checkout another thing needs to overwrite your stuff, git will stop and ask to either commit or stash.	10:40
_ikke_	pix9: you can use git merge-base --is-ancestor for that	10:40
osse	pix9: check if git merge-base --is-ancestor newhash currenthash is true. if it is then report error	10:40
pix9	so rite now I ma doing git pull	10:40
	sorry git fetch	10:40
	then git log --all	10:41
	but this gives me all the possible logs	10:41
	all possible commits	10:41
_ikke_	What do you need?	10:41
cousteau	rafasc, ok, so if checkout would change a file which currently has uncommitted changes it will complain	10:41
pix9	I will try merte-base	10:41
	don't know how it works	10:41
	thanks you for suggestions guys.	10:42
rafasc	cousteau: it will abort and error out saying something like "you have uncommited changes, please commit or stash"	10:42
	→ duderonomy joined	10:42
cousteau	ok thanks!	10:42
	→ justrohu joined	10:42
rafasc	cousteau: but only in the case when there's no paths.	10:43
	cousteau: if there are paths, it will just overwrite.	10:43
cousteau	makes sense, thanks!	10:43
	→ CodeSlingerPaul joined	10:43
cousteau	ok, step 1, make a backup because I'm paranoid	10:44
rafasc	cousteau: sometimes when I find myself switching too much between two branches, I just add a new worktree.	10:44
	cousteau: that way you can work on both branch at the same time, on different directories.	10:44
cousteau	OK, did the checkout and nothing was lost. Good. Can delete the backup now.	10:45
	← raven-au left	10:45
cousteau	rafasc, I see... well, in this case it's just that I'm relying on branches as "work markers", although my work is mostly linear	10:46
	← smallville7123 left	10:46
rafasc	cousteau: that's a bit irrelevant to the issue.	10:47
	→ smallville7123 joined	10:47
	→ fanhako joined	10:47
	→ riemann joined	10:48
	← tarkus left	10:48
cousteau	what I mean is, I could just not be using branches (and, if anything, use tags to mark different stages of development)	10:48
	→ raven-au joined	10:48
rafasc	you lose nothing by using branches.	10:49
cousteau	time	10:50
	→ crtcji joined	10:51
rafasc	if you're loosing time by using branches, you're doing something wrong.	10:51
	→ lankanmon joined	10:51
cousteau	at least in my current work flow in which I'm using branches to point to different points of a linear tree, and then have to move them manually... it's just silly by me	10:51
	not saying branches are useless; in fact I've used them before to have a clearer view of my edit history; it's just that in this case I might be overusing them	10:52
	but well, it's not like I'm doing something bad; if anything, inefficient; but that's because I'm no git expert yet	10:53
	rafasc parses overusing branches crashes	10:53
	→ nickmc joined	10:54
pix9	found the solution	10:54
	git log --all --after"datestamp"	10:54
	→ jhaenche_ joined	10:54
	← jhaenchen left	10:54
	← xmbq left	10:55
	→ dimi1947 joined	10:55
	→ x1b4 joined	10:56
	→ rajkane_prajta joined	10:56
	← rajkane_prajta left	10:56
	← nbmc left	10:57
	← justrohu left	10:57
	← plexigras left	10:57
rafasc	pix9: --after is not a reliable way to determine ancestry. the right tool for the job is merge-base --is-ancestor as previously suggested.	10:58
	← hegge_ left	10:58
	→ plexigras joined	10:58
rafasc	pix9: git doesn't guarantee a later commit will have a later timestamp.	10:59
	← Mike11 left	11:04
	← fanhako left	11:04
	→ rajkane_prajta joined	11:07
	→ tarkus joined	11:07
	→ topdownjimmy joined	11:09
	→ JeroenT_ joined	11:11
	← JeroenT left	11:11
	→ pfleck joined	11:12
	→ justrohu joined	11:12
pix9	dang	11:13
	→ linuxmodder- joined	11:13
	← linuxmodder left	11:14
	← hugobrendow left	11:14
	→ hugobrendow joined	11:14
pix9	git merge-base --is-ancestor ${PROD_HASH} ${GIT_HASH}	11:17
	FTW	11:17
	→ Cavallari joined	11:19
	← sitaram left	11:20
	→ TheRuckus joined	11:22
	← duderonomy left	11:23
	→ duderono_ joined	11:24
	← TheRuckus left	11:27
	→ jimi_sanchez joined	11:27
	← amirpro left	11:29
	→ xaa joined	11:29
	→ amirpro joined	11:30
	← linuxmodder- left	11:31
	→ linuxmodder- joined	11:31
	→ rsrx joined	11:32
	→ pks_ joined	11:32
	← rsrx left	11:33
	→ fr33domlover joined	11:34
	← cousteau left	11:34
	← amirpro left	11:34
	→ rsrx joined	11:34
	→ amirpro joined	11:35
	← pks left	11:36
	pks_ → pks	11:36
	← rsrx left	11:36
	→ rsrx joined	11:37
	→ dianni joined	11:37
	← moldy left	11:37
	← tvw left	11:38
	← linuxmodder- left	11:39
	→ nurdie joined	11:39
	→ jottr joined	11:40
	← JeroenT_ left	11:41
	← Guest25333 left	11:41
	→ Guest25333 joined	11:41
	← nurdie left	11:42
	→ Master__ joined	11:42
	→ nurdie joined	11:42
	← Guest25333 left	11:43
	← smallville7123 left	11:43
	→ Asassin333 joined	11:43
	← Asassin333 left	11:44
	→ pity joined	11:44
	← NerdyPepper left	11:44
	← MarioBranco left	11:44
	← fr33domlover left	11:46
	← nurdie left	11:47
	→ smallville7123 joined	11:47
	→ NerdyPepper joined	11:47
	← redrabbit left	11:47
	→ redrabbit joined	11:48
	→ saltlake joined	11:48
	→ JeroenT joined	11:48
	← amirpro left	11:49
	→ amirpro joined	11:50
	← jottr left	11:52
	← ojdo left	11:52
	← pfleck left	11:53
	→ Regon joined	11:53
	← amirpro left	11:54
	→ amirpro joined	11:55
	→ mightywomble joined	11:58
	→ ojdo joined	11:59
	← jrabe left	12:00
	→ hegge joined	12:00
	← pity left	12:00
	→ jrabe joined	12:00
saltlake	hi	12:02
gitinfo	saltlake: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	12:02
saltlake	git push -u origin master, what is -u here?	12:02
	→ jgoss joined	12:03
	← wandering_vagran left	12:03
	← tarkus left	12:04
	← keepLearning512 left	12:05
	→ wandering_vagran joined	12:05
	→ sitaram joined	12:06
	← x1b4 left	12:06
	sitaram → Guest11851	12:06
	← Guest11851 left	12:07
	→ Guest11851 joined	12:07
rafasc	saltlake: have you even tried looking the man page?	12:07
	← widp left	12:08
	← leeN left	12:11
	← mikemcowie left	12:11
	← mightywomble left	12:14
	→ mightywomble joined	12:15
	→ pfleck joined	12:15
	→ keepLearning512 joined	12:15
	← canton7 left	12:15
	← Guest11851 left	12:15
	← keepLearning512 left	12:16
	→ leeN joined	12:16
	→ keepLearning512 joined	12:16
cheater	--set-upstream ?	12:16
oxymoron93	yes	12:16
saltlake	cheater: for me?	12:19
	→ canton7 joined	12:20
oxymoron93	-u is --set-upstream check man git push	12:20
gitinfo	the git-push manpage is available at https://gitirc.eu/git-push.html	12:20
	← jgoss left	12:21
	← Neo4 left	12:23
	← drbean left	12:24
cheater	saltlake: yes.	12:24
	saltlake: next time, look at "man git push" or "git push --help" (same thing)	12:25
gitinfo	saltlake: the git-push manpage is available at https://gitirc.eu/git-push.html	12:25
	→ drbean joined	12:25
	→ Binake joined	12:26
	← skisela left	12:28
	→ Onionnion joined	12:29
	→ TheRuckus joined	12:29
	← justrohu left	12:30
	→ ShekharReddy joined	12:30
	Guest72864 → sircmpwn	12:32
	→ skisela joined	12:34
	→ sitaram_ joined	12:35
	← sitaram_ left	12:35
	→ sitaram_ joined	12:35
	→ pity joined	12:36
	sitaram_ → sitaram	12:36
	← skisela left	12:36
	→ thiago joined	12:40
	← amirpro left	12:40
	→ nurdie joined	12:41
	← theoceaniscool left	12:41
	← pity left	12:41
	→ amirpro joined	12:42
	→ miklcct_ joined	12:46
	← miklcct left	12:46
	← rotaerk left	12:46
	← amirpro left	12:47
	→ amirpro joined	12:50
	→ phluks joined	12:51
	← manuelschneid3r left	12:53
	→ TMGS joined	12:54
	→ theoceaniscool joined	12:54
	→ manny_rodriguez joined	12:55
	← manny_rodriguez left	12:55
	→ czart__ joined	12:56
	← nurdie left	12:57
	→ nurdie joined	12:57
	← Guest21076 left	12:58
	→ Guest21076 joined	12:59
	← rfuentess left	12:59
	← Guest21076 left	12:59
	← czart_ left	13:00
	→ bitonic joined	13:00
	→ Mike11 joined	13:00
	→ jgoss joined	13:00
	← bitonic left	13:00
	→ bitonic joined	13:01
	← rajkane_prajta left	13:01
	← doev left	13:02
	→ widp joined	13:02
	← nurdie left	13:02
	→ mud joined	13:04
	→ bjsnider joined	13:05
	← Rubin left	13:06
	→ rfuentess joined	13:07
	← d1b left	13:09
	← charolastra left	13:11
	← widp left	13:13
	→ d1b joined	13:14
	→ Kolany joined	13:15
	→ quackgyver joined	13:15
	← cheater left	13:16
	← dre_ left	13:16
	← Kolany left	13:18
	← sim590 left	13:18
	→ Rubin joined	13:19
	→ shinnya joined	13:21
	→ pity joined	13:23
	→ sim590 joined	13:23
	→ mostlybadfly joined	13:24
	← pnepe6 left	13:26
	← smallville7123 left	13:26
	← sim590 left	13:29
	→ smallville7123 joined	13:29
	← duderono_ left	13:30
	→ duderonomy joined	13:30
	→ PioneerAxon_ joined	13:30
	← PioneerAxon left	13:30
	← keepLearning512 left	13:31
	← dimi1947 left	13:31
	→ sim590 joined	13:34
	→ AndresInSpace joined	13:36
	← AndresInSpace left	13:36
	→ AndresInSpace joined	13:36
	→ Binake_ joined	13:38
	← ronskisika left	13:38
	→ keepLearning512 joined	13:39
	→ Steverman joined	13:39
Steverman	Totally did not expect that	13:39
	→ hernan604 joined	13:40
	← Binake left	13:40
hernan604	hi!! whats the name of algorithm to create short md5 hash ? (git rev-parse --short)	13:40
	→ Es0teric joined	13:42
	← smallville7123 left	13:42
	→ mefistofeles joined	13:44
	← Es0teric left	13:45
	→ smallville7123 joined	13:45
	→ Es0teric joined	13:47
	→ igemnace joined	13:47
	→ jready joined	13:48
	→ TMGS_ joined	13:48
	← TMGS_ left	13:50
	→ TMGS_ joined	13:50
	← TMGS left	13:50
	→ kneeki joined	13:51
	TMGS_ → TMGS	13:52
	← pfleck left	13:52
	→ rivalomega joined	13:54
	→ ntnn joined	13:54
	→ crose joined	13:55
	→ cheater joined	13:55
	← robin left	13:56
	→ robin joined	13:57
	← rivalomega left	13:57
	← Es0teric left	13:57
	← ocds left	13:57
	→ Es0teric joined	13:59
	← ephemera_ left	14:00
	← rsrx left	14:00
rafasc	hernan604: what's your question really?	14:00
	git doesn't doesn't use md5	14:01
	→ camsbury joined	14:02
rafasc	git currently uses sha1, but there's work in progress to make it hash agnostic.	14:02
	→ cr1mson_king joined	14:04
	→ relipse joined	14:05
	← Rubin left	14:07
	← dmone left	14:08
	→ nurdie joined	14:09
	Guest31421 → mawk	14:11
	→ AaronMT joined	14:11
	← smallville7123 left	14:12
	← mel00010 left	14:13
Steverman	Reminds me of the multihash format	14:14
	← venmx left	14:16
rafasc	nothing will beat emoji based hash.	14:16
	← zulutango left	14:16
hernan604	rafasc: right, i mean i see hashes in the form 8d9qu89dqwuy89dqwy89dyq898dqy9w89qwd98 (long) and some shorted ie e89892eu	14:17
	and they are equivalent	14:17
	whats the algorithm name that creates the shorter version of the hash ?	14:17
	i want to search my programming language modules repository for something that generates the shorter version	14:18
jedix	it's artually the start of the long poart	14:18
	actually	14:18
rafasc	hernan604: there's not a name. It's just the prefix of the big one, making sure they're not ambiguous.	14:18
	← keepLearning512 left	14:19
hernan604	ok	14:19
rafasc	also considers a config setting, where you can force a certain number of 'digits' to show.	14:20
	← cramalho left	14:22
	→ venmx joined	14:22
rafasc	hernan604: https://github.com/git/git/blob/e144d126d74f5d2702870ca9423743102eec6fcd/sha1-name.c#L540	14:23
	← Jackneill left	14:23
rafasc	if you're really interested in the algorithm.	14:24
	→ dimi1947 joined	14:24
amosbird	Hello, why do I get unstaged changes after rebasing ?	14:25
	→ dendazen joined	14:25
grawity	are you sure it's after rebasing, and not in the middle of a rebase?	14:25
	← saltlake left	14:25
canton7	what does 'git status' say?	14:26
	→ thiago_ joined	14:26
hernan604	rafasc: oh, great link. thanks!	14:27
	→ Nizumzen joined	14:27
amosbird	grawity: yep	14:27
	hmm, I have to do git submodule update one by one	14:28
	← thiago left	14:28
rafasc	hernan604: you'll find that the length actually depends on how many objects your git db has.	14:28
	← chele left	14:29
	← JeroenT left	14:29
	→ ashpabb joined	14:30
	dwmw2 → dwmw2_gone	14:30
	thiago_ → thiago	14:30
	← oxymoron93 left	14:31
	→ ToBeFree joined	14:32
	← ToBeFree left	14:32
	→ ToBeFree joined	14:32
	gitinfo set mode: +v	14:32
	→ veegee joined	14:32
	← surfist left	14:33
	→ cramalho joined	14:33
	→ Neo4 joined	14:34
	→ surfist joined	14:35
	← ToBeFree left	14:35
	← ashpabb left	14:36
	→ Rubin joined	14:36
	→ jstimm joined	14:39
	→ bitttalkme98 joined	14:41
	← Nizumzen left	14:41
	→ jamiejackson joined	14:42
	← jhaenche_ left	14:42
	← Mike11 left	14:42
	← raffo left	14:43
olaf_	why does git am fail to handle different line endings,while patch(1) does them just fine?!	14:43
	→ jhaenchen joined	14:43
	← inovas left	14:43
	→ navidr joined	14:43
	← igemnace left	14:44
olaf_	looks like .git/rebase-apply/patch gets converted from correct to wrong ending.	14:44
	← MaliusArth left	14:44
	← bitttalkme98 left	14:44
	← Es0teric left	14:44
	← sitaram left	14:45
	→ sleepingforest joined	14:46
	← jhaenchen left	14:48
	→ inovas joined	14:49
	← phluks left	14:49
	→ pionen joined	14:50
	← thiago left	14:50
	← _ADN_ left	14:50
	→ thiago joined	14:51
	→ jhaenchen joined	14:53
	← camsbury left	14:54
	← abba left	14:55
	← thiago left	14:56
	← amirpro left	14:57
	→ amirpro joined	14:57
	← Onionnion left	14:58
	← phinxy left	14:58
	→ beefjoe70 joined	14:59
	← afuentes left	15:00
	← ShekharReddy left	15:00
	→ camsbury joined	15:00
	→ thiago joined	15:01
	← amirpro left	15:01
	← nurdie left	15:01
	→ phinxy joined	15:02
	→ amirpro joined	15:02
	← Cavallari left	15:03
	← jhaenchen left	15:03
	→ LionsMane joined	15:05
	← dmarr left	15:05
	← AndresInSpace left	15:06
	← mightywomble left	15:07
	← crtcji left	15:07
	→ PsychoBoB joined	15:08
	→ fstd_ joined	15:08
	→ JimmyRcom_ joined	15:08
	→ jhaenchen joined	15:09
	→ Es0teric joined	15:09
	← XenophonF left	15:10
	← pity left	15:10
	→ XenophonF joined	15:10
	← XenophonF left	15:11
	← fstd left	15:11
	fstd_ → fstd	15:11
	→ XenophonF joined	15:12
	← XenophonF left	15:12
	← PsychoBoB left	15:12
	→ XenophonF joined	15:14
	→ PioneerAxon joined	15:15
	← PioneerAxon_ left	15:15
	→ keepLearning512 joined	15:16
	→ cagomez joined	15:16
	← riemann left	15:17
	← rafasc left	15:18
	→ al-damiri joined	15:18
	→ rafasc joined	15:18
	← cramalho left	15:18
	← keepLearning512 left	15:20
	→ AndresInSpace joined	15:20
	→ ocds joined	15:21
	→ cramalho joined	15:23
	← cagomez left	15:25
	← minionofgozer left	15:26
	← jimi_sanchez left	15:29
	← plexigras left	15:30
	→ Gurkenglas joined	15:30
	→ rivalomega joined	15:30
	→ plexigras joined	15:31
	← rivalomega left	15:33
	→ rivalomega joined	15:33
	→ dege joined	15:33
	→ scorpionillumin joined	15:36
scorpionillumin	a little help please	15:36
_ikke_	!just_ask	15:37
gitinfo	You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)	15:37
	→ palmtree joined	15:37
	← pionen left	15:37
scorpionillumin	https://bitbucket.org/snippets/scorpionilluminati/aej7py it's not working, the files with those extensions aren't being ignored ex bin/emu/rom.bin	15:38
cjohnson	gitignore has no effect on files that are already checked in	15:39
	→ akushner joined	15:40
	← akushner left	15:40
rafasc	!ignore_tracked	15:40
gitinfo	Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.	15:40
scorpionillumin	i commited .gitignore and then rebuilt my rom, so it should of started ignoring or should i have to commit those files atleast once?	15:40
	→ akushner joined	15:41
rafasc	you actually need to tell git to stop tracking those files.	15:41
	← rivalomega left	15:42
rafasc	you need to $git rm the files (use --cached if you want to remove from the repo but keep an untracked copy in your directory). Then commit the removal of those files.	15:44
	only then git will start ignoring.	15:45
	committing the .gitignore is optional.	15:45
	← leeN left	15:45
	← l3dx left	15:48
	← eduardas_m left	15:49
	→ wreed joined	15:51
	→ nurdie joined	15:55
	→ Praxi joined	15:57
skered	If a tag is removed from the remote repo and I git pull the tag isn't removed. git pull will auto add tags but it doesn't auto remove them?	15:58
rafasc	skered: yes. This is by design.	15:59
	← dianni left	15:59
skered	So at that point you need to 'git tag -d ... ' to remove it?	16:00
	There not 'git pull --something ...' to keep tags in sync?	16:00
	There's*	16:00
rafasc	the point is that a remote should not delete tags after they are set.	16:00
skered	Fair enough. I think that's going to be case once we start using them.	16:01
	But it was something I noticed while testing.	16:01
	← mosab left	16:01
	← theoceaniscool left	16:01
rafasc	one of the mais uses of tags, are declaring versions.	16:02
	it's a bit silly if a remote could "redeclare" what vX.X is.	16:02
	→ rivalomega joined	16:02
	← jamiejackson left	16:03
rafasc	So, by default, git keeps the tags alone and leaves it up to the user how to proceed from there.	16:03
skered	We're using it for non-versioning.	16:04
rafasc	The version is just an example, but the concept applies to non-version tags.	16:04
skered	If a special even happens we want to record that some how that isn't a commit	16:04
	← howdoi left	16:04
rafasc	a tag is a immutable reference to a commit. Allowing the deletion would weaken this concept.	16:04
skered	It's possible that special event can be reverted but most likely it won't. I think I have enough road blocks that if you're tagging you mean it.	16:05
	→ durham joined	16:06
cjohnson	skered: You would follow that up with a followup tag	16:06
	which is the revert	16:06
	BTW revert works this way too	16:07
	it does not rewrite history but introduces a negative commit	16:07
	This is intentional :)	16:07
skered	This is all internal and the user base is small. Plus gitlab sends emails on tag adds and removes so it's all recorded some whewre.	16:07
	→ Naq joined	16:07
	← Naq left	16:07
rafasc	you could ask your users to $git fetch origin +refs/tags/:refs/tags/	16:08
	← Es0teric left	16:08
rafasc	but there's no way to force it on users.	16:08
skered	Yeah, we're small enough to the point someone could just yell (or email) and it's all good.	16:09
rafasc	it's the users' responsibility to manage the tags.	16:09
skered	cjohnson: That was another idea I was thinking about too. A follow up tag to invalid tags.	16:09
rafasc	but ideally you would avoid that.	16:09
	I think in skered's usecase a namespaced branch would fit better.	16:10
	instead of using tags, use branches with some naming convention like events/name;	16:10
skered	That's not a bad idea too.	16:11
	← beefjoe70 left	16:11
skered	And it might make it easier to see the tree at that point too.	16:12
	← durham left	16:12
rafasc	not really any easier..	16:12
	→ durham joined	16:12
	← floppydh left	16:13
	← lagothri1 left	16:15
	← dimi1947 left	16:16
	← durham left	16:17
	← rfuentess left	16:17
	→ energizer joined	16:17
	← TMGS left	16:18
	→ jungsubk joined	16:18
rafasc	skered: even if you come up with a system to "invalidate" with another tag. You're still relying on the user respect it.	16:18
	→ crtcji joined	16:19
rafasc	So it's not that different than asking them to delete their local tag, and fetching the new one.	16:19
	← aciidic__ left	16:20
	← rivalomega left	16:20
	→ rivalomega joined	16:20
	← Guest32965 left	16:21
	→ lagothrix joined	16:23
	→ Es0teric joined	16:24
	→ tipyn joined	16:26
	← TheRuckus left	16:27
	← m00sehead left	16:27
	→ TheRuckus joined	16:29
	→ durham joined	16:30
	← durham left	16:30
	→ Onionnion joined	16:33
	← madewokherd left	16:34
	→ King_Hual joined	16:34
	← King_Hual left	16:34
	→ King_Hual joined	16:34
	→ TMGS joined	16:35
	→ durham joined	16:35
	← shady_traveller left	16:35
	← rts-sander left	16:36
	← palmtree left	16:37
skered	Thanks for the input.	16:38
	→ DaGoaty joined	16:38
	← Binake_ left	16:40
	→ dimi1947 joined	16:41
	→ amirpro_ joined	16:42
	→ chaosruler joined	16:42
	← amirpro_ left	16:43
	← Neo4 left	16:43
	→ tarkus joined	16:44
	← amirpro left	16:44
	← rafasc left	16:45
	→ amirpro joined	16:45
	→ rafasc joined	16:45
	→ smallville7123 joined	16:46
	← qgTG left	16:48
	→ qgTG joined	16:49
	→ raynold joined	16:51
	← jstimm left	16:51
	→ \void joined	16:52
	→ dandes joined	16:53
	→ PsychoBoB joined	16:54
	→ dbear joined	16:55
	← tipyn left	16:56
dbear	Wondering if there are any high school level teachers using git as a way to track student progress on coding projects?	16:56
	← jready left	16:56
	→ Mattiaslndstrm joined	16:57
	→ nitric joined	16:58
	→ YuGiOhJCJ joined	16:58
	→ rsrx joined	16:59
AndresInSpace	dbear: probably	17:00
	← TheRuckus left	17:03
	→ KaitoDaumoto joined	17:04
	← King_Hual left	17:05
	← shinnya left	17:06
	← thinkpad left	17:06
	→ King_Hual joined	17:06
	← King_Hual left	17:06
	→ King_Hual joined	17:06
	→ thinkpad joined	17:07
	← Whiskey left	17:07
	→ iNCoNFuN joined	17:09
	← jrnieder left	17:10
	← King_Hual left	17:11
	← relipse left	17:11
	→ jready joined	17:12
dbear	AndresInSpace: thats a good response, then at least I wouldn't be the first to have the idea.. I was just hoping there was a teaching hanging around that could comment on best practices around setting up the repositories..	17:13
	I was thinking I would have 1 repo per student, then all the coding projects would belong to the one repo	17:13
	← venmx left	17:14
flippedouttt	question: gitlab or phabricator	17:14
	for a local install	17:14
	well, self-hosted install	17:14
_ikke_	Haven't used both, so cannot tell	17:14
flippedouttt	used either?	17:14
_ikke_	gitlab likes memory though	17:14
	I used gitlab, but no experience setting it up / maintaining it	17:15
flippedouttt	yeah it says min 4gb memory	17:15
_ikke_	I hear you even want 8gb min	17:15
flippedouttt	im leaning towards phab	17:15
	→ dreiss joined	17:15
_ikke_	gitlab is nice though	17:15
	but cannot tell you how it compares to phabricator	17:15
flippedouttt	phab is pretty neat	17:16
	ChanServ set mode: +o	17:17
Zarthus	depends on what you need, really	17:18
	both of them are nice, both of them have demos	17:18
	← Es0teric left	17:18
	Eugene changed the topic to: Welcome to #git, the place for gitting your ducks in a row \| First visit? Read: https://gitirc.eu \| Current stable version: 2.17.0 \| Getting "cannot send to channel"? /msg gitinfo .voice \| https://photos.app.goo.gl/Dwp1yX8rEvsnK6Gf1	17:18
	Eugene set mode: -o	17:19
Eugene	Duck feedback welcomed	17:19
Zarthus	for personal projects? gitolite+trello works fine	17:19
	← mda1 left	17:19
	→ jnavila joined	17:20
	→ TheRuckus joined	17:21
	→ Es0teric joined	17:22
	→ bambams joined	17:22
rafasc	in uni we set up a redmine server for students.	17:22
	but that was before we got all these alternatives.	17:22
	→ sjoshi joined	17:23
	→ mda1 joined	17:23
	← mostlybadfly left	17:24
	→ nachoman joined	17:25
	→ jessica523 joined	17:25
	← nuc left	17:26
	← TheRuckus left	17:26
	→ Whiskey joined	17:26
	→ jstimm joined	17:26
	← Mattiaslndstrm left	17:27
	→ beefjoe joined	17:27
	→ nuc joined	17:27
j416	dbear: github?	17:29
	→ TheRuckus joined	17:30
	→ akushner_ joined	17:30
	← nachoman left	17:30
dbear	Looked at github -- they want money for private repos.. Gitlab gives me private repos that I don't have to pay for .. and its all 'git' ..	17:31
j416	why not public?	17:31
	→ Puffball joined	17:31
dbear	j416: I didn't want a student project thats is a 'practice programming assignment' becoming .. something that is published .	17:32
j416	interesting. Why not?	17:32
	← Es0teric left	17:32
dbear	sometimes students may do things that we don't want to become 'representative' of the school	17:32
j416	why not have them put it on their own account?	17:33
dbear	we wanted to leverage school SSO, so we have them use the school managed google account	17:33
	I think there are cipa implications here	17:33
	→ sanscoeur joined	17:33
	← akushner left	17:33
dbear	to comply with law, we have to be able to revoke account access.	17:34
j416	doubt that covers their private github accounts.. does it	17:34
	← wreed left	17:34
j416	anyway, it's just an idea.	17:34
rafasc	bitbucket?	17:36
	→ mostlybadfly joined	17:36
	← Master__ left	17:36
	→ nitric_ joined	17:36
_ikke_	bitbucket only allows for 5 collaborators for private repos	17:37
	← nitric left	17:37
rafasc	5 students per group is kinda of ok for highschool.	17:38
	→ jimi_ joined	17:38
	← sjoshi left	17:38
	→ sjoshi joined	17:39
	→ King_Hual joined	17:40
	← King_Hual left	17:40
	→ King_Hual joined	17:40
AndresInSpace	dbear: from what i've heard, the tell students to make their own github account, make their own repo for each project	17:41
	guess it depends on the professor	17:41
sanscoeur	I have curious question about git history. ... If I created a new repo using the latest version of git, are there older versions of the git client that would be incompatible?	17:42
Eugene	GitHub has a whole thing for Education https://education.github.com/	17:42
	sanscoeur - yes, but they'd have to be /really old/	17:43
sanscoeur	I've read a bit of the technical documentation, so I know that some of the binary formats have changed. (https://github.com/git/git/tree/master/Documentation/technical)	17:43
	→ Es0teric joined	17:43
	→ Mattiaslndstrm joined	17:43
	→ getSomethingGood joined	17:43
	← quackgyver left	17:43
Eugene	The git protocol is going through some updates, and a bunch of work is being done for the future hash-change away from SHA1, but right now everything will "just work" and you don't need to worry about it.	17:43
	All the changes are/will be forward-compatible; anything you find that isn't compatible means that you're using an antique `git` binary. Don't do that. ;-)	17:44
ali1234	what hash is replacing sha1?	17:45
Eugene	https://github.com/git/git/blob/master/Documentation/technical/hash-function-transition.txt	17:45
sanscoeur	Eugene: Any idea how old? I have some Jenkins build nodes running CentOS6. They have git 1.5-1.7 (somewhere in there, don't have access atm) and they work fine. Pretty impresive.	17:45
Eugene	sanscoeur - pre-1.0	17:45
	→ preyalone joined	17:46
Eugene	You'll find some user-facing functions missing from git in CentOS5; anything older than that is... old.	17:46
ali1234	tl;dr not decided yet	17:46
Eugene	ali1234 - indeed. The work is currently focussed on 'oh god we have a 32-character hash hardcoded everywhere'	17:46
ali1234	fair enough	17:47
Eugene	!sha1	17:47
gitinfo	git uses a variant of the SHA1 cryptographic hash algorithm to ensure object integrity. Git v2.13.0 added hardening to the SHA-1 implementation to mitigate SHAttered; work towards a NewHash is underway: https://git.io/vpIMJ \| Please note that purposeful SHA1 collisions are computationally expensive, and accidental encounters are more likely with wolves. https://en.wikipedia.org/wiki/Wolf_attacks_on_humans Fear their howl.	17:47
Eugene	Relevant wikipedia ^	17:47
rafasc	dbear: since git is pretty much distributed, you can even let them have local repos on their machines. And syncronize over the local network on class.	17:48
sanscoeur	Very cool. Thanks. ... I have a fascination with VCS and how they store version history. I've looked at CVS and SVN in the past. I just started looking at Mercurial which has a '.hg/requires' (https://www.mercurial-scm.org/wiki/RequiresFile) which dictates necessary client features.	17:48
	← preyalone left	17:48
sanscoeur	(So, they've had to make backwards incompatible changes.)	17:48
	← rivalomega left	17:48
_ikke_	git so far hasn't	17:48
	→ preyalone joined	17:49
_ikke_	at least, not since a long time	17:49
dbear	rafasc: exactly	17:49
	the workflow I had in mind is that after each class they would git commit and git push	17:49
	then each day I could run some git stats on each of the gitlab repos to see how much code they produced..	17:50
	← ShapeShifter499 left	17:50
sanscoeur	To my understanding. If every git repo in existence was combined, it would be highly unlikely for there to be any object-hash collisions.	17:50
j416	dbear: why not encourage clean and logical commits instead of doing one commit per day?	17:50
_ikke_	I agree with j416	17:51
dbear	j416: good thought.. trouble is I have only so much time in class in a semester	17:51
AndresInSpace	you do not want one commit per day with everything piled into it	17:51
	← jnavila left	17:51
AndresInSpace	that is just asking for trouble	17:51
	← getSomethingGood left	17:51
_ikke_	I'm trying to force myself to commit early	17:51
dbear	I could spend more time teaching good git practices -- or time teaching data structures and algorithms	17:51
	→ getSomethingGood joined	17:52
dbear	I a poor git user myself... so ..	17:52
	← preyalone left	17:52
AndresInSpace	I commit per 'task'/'fix'	17:52
_ikke_	That should be pretty explainable	17:52
	→ preyalone joined	17:53
	← Salek left	17:54
j416	dbear: if you're letting loose a class of people who have not used version control before, you might want to make sure you have a solid enough understanding in order to be able to quickly get them out of tricky situations, that will occur	17:54
ali1234	sanscoeur: it's so much more unlikely than that	17:54
	← King_Hual left	17:54
j416	dbear: but, perhaps that goes without saying.	17:54
	← NinjaBruxo left	17:55
	→ uve joined	17:55
uve	Hey folks	17:55
gitinfo	uve: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	17:55
Eugene	sanscoeur - there has been exactly one (publicly known) SHA1 hash collision to be created, ever. A change to the hash function which mitigates this attack(ie, produces a different hash) has already been merged to git. Additionally, git uses not-quite-sha1 to begin with(appends a length) to prevent most theoretical attacks to begin with. Insert "grains of sand" comparison here.	17:56
sanscoeur	ali1234: Can you quantify it? I've tried to in the past. Even used Google BigQuery's Github data to prove it to myself.	17:56
	→ rivalomega joined	17:56
	→ M6HZ joined	17:56
	→ manuelschneid3r joined	17:56
ali1234	sanscoeur: it's so unlikely that it is difficult to quantify	17:57
sanscoeur	Eugene: Interesting. Somehow, I've missed that SHA1+length detail.	17:57
uve	I want to join a kind of open source project... Need help.	17:57
	→ ShapeShifter499 joined	17:57
_ikke_	sanscoeur: http://www.wolframalpha.com/input/?i=number+of+combinations+in+sha1	17:57
	← amirpro left	17:57
dbear	j416: I understand the basics of git and version control. but I have no real world experience of working on coding projects with other groups of people in git -- so I know where I have messed up.. and I know where I have had students in the past mess up (we used it last year for a class project, one repository for the class) But I don't know what I don't know -- and I would prefer to learn from other teachers using git as a means of trackin	17:57
	→ amirpro joined	17:58
dbear	yes, it would be great to teach good git practice to start with ... but I'm too isolated as a high school teacher to know what good 'industry' practices are in place	17:59
sanscoeur	_ikke_: Nice. That's an awesome use of wolframalpha. I'm going to have to show that off now. ... I would guesstimate that even with all the rebasing and squashing, the entire world has made somewhere in the billions of git objects (possibly, low trillions), so we have a ways to go.	17:59
dbear	my most immediate concern is to be able to spot students not producing code as a means of identifying those who may need more help than they ask for	17:59
sanscoeur	Although, there is the birthday problem. Which I did just well enough with statistics to pass the course. I've forgotten how the calculation works.	18:00
ali1234	you need 1 * 10^23 commits for a 1% chance of collision with 160 bits	18:00
	accidental collision that is	18:00
j416	dbear: tricky	18:00
dbear	j416: yes -- students are sometimes not forthcoming about being completely lost..	18:01
ali1234	that's 100 billion trillion commits	18:01
j416	dbear: is gaining such experience possible? work on an open source project, for instance	18:01
	← Frogging101 left	18:01
j416	dbear: indeed; that sounds like an issue	18:01
	dbear: I'm not sure git alone will solve that problem	18:02
	← preyalone left	18:02
	← jgoss left	18:02
j416	dbear: how many students are in your class?	18:02
dbear	j416: it varies over the years.. cap is 20. low count is 10 .. and yes, git alone won't solve it..	18:03
	→ phluks joined	18:03
j416	ah, that few	18:03
	→ preyalone joined	18:03
j416	I'd at least go with one repo per student	18:04
sanscoeur	shatterd.io calculated they would need 2^63.1 computations (https://shattered.io/static/shattered.pdf) ... I skimmed the paper, I suspect that's for a targeted attack.	18:06
ali1234	yes, attacks are different. they reduce the work you need to do to find collisions	18:06
sanscoeur	ali1234: Nice. Even with that relatively "smaller" number, that's still a lot of hashes.	18:07
	→ geoklown joined	18:07
	← sleepingforest left	18:08
ali1234	also note that finding two blobs with the same sha1 is a different and easier problem than finding a blob with the same sha1 as some existing blob	18:08
	the former can't be used to attack git history	18:08
_ikke_	and note that this specific attack does not really affect git (because there is a header prepended to each object)	18:09
	→ cfoch joined	18:09
	→ tipyn joined	18:09
	← sjoshi left	18:10
	→ Frogging101 joined	18:12
	← KaitoDaumoto left	18:13
	← ShapeShifter499 left	18:13
scorpionillumin	how do i rm --cached if the file has a space in it(ex. rom .lst)?	18:14
	→ ShapeShifter499 joined	18:14
	→ keepLearning512 joined	18:15
_ikke_	git rm --cached 'file with spaces'?	18:15
cjohnson	Or file\ with\ spaces	18:16
	though that's really more of a shell question	18:16
scorpionillumin	actually my assembler is doing that which is weird, but no one knows why	18:16
ali1234	or file<tab>	18:17
_ikke_	cjohnson: correct	18:17
ali1234	let the shell figure it out	18:17
cjohnson	^	18:18
	→ mel00010 joined	18:18
scorpionillumin	what if the shell is git?	18:18
ali1234	git has an interactive mode?	18:19
scorpionillumin	git bash	18:19
	← DaGoaty left	18:19
scorpionillumin	thats litterly what it's called	18:19
ali1234	not a command here	18:19
Eugene	git bash is not git. It is bash included with Git for Windows	18:19
	→ Karyon joined	18:20
ali1234	well in that case, it should have tab completion	18:20
	← jready left	18:20
Eugene	Git for Windows includes a bunch of UNIX-sourced tools built for Windows. They are not git subcommands either.	18:20
scorpionillumin	why can't you flat out just use git without bash?	18:20
Eugene	You can use git.exe just fine in cmd or Powershell, if your PATH includes the git bin directory	18:20
ali1234	you can, it's just not very nice	18:20
	→ jready joined	18:21
scorpionillumin	ah ok then	18:21
	→ jnavila joined	18:21
Eugene	bash.exe is provided with a handy shortcut that sets up the UNIX-like environment, so that existing git users will feel a bit at-home. If you're a Windows-centric guy (my company is), just add it to your PATH and use PoSH. ;-)	18:22
	← sanscoeur left	18:22
	→ Ademan-work joined	18:22
	→ sanscoeur joined	18:22
Eugene	People seem to forget that Windows makes huge strides for POSIX compatibility... you can even run a NFS client on Windows	18:22
	Its not that good, but you can	18:22
	The original Windows netcode subsystem was lifted from BSD. Its been rewritten almost entirely, but that's where it came from	18:23
	Active Directory's DNS service? Originally forked from BIND	18:24
	→ ferdna joined	18:24
ali1234	windows used to have an NFS client built in, then they removed it	18:24
	→ Mike11 joined	18:24
	← Ademan-work left	18:25
	← sauvin left	18:25
	→ Ademan-remote joined	18:25
Ademan-remote	I just accidentally clobbered an un-annotated tag with a `git fetch --tags`. it was the sole pointer to a bit of history I wanted to keep, is my best bet to go through `git fsck --unreachable` looking for the object it pointed to?	18:25
Eugene	No they didn't? Its gated behind Pro/Enterprise license	18:25
	Ademan-remote - git reflog should work on tags IIRC?	18:25
	Or scroll up in your console and copy-paste the object ID	18:25
ali1234	oh they put it back?	18:26
	← sanscoeur left	18:26
Eugene	It never left	18:27
	← wandering_vagran left	18:27
	← crtcji left	18:27
Eugene	Its not enabled by default and not available on home SKUs, but it is there and I am actively using it on Windows 10	18:27
ali1234	i thought they removed it in vista	18:28
Eugene	Home SKU ;-)	18:28
ali1234	good point	18:28
Eugene	Actualy, Vista, it may have been gated behind Enterprise (not Pro). I don't remember Vista very well	18:29
	→ dviola joined	18:29
	← jnavila left	18:30
ali1234	oh i see what happened	18:30
	the NFS client used to be available in the SFU package, so you could install it on anything pretty much	18:30
	→ Salek joined	18:31
ali1234	when SFU was replaced by SUA the NFS client was split out and made server-only	18:31
Eugene	Only in terms of the install package. The subsystem hasn't changed.	18:31
ali1234	sure	18:31
	→ re1 joined	18:31
	← akushner_ left	18:31
ali1234	i was just misremembering	18:32
Eugene	Very common in IT. S'ok, we all accidentally hate on Microsoft. Its like an IRC hobby.	18:32
	→ fr33domlover joined	18:32
Eugene	I'm currently pissed off at them because my home Print server ate its bootloader. Again.	18:33
	← rsrx left	18:34
	→ akushner joined	18:34
	← justanotheruser left	18:36
	→ relipse joined	18:39
	← manuelschneid3r left	18:39
	→ Radierg joined	18:41
	gitinfo set mode: +v	18:41
	→ dpyro joined	18:42
	← beefjoe left	18:42
Radierg	I am doing a cherry-pick and while fixing conflicts, git status shows the status "deleted by us" for some files. What does it mean?	18:43
	→ D630 joined	18:43
	← Es0teric left	18:45
	← al-damiri left	18:46
	→ ilogger2 joined	18:47
	→ jimmyrcom joined	18:48
	→ Mattiasl_ joined	18:50
	→ ilogger2 joined	18:53
	→ Ram-Z joined	18:53
	→ Mattiaslndstrm joined	18:56
	→ dreiss joined	18:58
	→ Es0teric joined	18:59
	→ dendazen joined	19:01
	← Mattiaslndstrm left	19:02
	→ tipyn joined	19:02
	→ jnavila joined	19:02
	→ Mattiaslndstrm joined	19:03
	→ mad_hatter joined	19:03
	→ akushner joined	19:04
	→ Mattiasl_ joined	19:05
	← dreiss left	19:06
	← Mattiaslndstrm left	19:07
	→ Mattiaslndstrm joined	19:10
	→ muelleme joined	19:10
	→ in1t3r joined	19:11
	→ duderonomy joined	19:11
	← Mattiasl_ left	19:12
	→ mel00010 joined	19:13
thblt	Why do git tag objects have a =tag= field with the tag name? It seems git uses the name of the file in refs/tags anyway	19:13
	... and cannot even refer to a tag by the name in that field in the file in refs has been renamed	19:15
	← muelleme left	19:15
	→ dreiss joined	19:16
	→ goodafternoon joined	19:18
	→ shinnya joined	19:28
	← mel00010 left	19:28
	→ Hello71 joined	19:28
	→ justanotheruser joined	19:29
	← jnavila left	19:29
	← akushner left	19:30
	→ henharm joined	19:31
	→ mario_ joined	19:33
	→ akushner joined	19:35
	→ joeco joined	19:35
	→ tombusby joined	19:39
	→ jimi_ joined	19:40
	→ KeyJoo joined	19:40
	→ jenia joined	19:41
jenia	hello	19:41
	are there many people using master-only git?	19:42
Seveas	What do you mean with master-only?	19:42
	→ mel00010 joined	19:42
jenia	a bracnhing strategy that uses master only	19:43
Seveas	that's not uncommon, especially for smaller projects	19:44
ali1234	i prefer to only do fast forward merges	19:44
	i think that's what you're talking about right?	19:44
jenia	ali1234, no I mean everyone uses master branch	19:45
	→ freimatz joined	19:45
rafasc	dbear: j416 made a very good point. If you're not savy enough with git to untangle the mess your students will eventually make, or at least explain to them what they did wrong... I think you might end up making things worse. Because they will either get the impression that git is hard and the benefits are not worth the problems you have to deal with.	19:45
ali1234	master is just a name for a branch tho	19:45
	everyone who has a copy of the repo has their own master branch	19:45
	← joeco left	19:46
rafasc	ali1234: fairly common. People still branch locally to develop features though.	19:46
	→ sim590 joined	19:47
	→ durham_ joined	19:49
	→ jnavila joined	19:51
	→ manuelschneid3r joined	19:51
	← henharm left	19:52
	← durham_ left	19:54
	→ wreed joined	19:56
	← shinnya left	19:57
	← jimi_ left	19:59
	← dendazen left	20:02
	← manuelschneid3r left	20:03
	← jenia left	20:03
	← Mattiaslndstrm left	20:04
	← Es0teric left	20:04
	→ uptime joined	20:06
	→ ivs joined	20:07
	→ thiago joined	20:08
	→ tipyn_ joined	20:08
	← tipyn left	20:08
	← tipyn_ left	20:09
	→ manuelschneid3r joined	20:10
	→ muelleme joined	20:12
	→ Mattiaslndstrm joined	20:12
	← muelleme left	20:16
	← ivs left	20:17
	→ camsbury joined	20:22
	→ Neo4 joined	20:23
	← goodafternoon left	20:23
	→ Es0teric joined	20:24
	← camsbury left	20:27
	← manuelschneid3r left	20:29
	→ nd joined	20:31
	← Mattiaslndstrm left	20:31
	→ fdnick joined	20:34
	→ Cthalupa- joined	20:35
fdnick	hi all, i have a project that uses two files of data that are in total about 300 MB. I desided to stage them and git got very slow. Now i wonder if i should commit them or if it's better to don't use version control on them. Any advice?	20:37
	← Cthalupa- left	20:39
rafasc	fdnick: is this 300MB file binary?	20:39
	→ Cthalupa joined	20:39
rafasc	or is something like a txt database dump	20:39
fdnick	its a csv	20:40
	just text	20:41
	← akushner left	20:41
fdnick	will it stay that slow if i commit and push them, or is it just that slow if it's staged but not yet commited?	20:42
rafasc	Usually I don't notice slowdowns..	20:42
	← freimatz left	20:42
fdnick	i guess i just commit then and hope the best!?	20:43
rafasc	problem with big files, is that each time is changed, git effectively creates a new copy of the file.	20:43
	!balloon	20:43
gitinfo	[!binary] Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions	20:43
rafasc	but in your case it's text, so it will probably be resolved once $git gc is triggered.	20:44
	I would say if you can get away with not putting this db under version control, go with that.	20:45
	→ madewokherd joined	20:45
fdnick	hmm, it would make my life easier to commit them though. It's an online repo, and other people use it too. Another point is that those data files are updated weekly	20:46
	→ Mattiaslndstrm joined	20:47
rafasc	you probably can get away with committing it then.	20:47
	← mario_ left	20:48
	→ sanscoeur joined	20:49
rafasc	the question you need to ask is how much this file changes per week.	20:52
	and do you really need its history baked in the repo forever.	20:53
	← jnavila left	20:56
	→ lafleurdubien joined	20:57
	→ linuxmodder joined	20:59
	→ max3 joined	21:00
	← sanscoeur left	21:03
	→ mikhael_k33hl joined	21:03
	→ sanscoeur joined	21:03
	→ banisterfiend joined	21:04
	→ jrnieder joined	21:04
fdnick	rafasc: it gets extended by about 10000 lines every week	21:04
	→ DaGoaty joined	21:04
mikhael_k33hl	How do I revert something I committed/pushed to a repository?	21:06
	→ relipse joined	21:06
	→ akushner joined	21:06
rafasc	mikhael_k33hl: you can either revert the commits you added. This creates a new commit that undoes what you did.	21:07
	or you need to !rewrite	21:07
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	21:07
rafasc	!revert	21:07
gitinfo	That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	21:07
rafasc	gitinfo: you explain it better than me !botsnack	21:08
gitinfo	gitinfo: Om nom nom	21:08
fdnick	rafasc: thx for the information	21:08
	← fdnick left	21:08
mikhael_k33hl	so I have to do a git revert	21:08
	rafasc: So the commit ID before the latest commit should be the parent right?	21:09
	← banisterfiend left	21:10
_ikke_	mikhael_k33hl: that sounds tautological	21:10
rafasc	no. Git revert doesn't revert your repo up to a point.	21:10
	it reverts the commits you pass to it.	21:10
_ikke_	with reverting meaning creating a new commit that is the reverse of the commit being reverted	21:11
	→ ZyX-I joined	21:11
mikhael_k33hl	so I have to manually undo all the changes?	21:11
rafasc	you can dom something like git revert A..B;	21:12
	→ dysfigured joined	21:12
rafasc	and that will revert all commits in that range. (will create one revert commit per commit reverted)	21:12
	or git revert --no-commit A..B; if you want just one.	21:12
	→ dbear joined	21:15
	← Mattiaslndstrm left	21:16
	→ texinwien_ joined	21:18
	→ dbear1 joined	21:18
	→ porterodoran joined	21:18
	← porterodoran left	21:19
	← dbear1 left	21:19
	← dbear left	21:20
	→ dbear joined	21:23
	← Es0teric left	21:25
mikhael_k33hl	rafasc: I'm sorry but A..B? A being the commit id right?	21:25
rafasc	!dots	21:26
gitinfo	A..B = stuff that happened between A and B (if A and B are related; otherwise refer to "man gitrevisions"), A...B = (a) in history viewers: stuff that isn't in both A and B yet; (b) in "git diff": stuff that happened in B since the two diverged; (c) in "git checkout": the merge base of A and B. "master.." is the same as "master..HEAD" and "..master" is the same as "HEAD..master", and so forth.	21:26
rafasc	mikhael_k33hl: both A and B are commit ids.	21:26
	it's notation for specifying a range of commits.	21:27
mikhael_k33hl	but I just want to revert the latest commit	21:27
	→ Blkt joined	21:27
	→ marlinc joined	21:27
	← dbear left	21:28
rafasc	then yes, git revert <hash of last commit>;	21:28
	git revert HEAD; would be an equivalent.	21:28
	→ btree joined	21:29
	→ TheRuckus joined	21:30
	→ dbear joined	21:31
	→ m00sehead joined	21:32
	← btree left	21:32
	→ pbrewczynski_ joined	21:39
	→ sz0 joined	21:40
	→ jhaenchen joined	21:43
	→ nurdie joined	21:44
	← mikhael_k33hl left	21:46
	→ jstimm joined	21:46
	← jhaenchen left	21:47
	← nurdie left	21:48
	→ tarkus joined	21:50
	→ agowa338 joined	21:54
	→ UTAN_dev_ joined	21:57
	→ wootehfoot joined	21:57
	← m00sehead left	21:58
	→ dendazen joined	21:59
	← akushner left	21:59
	→ guide joined	22:00
	→ akushner joined	22:01
	→ mikemcowie joined	22:02
	→ Mattiaslndstrm joined	22:03
	← jstimm left	22:07
	→ banisterfiend joined	22:10
	→ Karyon joined	22:11
	→ paraxial joined	22:13
	→ m00sehead joined	22:15
	→ esc joined	22:20
	→ al-damiri joined	22:20
	← banisterfiend left	22:20
	→ venmx joined	22:20
	→ SleePy joined	22:22
	← Karyon left	22:28
	→ meLon joined	22:29
	→ nurdie joined	22:29
	← meLon left	22:29
	→ meLon joined	22:29
	→ jstimm joined	22:32
	← dbear left	22:32
	← meLon left	22:33
	← wootehfoot left	22:35
	→ jimi_ joined	22:37
sanscoeur	I wasn't aware of `git checkout A..B`. I'll be using that now. :)	22:37
	Does three dots A...B change any of these other, not log based, semantics? Does `git checkout A...B` still checkout the merge-base?	22:38
	I guess that's the only "other" scenario, so I'll just try it.	22:39
	← venmx left	22:39
	→ meLon joined	22:40
	→ jmux joined	22:40
	← meLon left	22:41
	→ meLon joined	22:41
	→ netlar joined	22:41
	← jimi_ left	22:42
sanscoeur	facepalm. They answer is right there in the comment. I just wasn't reading closely enough. `git checkout A..B` (two dots) doesn't work at all. `git checkout A...B` (three dots) is correct.	22:43
	→ dre_ joined	22:43
	← relipse left	22:44
	→ tomfarr joined	22:46
	← m00sehead left	22:48
	← dreiss left	22:48
	→ Karyon joined	22:50
	← meLon left	22:51
	→ meLon joined	22:51
	← Mattiaslndstrm left	22:51
	→ Mattiaslndstrm joined	22:52
	← Mattiaslndstrm left	22:54
	→ m00sehead joined	22:57
	→ goodafternoon joined	22:58
	→ durham joined	23:00
	← durham left	23:01
	→ durham joined	23:01
	→ alfioemanuele joined	23:03
	← m00sehead left	23:04
	← mel00010 left	23:05
	→ karstensrage joined	23:09
	← linuxmodder left	23:09
	← durham left	23:09
	→ d3r3k joined	23:10
	→ zulutango joined	23:11
	→ armin joined	23:11
	→ durham joined	23:12
	→ orbyt_ joined	23:12
	← ZyX-I left	23:13
	→ _ikke_ joined	23:16
	← durham left	23:17
	← Karyon left	23:18
	→ ferdna joined	23:19
	→ gusnan joined	23:23
rafasc	sanscoeur: git revert A..B should work.	23:23
	→ dreiss joined	23:25
	← nurdie left	23:25
rafasc	the .. vs ... seeing this image can be helpfull: https://stackoverflow.com/a/24186641/2408130	23:25
	→ nurdie joined	23:26
rafasc	sanscoeur: git checkout A...B doesn't make sense, because this denotes a range and you can't checkout multiple commits	23:26
sanscoeur	I prefer `man gitrevisions` (or `git help revisions`) over SO.	23:28
gitinfo	the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html	23:28
sanscoeur	It only checks out the common ancestor.	23:28
rafasc	but you seem to be right.	23:28
gusnan	Is there a simple way to get a list of branch names only separated by a space? I need this for a bash script.	23:29
	← nurdie left	23:30
gusnan	Something like "git branch", but only on one line, and without the "current branch" marker.	23:30
	← wreed left	23:30
sanscoeur	I hadn't thought too hard about it until you said it didn't. (Just took it as a fact/quirk) It does make sense because `A..B` only considers commits in B, not in A. `B..A` is the opposite, commits in A, not in B. And, `A...B` is all commits not in A and B. So, the only way git will find the merge-base is with `A...B`.	23:31
	← dreiss left	23:31
	← jmux left	23:31
rafasc	sanscoeur: I'm not sure if git checkout A..B is defined behaviour.	23:32
sanscoeur	It's not.	23:32
	I tested both.	23:32
rafasc	sanscoeur: does $git checkout deadbeef cafebabe; makes sense to you?	23:33
sanscoeur	I'm not sure where you're going with this, but that would try to checkout a file 'cafebabe' from the ref 'deadbeef'.	23:34
rafasc	As a special case, you may use "A...B" as a shortcut for the merge base.	23:35
	ok, ... is defined as a special case.	23:35
	I was just getting confused because I never came across checkout A...B	23:36
	I usually would just git checkout $(git merge-base A B);	23:36
	I was going to argue that checkout should not work with ranged revisions.	23:37
sanscoeur	same. I just found out about this use case from the gitinfo bot.	23:37
rafasc	yo gitinfo !dots	23:38
gitinfo	A..B = stuff that happened between A and B (if A and B are related; otherwise refer to "man gitrevisions"), A...B = (a) in history viewers: stuff that isn't in both A and B yet; (b) in "git diff": stuff that happened in B since the two diverged; (c) in "git checkout": the merge base of A and B. "master.." is the same as "master..HEAD" and "..master" is the same as "HEAD..master", and so forth.	23:38
sanscoeur	gusnan: the best I can come up with is `git branch --format="%(refname:short)"` I can't find anything that gets it to a single line so `echo $(git branch --format="%(refname:short)")` will do the trick.	23:38
	← _ikke_ left	23:39
	→ sourcream joined	23:40
gusnan	sanscoeur: thanks! actually I found that I could use tr -d '\n' to remove the newline, so that will work fine. thanks again!	23:40
sanscoeur	np.	23:40
	← orbyt_ left	23:40
rafasc	git for-each-ref refs/heads --format='%(refname:lstrip=2)'	23:41
	but same issue, line based instead of spaces.	23:41
	gusnan: sanscoeur command will break if you're on a detached head.	23:43
	cause it will contain an entry saying: (HEAD detached at 5284b7d)	23:43
	which contains spaces.	23:43
sanscoeur	Nice catech.	23:44
gusnan	ahh, thanks	23:44
rafasc	sanscoeur: thanks for bringing the ... to my attention. I've use the gitinfo a couple of times, I guess I never paid enough attention to it.	23:44
gitinfo	rafasc: you're welcome, but please note that I'm a bot. I'm not programmed to care.	23:44
rafasc	you seem to care when I give you !cake	23:45
gitinfo	[!botsnack] Om nom nom	23:45
rafasc	silly bot	23:45
	→ _ikke_ joined	23:46
	→ Lyqyd joined	23:46
	← duderonomy left	23:47
	← texinwien_ left	23:48
	→ texinwien_ joined	23:49
	← akushner left	23:56
	← lafleurdubien left	23:57
	→ jimi_ joined	23:58
	← jimi_ left	23:59

Logs Search ←Prev date Next date→

Channels Documentation