IRCloggy #git 2022-08-09

Provider of IRC logs since 2005.

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

	2022-08-09
	← loulou left	00:08
	→ loulou joined	00:08
	← loulou left	00:08
	→ loulou joined	00:08
	← kaisyu left	00:09
	← softirq left	00:10
	→ off^ joined	00:17
	→ ellobo joined	00:25
	← loulou left	00:27
	→ loulou joined	00:27
	← loulou left	00:27
	→ loulou joined	00:27
	→ remyabel2 joined	00:28
	→ karabaja4 joined	00:29
	→ Gambino joined	00:31
	← zeenk left	00:32
	← Gambino left	00:32
skered	I don't have GIT_PAGER or PAGER set (or in my env.) I have global core.pager set to "less -x4" yet git-diff seems to always use 8 spaces for tabs. Any idea what I'm missing?	00:33
	exporting LESS=FXRx4 seems to fix it but I'm wondering why git doesn't want to use core.pager.	00:34
	The repo doesn't have pager settings either.	00:34
	→ vysn joined	00:36
skered	oh son of gun... it's pager.diff is 'diff-highlighter \| less' so I guess if I wanna use that LESS is my only option...	00:37
	Or just add the -x2 to that.	00:38
	-x4 rather...	00:38
	→ hbautista joined	00:41
	← thebombzen left	00:42
	→ stef204 joined	00:44
	← Sasazuka left	00:45
madprops	what happens if i try to clone but the clone already exists. What I would want is to pull instead. Is there a clone or pull?	00:45
	← bambanxx left	00:46
	← wallabra left	00:47
	→ gumnos joined	00:48
	→ Murr- joined	00:50
	← blaklistd left	00:50
madprops	so maybe this: git -C repo pull \|\| git clone https://server/repo repo	00:51
mackerman	madprops: Try it and see	00:52
	← Murr left	00:52
	Murr- → Murr	00:52
	→ wacko joined	00:53
	← wacko left	00:53
	→ wacko joined	00:53
mackerman	clone is only for copying an entire repo from empty, so it will refuse if the target is not empty	00:54
	A robust shell script might check if a directory is a git repo, with a fast plumbing command like git rev-parse --git-dir	01:02
	And if that returns non zero, clone it or whatever	01:02
	→ smallville7123 joined	01:05
	← umbramalison left	01:06
	→ umbramalison joined	01:06
	→ imp joined	01:10
	← nyah left	01:10
	→ darklambda joined	01:10
	← umbramalison left	01:11
	waterkip_ → waterkip	01:11
	→ umbramalison joined	01:12
	← Torr left	01:12
	ekaj1 → ekaj	01:12
	← ekaj left	01:12
	→ ekaj joined	01:12
	← darklambda left	01:13
	← adanwan left	01:14
	← ellobo left	01:14
	→ adanwan joined	01:14
	→ ellobo joined	01:14
	← FinnElija left	01:16
	→ FinnElija joined	01:16
	← chexum left	01:21
	→ chexum joined	01:21
	→ gildasio joined	01:25
	← loulou left	01:26
	← imp left	01:28
	← rgrinberg left	01:28
	→ Misotauros joined	01:33
	← cdown left	01:35
	← FinnElija left	01:35
	→ FinnElija joined	01:36
	→ tofran joined	01:37
	← FinnElija left	01:38
	→ FinnElija joined	01:39
	→ Xenguy joined	01:42
	→ bambanxx joined	01:42
	← bambanxx left	01:43
	← nivag left	01:44
	→ nivag joined	01:46
	← lemonsnicks left	01:50
	← vysn left	01:50
	→ EternalSunshine joined	01:55
	← mw__ left	01:58
	→ mw_ joined	01:58
	← CarloWood left	02:02
	← Misotauros left	02:03
	← hqdruxn08_ left	02:04
	→ Murr- joined	02:04
	→ hqdruxn08_ joined	02:05
	← Murr left	02:07
	Murr- → Murr	02:07
	← chexum left	02:09
	→ kevr_ joined	02:13
	← kevr left	02:15
	→ finn_elija joined	02:16
	← FinnElija left	02:16
	finn_elija → FinnElija	02:16
	→ wallabra joined	02:17
	kevr_ → kevr	02:17
	→ blaklistd joined	02:20
	→ rgrinberg joined	02:23
	← stef204 left	02:27
	→ Misotauros joined	02:27
	→ av2156 joined	02:28
	jazzy2 → jazzy	02:31
	← Rashad left	02:32
	← adanwan left	02:38
	← millido left	02:38
	→ thiago joined	02:38
	→ adanwan joined	02:39
	→ chexum joined	02:39
	← lucasta left	02:44
	→ lucasta joined	02:45
	→ millido joined	02:54
	→ Coop56 joined	02:54
	→ bdeferme1 joined	02:54
	→ pcarphin020 joined	02:55
	→ Cienisty joined	02:55
	→ Black joined	02:55
	← bluekoopa left	02:56
	→ aindilis_ joined	02:56
	→ njt_ joined	02:56
	→ randm_ joined	02:56
	→ wallabra_ joined	02:56
	→ dansan_ joined	02:56
	→ mgedmin_ joined	02:56
	→ mort0 joined	02:56
	→ GoGi_ joined	02:56
	→ tonitch_ joined	02:56
	→ xkoncek0 joined	02:57
	→ f-chymera joined	02:57
	→ Magician joined	02:57
	→ brw7 joined	02:57
	→ oprypin joined	02:57
	← wallabra left	02:57
	→ ag4ve joined	02:57
	→ Jck_true2 joined	02:57
	→ Soni joined	02:57
	→ leftyfb_ joined	02:57
	→ scottg489 joined	02:57
	→ lukedashjr joined	02:57
	→ Jonno_FTW joined	02:57
	← Jonno_FTW left	02:57
	→ Jonno_FTW joined	02:57
	→ wagle_ joined	02:57
	→ luckman212_ joined	02:57
	→ OMGOMG joined	02:58
	→ kandinski joined	02:58
	→ berndj-blackout joined	02:58
	wallabra_ → wallabra	02:58
	→ tdeo_ joined	02:59
	→ G30RD14 joined	02:59
	→ Ajax1463 joined	02:59
	→ bleb_ joined	02:59
	→ gothicserpent_ joined	02:59
	← gothicserpent_ left	02:59
	→ soifou joined	02:59
	→ wpcarro_ joined	02:59
	→ hexnewbie joined	02:59
	→ zx2c4_ joined	02:59
	→ madduck_ joined	03:00
	→ NightMonkey_ joined	03:00
	→ phryk_ joined	03:00
	→ ripdog_ joined	03:00
	→ Fischmie1 joined	03:00
	→ sitaramc joined	03:00
	→ ludovicchabant_ joined	03:00
	→ qsx joined	03:00
	← Ajax146 left	03:00
	Ajax1463 → Ajax146	03:00
	→ charly_ joined	03:00
	→ gothicserpent_ joined	03:01
	→ lagash joined	03:01
	→ jsatk___ joined	03:01
	→ oztunan_ joined	03:02
	→ jab416171_ joined	03:02
	← gothicserpent_ left	03:02
	→ Vaelatern joined	03:02
	← Vaelatern left	03:02
	→ Vaelatern joined	03:02
	→ Walex2 joined	03:02
	→ cyberpear_ joined	03:02
	→ rudi_s_ joined	03:02
	→ another joined	03:02
	→ pasky_ joined	03:02
	← jsatk__ left	03:03
	← synthmeat left	03:03
	← Coop left	03:03
	← Square2 left	03:03
	← bdeferme left	03:03
	← rapmoc_ left	03:03
	← soifou_ left	03:03
	← lagash_ left	03:03
	← hexnewbie_ left	03:03
	← tkazi left	03:03
	← LuKaRo_ left	03:03
	← njt left	03:03
	← Jonno_FT1 left	03:03
	← oprypin_ left	03:03
	← SoniEx2 left	03:03
	← another\| left	03:03
	← luke-jr left	03:03
	← Vaelatern_ left	03:03
	← glider_ left	03:03
	← qsx` left	03:03
	← OMGOMG_ left	03:03
	← Sazhen86 left	03:03
	← kandinsk1 left	03:03
	← sitaramc_ left	03:03
	← jgn left	03:03
	← comploti1t left	03:03
	← hbjy left	03:03
	← bleb left	03:03
	← ag4ve_ left	03:03
	← luckman212 left	03:03
	← NightMonkey left	03:03
	← scottgy left	03:03
	← berndj left	03:03
	← G30RD13 left	03:03
	← Jck_true left	03:03
	← shailangsa_ left	03:03
	← leftyfb left	03:03
	← brw left	03:03
	← paperino42[m] left	03:03
	← ike[m] left	03:03
	← gothicserpent left	03:03
	← phryk left	03:03
	← Benett left	03:03
	← Wolf480pl left	03:03
	← gitinfo left	03:03
	← yourfate left	03:03
	← ludovicchabant left	03:03
	← slaughter left	03:03
	← charly left	03:03
	← GoGi left	03:03
	← cyberpear left	03:03
	← tonitch left	03:03
	← randm left	03:03
	← catern left	03:03
	← kilobyte_ch left	03:03
	← Walex left	03:03
	← Hash left	03:03
	← madduck left	03:03
	← zx2c4 left	03:03
	← ForeverNoob[m] left	03:03
	← dansan left	03:03
	← rudi_s left	03:03
	← mort left	03:03
	← sepples left	03:03
	← ripdog left	03:03
	← pcarphin02 left	03:03
	← auri left	03:03
	← Koeniz left	03:03
	← aindilis left	03:03
	← teear left	03:03
	brw7 → brw	03:03
	randm_ → randm	03:03
	tdeo_ → tdeo	03:03
	ludovicchabant_ → ludovicchabant	03:03
	njt_ → njt	03:03
	pcarphin020 → pcarphin02	03:03
	luckman212_ → luckman212	03:03
	Jck_true2 → Jck_true	03:03
	mort0 → mort	03:03
	f-chymera → chymera	03:03
	xkoncek0 → xkoncek	03:03
	mgedmin_ → mgedmin	03:03
	G30RD14 → G30RD13	03:03
	bleb_ → bleb	03:03
	cyberpear_ → cyberpear	03:03
	zx2c4_ → zx2c4	03:03
	lukedashjr → luke-jr	03:03
	madduck_ → madduck	03:03
	berndj-blackout → berndj	03:03
	NightMonkey_ → NightMonkey	03:03
	→ tharkun joined	03:04
	→ hbjy joined	03:04
	→ gordonfish joined	03:04
	→ gothicserpent joined	03:04
	pflanze_ → pflanze	03:05
	→ rapmoc joined	03:05
	→ Oddly joined	03:05
	← lucasta left	03:06
	→ glider joined	03:06
	→ paperino42[m] joined	03:06
	→ softirq joined	03:07
	→ sepples joined	03:08
	→ yourfate joined	03:08
	→ teear joined	03:08
	→ tkazi joined	03:09
	→ sebastorama joined	03:09
	→ polyrob joined	03:10
	→ ike[m] joined	03:11
	→ darklambda joined	03:11
	→ Square joined	03:11
	→ slaughter joined	03:11
	→ leah2 joined	03:12
	← darklambda left	03:12
	→ ForeverNoob[m] joined	03:12
	→ Koeniz joined	03:12
	→ Hash joined	03:12
	hololeap_ → hololeap	03:12
	← Yruama left	03:13
	→ complotist joined	03:13
	→ auri joined	03:13
	→ Wolf480pl joined	03:13
	→ jgn joined	03:13
	← ellobo left	03:14
	→ synthmeat joined	03:14
	→ kilobyte_ch joined	03:14
	→ ellobo joined	03:14
	→ LuKaRo joined	03:17
	→ bluekoopa joined	03:17
	→ YuGiOhJCJ joined	03:21
	→ CalimeroTeknik joined	03:21
	← bindu_ left	03:25
	← softirq left	03:26
	→ bindu_ joined	03:26
	→ Gambino joined	03:26
	→ zumba_addict joined	03:30
	→ gitinfo joined	03:30
	ChanServ set mode: +o	03:30
	→ shailangsa joined	03:36
	← YuGiOhJCJ left	03:38
	→ YuGiOhJCJ joined	03:39
	→ lemonsnicks joined	03:39
	← bloody left	03:43
	→ froyo9 joined	03:43
	← froyo left	03:45
	froyo9 → froyo	03:45
	→ antoniomika joined	03:45
	→ daurnimator joined	03:45
	← antoniomika left	03:45
	← Coop56 left	03:49
	← rgrinberg left	03:53
	← lmat left	03:57
	← Gambino left	04:02
	← zebrag left	04:04
	→ Gambino joined	04:09
	← Natrick left	04:11
	→ Guest1776 joined	04:11
	→ CarloWood joined	04:12
	← Gambino left	04:12
	← ColdKeyboard left	04:12
	← Guest1776 left	04:13
	→ ColdKeyboard joined	04:13
	→ Natrick joined	04:17
	→ mihael joined	04:19
	← blaklistd left	04:20
	→ blaklistd joined	04:22
	← GNUmoon2 left	04:23
	← adanwan left	04:26
	← crabbedhaloablut left	04:26
	← gxt___ left	04:26
	← fling left	04:26
	← ghost43 left	04:26
	← chexum left	04:26
	→ crabbedhaloablut joined	04:26
	→ adanwan joined	04:26
	→ chexum joined	04:26
	→ fling joined	04:27
	→ ghost43 joined	04:27
	← remyabel2 left	04:31
	→ loulou joined	04:33
	← loulou left	04:33
	→ loulou joined	04:33
	→ av2156_ joined	04:33
	← EternalSunshine left	04:34
	← luffy left	04:34
	← thiago left	04:35
	← av2156 left	04:36
	→ remyabel2 joined	04:40
	→ hamburgler2 joined	04:42
	← av2156_ left	04:43
	← hamburgler left	04:45
	→ powftw joined	04:49
	→ srinidhi joined	04:51
	→ darklambda joined	04:54
	← tirnanog left	04:59
	← loulou left	05:03
	→ hamburgler3 joined	05:04
	← hamburgler2 left	05:06
	→ catern joined	05:07
	← mihael left	05:11
	← ellobo left	05:14
	→ ellobo joined	05:15
	← fling left	05:16
	→ fling joined	05:17
	← smallville7123 left	05:19
	← srinidhi left	05:20
	← darklambda left	05:23
	← fling left	05:28
	→ fling joined	05:28
	→ Gambino joined	05:30
	→ smallville7123 joined	05:32
	→ madewokherd joined	05:33
	← madewokherd` left	05:35
	→ srinidhi joined	05:42
	← Gambino left	05:46
	→ Gambino joined	05:47
	← jazzy left	05:50
	← daurnimator left	05:50
	→ daurnimator joined	05:52
	← Malin left	05:54
	→ Malin joined	05:55
	→ coot joined	05:55
	← chexum left	05:57
	→ chexum joined	05:57
	→ derfflinger joined	05:58
	← gast0n left	06:01
	← ChmEarl left	06:01
	→ mexen joined	06:05
	← adanwan left	06:06
	→ adanwan joined	06:06
	→ otisolsen70 joined	06:07
	rudi_s_ → rudi_s	06:10
	← remyabel2 left	06:11
	← nasamuffin left	06:19
	← Gambino left	06:20
	← hbautista left	06:20
	→ FH_thecat joined	06:25
	→ Gambino joined	06:26
	→ vanessa joined	06:27
	← YuGiOhJCJ left	06:29
	→ YuGiOhJCJ joined	06:30
	→ rfuentess joined	06:32
	← srinidhi left	06:33
	← crabbedhaloablut left	06:38
	→ crabbedhaloablut joined	06:39
	→ thebombzen joined	06:40
	→ enoq joined	06:42
	→ The_Blode joined	06:42
	→ csm3105 joined	06:43
	→ mrmango17 joined	06:51
	→ benonline joined	06:51
	→ srinidhi joined	06:55
	← realies left	07:04
	→ MajorBiscuit joined	07:05
	→ realies joined	07:06
	← YuGiOhJCJ left	07:06
	→ YuGiOhJCJ joined	07:06
	← crabbedhaloablut left	07:10
	→ crabbedhaloablut joined	07:10
	← MajorBiscuit left	07:11
	→ MajorBiscuit joined	07:11
	→ vysn joined	07:12
	→ iomari891 joined	07:14
	← ellobo left	07:14
	→ ellobo joined	07:14
	← Gambino left	07:15
	→ Mo joined	07:15
	→ Guest4572 joined	07:16
	← gildasio left	07:17
	← crabbedhaloablut left	07:18
	← vanessa left	07:18
	Guest4572 → POLO	07:18
	→ crabbedhaloablut joined	07:18
	→ gildasio joined	07:18
	→ thebombzen_ joined	07:19
	← thebombzen left	07:19
	→ vanessa joined	07:19
	← very_sneaky left	07:21
	← POLO left	07:23
	→ Polo joined	07:24
	← thebombzen_ left	07:26
	→ thebombzen joined	07:26
	→ Gambino joined	07:27
	← Polo left	07:29
	Rh0nda → Rhonda	07:37
	BlessJah_ → BlessJah	07:37
	← Gambino left	07:40
	→ hamburgler2 joined	07:41
	← hamburgler3 left	07:44
	→ benonline81 joined	07:45
	→ rohdef joined	07:47
	← benonline left	07:47
	→ Scalamoosh joined	07:48
rohdef	I got a strange issue. I got some repositories where if I use the git editor I get `Aborting commit due to empty commit message.` and others where it doesn't. Editor works fine, I can confirm that `.git/COMMIT_EDITMSG` exists and has the right contents in both cases, I cannot spot any relevant differences in the configuration. What do I do to fix	07:49
	this?	07:49
	I got a strange issue. I got some repositories where it works if I use the git editor I get `Aborting commit due to empty commit message.` and others where it doesn't. Editor works fine, I can confirm that `.git/COMMIT_EDITMSG` exists and has the right contents in both cases, I cannot spot any relevant differences in the configuration. What do I do	07:50
	to fix this?	07:50
osse	rohdef: is it the same editor you use in all cases?	07:50
rohdef	it is:) I only got a global editor config (set to emacs, but reproced with nano)	07:51
osse	the version of git is the same in all cases?	07:52
	are some of the repos "different" in some way, e.g. they are additional worktrees or submodules	07:52
	→ TomyWork joined	07:52
	→ zer0bitz joined	07:53
rohdef	yes, version 2.34.1 in both cases (just double checked :) ). And to my knowledge no differences apart from the code under control and thus of course also different branches, origin etc. the usual stuff. But apart from that and the weird commit issue no differences that I know of	07:54
osse	diff the output of git config --list --show-origin in a working and non-working repo	07:56
	← Scalamoosh left	07:59
rohdef	https://diffonline.net/YMQaaua6ia weirdness on the aliases oO something is off in that diff, but not sure exactly what's the case though	08:01
	→ dionysus69 joined	08:04
osse	this is on the same pc ?	08:04
rohdef	it is	08:07
osse	so the emacs version is also the same I presume	08:07
	I'm stumped, then.	08:07
	→ Sasazuka joined	08:08
	← gildasio left	08:09
	← bindu_ left	08:09
	← kevr left	08:09
	← FinnElija left	08:09
	← crabbedhaloablut left	08:09
	← fling left	08:09
	→ crabbedhaloablut joined	08:10
	→ gildasio joined	08:10
	→ FinnElija joined	08:10
	→ fling joined	08:10
	→ lpapp joined	08:10
lpapp	hi, why is it not possible to reword the title in the interactive rebase session without having to reword each commit, potentially many, one by one?	08:11
	→ kevr joined	08:11
lpapp	Just wanted to change the prefix in the title of 10+ commits from foo to bar	08:11
	but doing so, save and exit, would still give the old titles back after all.	08:11
osse	rohdef: hmm, in one repo you actually have the editor setup in the repo-local config, in addition to the global. That shouldn't be the cause of the problem, but worth eliminating as a suspect	08:12
	→ bindu_ joined	08:12
	→ feriman joined	08:13
	← Sasazuka left	08:13
	← bindu_ left	08:18
	← Betal left	08:20
	→ bindu_ joined	08:20
	← bindu_ left	08:21
	→ bindu_ joined	08:22
	→ john_johnk joined	08:22
	→ hamburgler3 joined	08:27
	← hamburgler2 left	08:30
	→ Polo joined	08:34
osse	lpapp: i'm guessing because no one bothered to implement it	08:34
	lpapp: here's a hacky solution: git rebase -i --exec 'git log -1 --pretty=%B \| sed "1s/^old/new/" \| git commit --amend --no-edit --file -'	08:35
	using exec in interactive rebase is pretty cool	08:38
lpapp	yes, I was thinking that it could be automated.	08:39
	Thanks. Sounds like a reasonable feature request?	08:39
	→ remyabel2 joined	08:40
lpapp	Although, I guess that the counter-argument is that it is easy to sneak in accidental keypresses in unguarded editors.	08:40
	← mingdao left	08:41
	→ Sasazuka joined	08:42
osse	And people might be confused about only changing the first line. Should the rest be kept or discared?	08:42
	But imo. it should be implemented, and it should modify the first line and keep everything else. It just feels so natural to try	08:42
lpapp	why not kept?	08:43
	I do not see a use case for dropping the rest	08:43
	if you want to drop the rest, reword.	08:43
	→ very_sneaky joined	08:43
lpapp	or introduce a new command in place of reword	08:43
	but it is rarely a good practice not to have a body.	08:43
osse	I don't either, honestly. I just imagine someone expecting to be able to set the commit message in its entirety	08:43
	and complaining about it because the rest of the message was kept without their knowledge, and they git fired or something	08:44
lpapp	put it into the comment below to explain this.	08:44
	and then their expectation can be managed.	08:44
	I would not use this feature very often, but I had to do 10 steps now instead of a column replace in vim :)	08:45
	← benonline81 left	08:45
	→ benonline joined	08:45
lpapp	I thought that the only argument could be the maintenance overhead vs. rare use case.	08:45
	but then git has options and features for rare use cases, too.	08:45
	← YuGiOhJCJ left	08:46
	← Sasazuka left	08:46
	← john_johnk left	08:47
	→ momomo joined	08:48
osse	Oh look, a week ago: https://public-inbox.org/git/pull.1228.git.git.1659422389830.gitgitgadget@gmail.com/#t	08:49
	let's see if this patch makes it	08:49
	not exactly the same we imagined it, but...	08:49
	→ xx joined	08:50
lpapp	nice coincidence, thanks :)	08:50
	[email@hidden.address] sounds dodgy.	08:51
osse	Sounds like a cartoon character to me	08:52
	like inspector Gadget's little helper	08:52
	anyway, it's pretty neat: https://gitgitgadget.github.io/	08:52
	→ mingdao joined	08:53
lpapp	Yep, googled it, thanks.	08:53
	I do not know if reword is really needed to be honest.	08:53
	to me, it sounds like an extra step...	08:53
osse	agreed.	08:54
	→ natrys joined	08:54
lpapp	I would just edit it and that is it	08:54
	and mention in the comment below	08:54
osse	the maintainer didn't like it either. he proposed "retitle" which makes sense.	08:54
	yeah i agree	08:55
lpapp	Also, what if you want to edit + reword	08:55
	you cannot have both	08:55
	I do not like any word for it	08:55
	I think it should be the default	08:55
	what if you want to retitle + edit	08:55
	you have to write retitle first and then edit?	08:55
	sounds over-complicated	08:55
osse	i agree	08:55
lpapp	also, it is not consistent with reorder	08:56
	do we need a reorder keyword to be consistent? I do not think so	08:56
	everything you do is inline.	08:56
	the extra words refer to step-by-step actions	08:57
osse	or both? implement retitle, and have a config flag rebase.allowChangeTitle that controls whether or not it's implied (and thus can be combined with other actions)	08:57
	→ keypushe- joined	08:57
lpapp	to me, the editor session ought to be freestyle, similarly to reorder	08:57
	without further imposition	08:57
	and the keywords ought to refer to the step-by-step actions.	08:58
	← keypusher left	08:58
lpapp	you are in the editor directly to change the content, why keywords	08:58
	your actions determine what you want to do	08:58
Mo	silly: Hi, I got the issue solved with --force: https://github.com/frej/fast-export/issues/9 Thanks. What does it mean that git can't represent a branch with 2 heads? How can hg do that?	08:59
	How can that happen in hg, I guess without renaming the branch I was submitting on 2 machines, and one just had a lost head, while later I was continuing with the other head. So git can't do such a thing?	09:00
	keypushe- → keypusher	09:00
Mo	With --force, I'm not sure now if I lost data at the migration.	09:00
lpapp	if we need an explicit option, retitle is better than reword as that would make the intention clear not to open up the commits for rewording.	09:01
	I am just not sure about the rationale behind the explicit option.	09:01
	also, the commit message ought to explain the rationale behind an extra step	09:02
	(which it currently does not, just explains how to use the option)	09:02
	→ lxsameer joined	09:02
ikke	Mo: in git, a branch is defined by a ref name.	09:03
	→ Sazhen86 joined	09:03
ikke	A ref can only point to a single commit	09:03
Mo	ikke: What means, defined by a ref name? Comparing 'git log --graph --full-history --all' with 'hg glog' looks quite similar, every branch seems to have a head revision. Just in the hg repo, one branch had 2 heads by mistake.	09:06
ikke	I don't know the technical details of hf, but there you have the concept of anymous heads	09:06
	hg*	09:07
Mo	ikke: The scenario here, I like to migrate hg to git, using etc-keeper to maintain different /etc of different machines. Every machine will have its branch name. The branches will never be merged, just cherry-picked between.	09:07
	Is this the right approach or should every machine have it's own repo?	09:07
	I still need to manually merge single files between the machines, I thought using branches makes it easier in one repo.	09:08
	In hg I did it like that.	09:08
ikke	If you don't expect to merge, it can work	09:08
Mo	The cherry picking in hg was a bit uncomfortable, I usually did it like this: fl=/home/mb/.unison/DAV_Common.prf;gvimdiff $fl <(hg cat -r gentoo-mb $f)	09:10
	Maybe this will be easier in git?	09:11
	While -r ... was pointing to the other branch merging from.	09:11
	← Polo left	09:12
	Magician → deepy	09:13
	← ellobo left	09:14
	→ ellobo joined	09:14
	← chexum left	09:15
	→ chexum joined	09:16
	→ Sasazuka joined	09:17
	← mingdao left	09:18
	→ mingdao joined	09:20
	← Sasazuka left	09:21
	Peng__ → Peng	09:25
	→ luffy joined	09:27
	← rohdef left	09:27
	→ kenanmarasli joined	09:28
	← feriman left	09:29
	→ feriman joined	09:30
	← coot left	09:34
	→ cdown joined	09:36
	← G30RD13 left	09:40
	← skapata left	09:40
	→ john_johnk joined	09:42
	→ G30RD13 joined	09:45
	← benonline left	09:48
	→ farzat joined	09:51
	→ gryffus joined	09:54
	← farzat left	09:56
	→ farzat joined	09:57
	← Sazhen86 left	09:58
	← john_johnk left	10:01
	← farzat left	10:04
	→ farzat joined	10:06
	← vishal left	10:06
	→ vishal joined	10:09
	→ Swahili joined	10:15
	← Misotauros left	10:16
	← zumba_addict left	10:16
	← Leonarbro left	10:25
	→ darklambda joined	10:33
	← Noisytoot left	10:37
	→ awmv joined	10:39
	← Mo left	10:41
	→ Mo joined	10:42
	→ Mo_ joined	10:45
	← Mo left	10:48
	← bindu_ left	10:48
	← G30RD13 left	10:49
	→ bindu_ joined	10:50
	another → another\|	10:53
	→ nyah joined	10:56
	← bindu_ left	10:56
	→ bindu_ joined	10:57
	← Mo_ left	10:58
	→ Mo joined	10:58
	← powftw left	10:59
	← darklambda left	11:01
	→ gxt___ joined	11:05
	→ darklambda joined	11:06
	← darklambda left	11:08
	→ Misotauros joined	11:08
	→ rgrinberg joined	11:16
	→ ghost43_ joined	11:20
	← ghost43 left	11:20
	→ darklambda joined	11:32
	→ mjt0k joined	11:33
	← darklambda left	11:33
Mo	I imported a local hg repo into git, then tried to push it to Bitbucket, following https://stackoverflow.com/questions/24294034/how-do-i-push-a-local-repo-to-bitbucket-using-sourcetree-without-creating-a-repo	11:34
	So I did git push -u origin --all	11:34
	What does '-u origin' mean?	11:34
	→ zeenk joined	11:35
	← Murr left	11:37
	→ Murr joined	11:37
gnoo	it'll associate the current branch with the branch name on the remote so if you push to origin/foo while being on bar, git push bar will then push to origin/foo	11:39
	i think	11:39
	→ mbalmer joined	11:41
	→ bambanxx joined	11:44
Mo	After that I have the master branch again and can't remove that.	11:47
	* [new branch] master -> origin/master git branch -d master ..not found. git branch -d origin/master ..not found	11:49
	→ tyson2 joined	11:53
	→ benonline joined	11:57
	← bambanxx left	12:00
	← momomo left	12:02
	→ Wh0 joined	12:03
	→ momomo joined	12:04
	← momomo left	12:06
	→ momomo joined	12:07
	← CalimeroTeknik left	12:12
	→ CalimeroTeknik joined	12:12
	← FH_thecat left	12:14
	→ john_johnk joined	12:16
	→ mncheck joined	12:16
	→ Gaboradon joined	12:17
	→ vitali64 joined	12:22
	← FinnElija left	12:25
	← vysn left	12:25
	→ FinnElija joined	12:26
	← rgrinberg left	12:28
	→ bambanxx joined	12:30
	→ Sasazuka joined	12:37
	← Sulky left	12:39
	← Sasazuka left	12:42
	← Vonter_ left	12:43
	wyre_ → wyre	12:46
	→ bloody joined	12:49
	→ V__ joined	12:49
	← Wh0 left	12:52
	← MajorBiscuit left	12:53
	← csm3105 left	12:57
	← smallville7123 left	12:57
	← john_johnk left	13:00
	→ FH_thecat joined	13:01
FH_thecat	how do I change the color of the commit hash in "git log" ?	13:02
	← off^ left	13:04
osse	I think you have to write your own format :/	13:05
	I can't find a way¨'	13:05
	→ GNUmoon2 joined	13:06
mingdao	osse: https://git-scm.com/docs/git-log	13:07
	→ darklambda joined	13:08
	→ dnh joined	13:09
	← darklambda left	13:09
	→ hstct joined	13:10
osse	FH_thecat: actually, it's affected by this: git config diff.color.commit red	13:10
	had to read the code to find out	13:10
	maybe it's documented somewhere	13:11
	→ Sasazuka joined	13:11
	→ MajorBiscuit joined	13:11
	← ellobo left	13:14
	→ ellobo joined	13:15
	→ Major_Biscuit joined	13:15
	← V__ left	13:15
	→ ThorMojito joined	13:16
	← Sasazuka left	13:16
	← ThorMojito left	13:16
	← MajorBiscuit left	13:16
	→ impermanence joined	13:17
	→ ThorMojito joined	13:17
	→ Gambino joined	13:17
	← ThorMojito left	13:17
	Gambino → Polo	13:22
	← iomari891 left	13:23
	→ cdown_ joined	13:23
	← Xenguy left	13:23
FH_thecat	osse: thank you	13:26
	← cdown left	13:26
	cdown_ → cdown	13:26
	→ wkawka joined	13:26
FH_thecat	and how do I define which fields are printed when I use: git log --pretty=oneline ?	13:26
	now, it does not print date	13:27
osse	try --date	13:27
	leftyfb_ → leftyfb	13:28
	← leftyfb left	13:28
	→ leftyfb joined	13:28
	Celelibi_ → Celelibi	13:28
	→ thiago joined	13:29
	← awmv left	13:30
	← Major_Biscuit left	13:31
	→ causasui joined	13:32
	← bambanxx left	13:32
	→ iomari891 joined	13:34
	→ Major_Biscuit joined	13:35
	← Major_Biscuit left	13:36
	→ llh joined	13:37
	GyrosGei1r → GyrosGeier	13:37
	← momomo left	13:38
	← lllh left	13:38
	→ softirq joined	13:39
	← luffy left	13:39
	← Polo left	13:40
	→ momomo joined	13:40
	→ MajorBiscuit joined	13:43
	→ hbautista joined	13:45
	← busybusybusy left	13:45
	← BUSY left	13:45
	→ Anticom joined	13:46
	← Misotauros left	13:48
	→ Misotauros joined	13:49
	→ theoceaniscool joined	13:49
	← momomo left	13:50
	← SuperLag left	13:50
	→ Sulky joined	13:50
	→ SuperLag joined	13:50
	← SuperLag left	13:51
	→ momomo joined	13:51
	→ coot joined	13:55
	→ SuperLag joined	13:56
	← SuperLag left	13:57
Mo	How do I get the list of tracked files? Like hg status -nacu ? git status --untracked-file=no -s still shows a leading status symbol.	13:57
bremner	git ls-files ?	13:58
	→ mncheckm joined	13:58
bremner	or git ls-tree	13:58
Mo	Thanks.	13:58
	← crabbedhaloablut left	14:00
	→ crabbedhaloablut joined	14:00
	← mncheck left	14:01
	→ cdleonard9 joined	14:01
	cdleonard9 → cdleonard	14:01
	→ SuperLag joined	14:01
	← SuperLag left	14:02
	→ SuperLag joined	14:02
	← SuperLag left	14:03
	← coot left	14:03
	→ gildasio1 joined	14:03
	← GNUmoon2 left	14:04
	← crabbedhaloablut left	14:04
	← bindu_ left	14:04
	← gxt___ left	14:04
	← ghost43_ left	14:04
	→ ghost43 joined	14:04
	→ gxt___ joined	14:05
	→ crabbedhaloablut joined	14:05
	→ bindu_ joined	14:06
	← bindu_ left	14:06
	← Mo left	14:07
	→ zebrag joined	14:07
	→ bindu_ joined	14:07
	← gildasio left	14:07
	→ SuperLag joined	14:07
	← SuperLag left	14:08
	→ coot joined	14:08
	→ SuperLag joined	14:08
	← SuperLag left	14:08
	← derfflinger left	14:09
	→ BUSY joined	14:11
	→ Xaldafax joined	14:11
	← bindu_ left	14:13
	→ SuperLag joined	14:13
	← SuperLag left	14:13
	→ SuperLag joined	14:14
	← SuperLag left	14:14
	→ bindu_ joined	14:14
	← softirq left	14:15
	→ loulou joined	14:15
	← loulou left	14:15
	→ loulou joined	14:15
	← tyson2 left	14:16
	← FH_thecat left	14:17
	→ farzat1 joined	14:18
	← farzat left	14:19
	← enoq left	14:19
	→ SuperLag joined	14:20
	← srinidhi left	14:20
	← bindu_ left	14:20
	→ awmv joined	14:21
	← SuperLag left	14:21
	→ bindu_ joined	14:22
	← cbreak left	14:24
	→ softirq joined	14:24
	← farzat1 left	14:25
	→ madewokherd` joined	14:26
	← softirq left	14:26
	→ cbreak joined	14:26
	→ farzat1 joined	14:27
	→ SuperLag joined	14:27
	← SuperLag left	14:28
	← bindu_ left	14:28
	← madewokherd left	14:30
	→ Wh0 joined	14:31
	→ bindu_ joined	14:33
	→ SuperLag joined	14:33
	→ Sasazuka joined	14:34
	← SuperLag left	14:34
	→ SuperLag joined	14:34
	← feriman left	14:34
	← SuperLag left	14:34
	← Wh0 left	14:37
	→ srinidhi joined	14:38
	← Sasazuka left	14:38
	→ SuperLag joined	14:39
	← bindu_ left	14:39
	← SuperLag left	14:40
	→ SuperLag joined	14:40
	← SuperLag left	14:40
	→ bindu_ joined	14:40
	← bindu_ left	14:40
	← remyabel2 left	14:41
	→ bindu joined	14:42
	→ Murr- joined	14:43
	← Murr left	14:45
	Murr- → Murr	14:45
	→ SuperLag joined	14:46
	← SuperLag left	14:46
	→ SuperLag joined	14:46
	← SuperLag left	14:47
	→ Rashad joined	14:47
	← Sulky left	14:47
	→ Sulky joined	14:48
	← majors left	14:50
	← fcser left	14:50
	← grantbow left	14:51
	← KillerWasp left	14:51
	← mud left	14:51
	→ ChmEarl joined	14:51
	→ _vanessa_ joined	14:52
	→ fcser joined	14:52
	→ SuperLag joined	14:52
	← SuperLag left	14:52
	→ dfg joined	14:53
	← dfg left	14:53
	→ dfg joined	14:53
	→ majors joined	14:53
	→ SuperLag joined	14:53
	← SuperLag left	14:53
	→ grantbow joined	14:53
	→ jazzy joined	14:54
	← vanessa left	14:54
	→ KillerWasp joined	14:55
	← gxt___ left	14:55
	→ gxt___ joined	14:56
	→ SuperLag joined	14:58
	← SuperLag left	14:58
	→ SuperLag joined	14:58
	← SuperLag left	14:59
	→ cdown_ joined	14:59
	→ m0viefreak joined	14:59
	← srinidhi left	15:00
	← xx left	15:00
	← cdown left	15:01
	cdown_ → cdown	15:02
	→ SuperLag joined	15:03
	← SuperLag left	15:03
	→ ThorMojito joined	15:04
	→ SuperLag joined	15:04
	← gildasio1 left	15:04
	← SuperLag left	15:05
	→ gildasio1 joined	15:05
	→ gast0n joined	15:05
	← Anticom left	15:05
	← fling left	15:07
	→ fling joined	15:07
	← FinnElija left	15:07
	→ xx joined	15:07
	← bindu left	15:07
	→ FH_thecat joined	15:08
	→ FinnElija joined	15:08
	→ darklambda joined	15:09
	→ SuperLag joined	15:09
	→ remyabel2 joined	15:09
	← dionysus69 left	15:09
	← gxt___ left	15:09
	→ gxt___ joined	15:10
	→ bindu joined	15:10
	← bindu left	15:10
	← SuperLag left	15:10
	→ SuperLag joined	15:10
	← darklambda left	15:11
	← SuperLag left	15:11
	→ bindu joined	15:12
	← ellobo left	15:14
	→ ellobo joined	15:14
	← fling left	15:15
	→ fling joined	15:15
	→ SuperLag joined	15:15
	← SuperLag left	15:15
	→ ixil joined	15:19
	← iomari891 left	15:20
	← adanwan left	15:21
	← ellobo left	15:22
	→ SuperLag joined	15:22
	→ adanwan joined	15:22
	← SuperLag left	15:23
	→ srinidhi joined	15:23
	← ixil left	15:24
	→ SuperLag joined	15:26
	← SuperLag left	15:26
	→ SuperLag joined	15:28
	← Sulky left	15:29
	← SuperLag left	15:30
	→ SuperLag joined	15:32
	← SuperLag left	15:32
	← rfuentess left	15:33
	→ SuperLag joined	15:35
	← SuperLag left	15:35
	→ iomari891 joined	15:36
	→ SuperLag joined	15:38
	← SuperLag left	15:39
	← farzat1 left	15:40
	→ farzat2 joined	15:40
	→ jamiejackson joined	15:44
	← Rashad left	15:45
	→ gxt joined	15:47
	← gxt___ left	15:48
	← adanwan left	15:50
	← thiago left	15:50
	→ adanwan joined	15:51
	→ SuperLag joined	15:54
	→ thiago joined	15:54
	← SuperLag left	15:55
	→ Sulky joined	15:56
	→ hbautista_ joined	15:58
	→ batrick joined	16:00
	→ SuperLag joined	16:00
	→ arescorpio joined	16:00
	← SuperLag left	16:01
	← hbautista left	16:01
	→ ixil joined	16:01
	→ SuperLag joined	16:02
	← SuperLag left	16:02
	← FH_thecat left	16:03
	→ powftw joined	16:03
	→ Noisytoot_ joined	16:05
	← Noisytoot_ left	16:06
	→ SuperLag joined	16:06
	← ixil left	16:06
	← SuperLag left	16:07
	→ SuperLag joined	16:07
	← srinidhi left	16:07
	← SuperLag left	16:07
	← abu left	16:08
	→ alfredb joined	16:08
	→ Noisytoot_ joined	16:09
	→ SuperLag joined	16:12
	← SuperLag left	16:12
	→ SuperLag joined	16:13
	← SuperLag left	16:13
	→ Sasazuka joined	16:15
	← awmv left	16:16
	→ vysn joined	16:17
	← coot left	16:18
	→ dionysus69 joined	16:18
	→ SuperLag joined	16:18
	Noisytoot_ → Noisytoot	16:18
	← SuperLag left	16:19
	← Sulky left	16:19
	→ SuperLag joined	16:19
	← Sasazuka left	16:19
	← SuperLag left	16:20
	→ lolok joined	16:20
	← jamiejackson left	16:21
	→ feriman joined	16:21
	→ SuperLag joined	16:25
	← SuperLag left	16:25
	← ThorMojito left	16:25
	← hstct left	16:27
	← farzat2 left	16:30
	→ SuperLag joined	16:31
	← SuperLag left	16:31
	→ kenanmarasli_ joined	16:32
	→ farzat2 joined	16:33
	→ SuperLag joined	16:34
	← Swahili left	16:34
	→ Swahili joined	16:35
	→ G30RD13 joined	16:35
	← kenanmarasli left	16:35
	← SuperLag left	16:36
	→ SuperLag joined	16:37
	← SuperLag left	16:37
	← Swahili left	16:39
	← adanwan left	16:39
	← remyabel2 left	16:40
	→ adanwan joined	16:40
	→ Rashad joined	16:40
	→ bambanxx joined	16:41
	→ SuperLag joined	16:42
	← SuperLag left	16:42
	→ SuperLag joined	16:43
	← SuperLag left	16:43
	← farzat2 left	16:43
	→ SuperLag joined	16:48
	← SuperLag left	16:48
	→ SuperLag joined	16:48
	← SuperLag left	16:49
	kenanmarasli_ → kenanmarasli	16:50
	→ ThorMojito joined	16:51
	→ SuperLag joined	16:54
	← SuperLag left	16:56
	← OnkelTem left	16:57
	→ fercell joined	16:57
	← FinnElija left	16:57
	→ Sasazuka joined	16:58
	→ FinnElija joined	16:59
	← Sasazuka left	17:00
	foo_ → foo	17:00
	← ghost43 left	17:01
	→ ghost43 joined	17:01
	→ SuperLag joined	17:02
	← SuperLag left	17:02
	← k1773__ left	17:03
	→ SuperLag joined	17:04
	← SuperLag left	17:04
	→ Sasazuka joined	17:05
	← ghost43 left	17:10
	→ k1773__ joined	17:13
	← k1773__ left	17:13
	→ k1773__ joined	17:13
	→ SuperLag joined	17:13
	← benonline left	17:14
	← SuperLag left	17:14
	← ThorMojito left	17:15
	← vitali64 left	17:15
	← FinnElija left	17:15
	→ FinnElija joined	17:15
	→ ghost43 joined	17:16
	→ forgotmynick joined	17:17
	← iomari891 left	17:17
	→ mud joined	17:19
	→ SuperLag joined	17:20
	← SuperLag left	17:21
	→ coot joined	17:23
	→ iomari891 joined	17:26
	→ SuperLag joined	17:26
	← SuperLag left	17:26
	→ farzat3 joined	17:27
	← wkawka left	17:29
	← froyo left	17:29
	→ rgrinberg joined	17:30
	→ john_johnk joined	17:30
	→ froyo joined	17:31
	← bambanxx left	17:31
	→ SuperLag joined	17:32
	← SuperLag left	17:32
	← Rashad left	17:32
	→ bambanxx joined	17:35
	← lolok left	17:36
	← Jenna64bit left	17:38
	→ Jenna16bit joined	17:40
	→ SuperLag joined	17:40
	→ Rashad joined	17:41
	← SuperLag left	17:42
	→ SuperLag joined	17:43
	← arescorpio left	17:43
	← SuperLag left	17:43
	→ ThorMojito joined	17:45
	← ThorMojito left	17:45
	→ SuperLag joined	17:48
	← SuperLag left	17:48
	→ SuperLag joined	17:49
	← SuperLag left	17:49
	← gryffus left	17:49
	→ SuperLag joined	17:54
	← SuperLag left	17:54
	→ SuperLag joined	17:54
	← SuperLag left	17:55
	← thekingofbandit left	17:55
	→ thekingofbandit joined	17:56
	→ pmcnabb joined	17:59
	→ SuperLag joined	17:59
	← SuperLag left	18:00
	→ SuperLag joined	18:00
	← crabbedhaloablut left	18:01
	← SuperLag left	18:01
	→ crabbedhaloablut joined	18:02
	← mbalmer left	18:03
	← thekingofbandit left	18:04
	← bambanxx left	18:05
	→ SuperLag joined	18:06
	← SuperLag left	18:06
	← G30RD13 left	18:06
	→ SuperLag joined	18:07
	→ bambanxx joined	18:07
	← SuperLag left	18:07
	→ Lord_of_Life_ joined	18:08
	← Lord_of_Life left	18:10
	Lord_of_Life_ → Lord_of_Life	18:10
	→ SuperLag joined	18:13
	← SuperLag left	18:13
	← TomyWork left	18:14
	← iomari891 left	18:18
	→ SuperLag joined	18:19
	← Sasazuka left	18:19
	← john_johnk left	18:19
	← SuperLag left	18:19
	← rgrinberg left	18:20
	← treefrob left	18:21
	← llh left	18:21
	→ SuperLag joined	18:21
	← SuperLag left	18:23
	→ treefrob joined	18:23
	→ llh joined	18:23
	→ Sasazuka joined	18:25
	→ SuperLag joined	18:28
	→ gareppa joined	18:28
	← SuperLag left	18:29
	→ SuperLag joined	18:30
	← SuperLag left	18:30
	→ SuperLag joined	18:34
	→ benonline joined	18:34
	← SuperLag left	18:35
	→ SuperLag joined	18:35
	← SuperLag left	18:35
	→ SuperLag joined	18:40
	← SuperLag left	18:41
	→ SuperLag joined	18:41
	← SuperLag left	18:41
	← gareppa left	18:41
	→ srinidhi joined	18:45
	→ SuperLag joined	18:51
	→ Betal joined	18:51
	← SuperLag left	18:51
	→ SuperLag joined	18:56
	← SuperLag left	18:57
	→ SuperLag joined	18:57
	← bambanxx left	18:58
	← SuperLag left	18:58
	← MajorBiscuit left	18:58
	→ lolok joined	18:59
	→ awmv joined	18:59
	→ MajorBiscuit joined	19:00
	→ rgrinberg joined	19:02
	← natrys left	19:04
	← MajorBiscuit left	19:06
	← bn_work left	19:06
	← causasui left	19:08
	← adanwan left	19:08
	→ SuperLag joined	19:08
	→ adanwan joined	19:08
	← SuperLag left	19:08
	→ darklambda joined	19:09
	→ SuperLag joined	19:12
	← darklambda left	19:13
	← SuperLag left	19:13
	→ SuperLag joined	19:13
	← SuperLag left	19:14
	← Tobbi_ left	19:14
	← Rashad left	19:17
	← lolok left	19:18
	→ SuperLag joined	19:18
	← SuperLag left	19:19
	→ SuperLag joined	19:19
	← SuperLag left	19:20
	← rgrinberg left	19:23
	→ SuperLag joined	19:24
	← SuperLag left	19:24
	← FinnElija left	19:29
	→ YellowSuB joined	19:30
	→ FinnElija joined	19:30
	→ SuperLag joined	19:31
	← SuperLag left	19:31
	← Welp left	19:34
	→ Coop joined	19:34
	← umbramalison left	19:36
	→ umbramalison joined	19:36
	→ SuperLag joined	19:36
	← SuperLag left	19:37
	← Sasazuka left	19:42
	← alfredb left	19:42
	→ SuperLag joined	19:42
	← SuperLag left	19:42
foo	We need to do a clean up of feature branches on our repo... we have a list of tasks with branches. I'm thinking we'll have someone walk through all branches, run git branch --contains feature-branch ... ensure it's in master. If yes, then push a delete to remote since it's done/closed. This will likely be done with dozens of branches. Any other better process here? I don't think there's any way around this	19:45
	→ SuperLag joined	19:48
	← SuperLag left	19:48
	→ Welp joined	19:50
	→ SuperLag joined	19:50
	← SuperLag left	19:50
bookworm	foo: git branch --merged too easy?	19:51
	→ bambanxx joined	19:51
bookworm	remove the current HEAD, assuming that's master and off you go	19:51
foo	bookworm: thanks! Not familiar with that, will check man page :_)	19:52
	:) **	19:52
	← powftw left	19:53
	→ SuperLag joined	19:53
	← SuperLag left	19:54
	← lpapp left	19:56
	→ tyson2 joined	19:57
	→ dcpc007 joined	19:59
	← benonline left	19:59
	→ SuperLag joined	19:59
	→ smallville7123 joined	20:00
	← SuperLag left	20:00
	→ SuperLag joined	20:01
	← SuperLag left	20:01
	← otisolsen70 left	20:01
	→ Sasazuka joined	20:05
	→ SuperLag joined	20:06
	← SuperLag left	20:06
	→ SuperLag joined	20:07
	← SuperLag left	20:08
	← awmv left	20:09
osse	git for-each-ref --format can be used to output shell code	20:10
	it's my favorite code generation tool	20:10
	→ SuperLag joined	20:11
osse	git for-each-ref --format='git push --delete origin %(refname)' --merged master -- refs/heads	20:11
	something like that	20:11
	← SuperLag left	20:11
	→ SuperLag joined	20:11
	← SuperLag left	20:12
	→ awmv joined	20:12
	→ SuperLag joined	20:13
	← SuperLag left	20:15
	→ SuperLag joined	20:16
bookworm	does that automatically remove master from the list	20:17
	← feriman left	20:17
bookworm	because at least the porcelain layer considers git branch --merged on master to have merged master	20:17
	which is somewhat true, but you really don't want to delete that ;)	20:17
	answer is no... there goes master :D	20:18
osse	only if you actually run the code :p	20:18
	→ gunner joined	20:25
	← bambanxx left	20:26
	→ bambanxx joined	20:27
	→ arescorpio joined	20:29
	← tomhg left	20:45
	← ghost43 left	20:49
	→ ghost43 joined	20:50
osse	git for-each-ref --format='%(if:equals=refs/heads/master)%(refname)%(then)git push --delete origin %(refname)%(end)' --merged master -- refs/heads	20:52
	dansan_ → dansan	20:53
	← vysn left	20:54
	→ cdown_ joined	20:54
	→ skapata joined	20:55
	← skapata left	20:55
	→ skapata joined	20:55
	← gunner left	20:55
	← cdown left	20:56
	cdown_ → cdown	20:56
	← ghost43 left	20:56
	→ ghost43 joined	20:57
	← bambanxx left	20:58
	→ remyabel2 joined	20:59
	→ SuperL4g joined	21:01
	← SuperL4g left	21:02
bookworm	either the syntax is really wonky or you're missing a not there	21:02
	of is git speak for "else" then after an if block?	21:03
	← arescorpio left	21:05
	← SuperLag left	21:05
	→ causasui joined	21:06
	→ SuperLag joined	21:06
	→ bambanxx joined	21:06
	→ cdown_ joined	21:06
	← awmv left	21:07
	← gildasio1 left	21:08
	← FinnElija left	21:08
	← ghost43 left	21:08
	← crabbedhaloablut left	21:08
	← fling left	21:08
	← gxt left	21:08
	→ awmv joined	21:08
	→ ghost43 joined	21:08
	→ crabbedhaloablut joined	21:08
	→ fling joined	21:08
	← bambanxx left	21:08
	→ gxt joined	21:08
osse	bookworm: i'm missing the not, yes	21:08
	→ gildasio1 joined	21:08
	→ FinnElija joined	21:08
	← cdown left	21:10
	cdown_ → cdown	21:10
bookworm	your off your ballgame today... what's happening?! You're one of my favorite shell golfers in git land!	21:11
	You can't just leave me hanging!	21:11
	→ Ajax1469 joined	21:11
	← zer0bitz left	21:11
bookworm	you're, even	21:12
	← Ajax146 left	21:13
	Ajax1469 → Ajax146	21:13
	→ bambanxx joined	21:15
	→ throstur joined	21:26
jmcantrell	I have a repo that contains subdirectories that I've been using subtrees to manage. I need to edit a specific commit in one subtree's history to include a missing file. How would I do that?	21:26
osse	i'm playing computer games at the same time! :O	21:26
	→ GNUmoon2 joined	21:28
	← EvilDMP left	21:29
	← awmv left	21:33
	← Jong left	21:33
	→ rgrinberg joined	21:35
	← Sasazuka left	21:37
	← millido left	21:39
	→ Sasazuka joined	21:40
	← t0mm13b_ left	21:43
	→ t0mm13b joined	21:43
	→ Jong joined	21:44
	← crabbedhaloablut left	21:47
	→ crabbedhaloablut joined	21:47
	← throstur left	21:50
	← t0mm13b left	21:51
	→ t0mm13b joined	21:53
	→ acebrianjuan joined	21:53
	→ masber joined	21:54
	← impermanence left	22:02
	← gildasio1 left	22:03
	← Welp left	22:04
	→ gildasio1 joined	22:05
	→ OnkelTem joined	22:05
	← bambanxx left	22:13
	← OnkelTem left	22:14
	← coot left	22:14
	← rgrinberg left	22:14
	→ bambanxx joined	22:14
	→ rgrinberg joined	22:15
	→ coot joined	22:16
	→ anom joined	22:17
	← coot left	22:18
	→ coot joined	22:18
	← dionysus69 left	22:18
	← szkl left	22:19
	← rgrinberg left	22:19
	← theoceaniscool left	22:20
	→ zumba_addict joined	22:21
	← srinidhi left	22:28
	← zumba_addict left	22:30
	← transhumanist left	22:31
	→ transhumanist joined	22:32
	← coot left	22:32
	← nyah left	22:36
	→ throstur joined	22:37
	← zeenk left	22:38
	← loulou left	22:38
	→ hello-smile6 joined	22:40
	→ ThorMojito joined	22:41
	← baltazar left	22:50
	← hello-smile6 left	22:51
	→ baltazar joined	22:52
	→ hello-smile6 joined	22:53
	← smallville7123 left	22:53
	→ ThorMojito1 joined	22:54
	← dnh left	22:56
	← bambanxx left	22:56
	← ThorMojito left	22:56
	→ junebug joined	22:59
	← masber left	23:01
	→ anom94 joined	23:01
	→ anom71 joined	23:03
	← anom left	23:04
	← ThorMojito1 left	23:04
	→ bambanxx joined	23:04
	→ Leonarbro joined	23:04
	→ _apex_ joined	23:05
	← mingdao left	23:06
	← anom94 left	23:06
	→ mingdao joined	23:09
	← junebug left	23:10
	← anom71 left	23:10
	→ junebug joined	23:10
	→ srinidhi joined	23:12
	→ vdamewood joined	23:14
	→ luffy joined	23:14
	← junebug left	23:20
	→ junebug joined	23:21
	← dcpc007 left	23:24
	← rhe left	23:25
	→ loki_val joined	23:27
	← crabbedhaloablut left	23:27
	→ Xenguy joined	23:27
	→ anom joined	23:28
	→ ThorMojito joined	23:28
	← bambanxx left	23:33
	→ arescorpio joined	23:34
	← anom left	23:34
	→ bambanxx joined	23:34
	← junebug left	23:34
jmcantrell	is there a way to get a list of all the patterns that git is ignoring?	23:35
	→ rhe joined	23:36
	→ anom joined	23:36
	→ Hi-Angel1 joined	23:36
	← bambanxx left	23:37
	← Murr left	23:37
	→ Murr joined	23:37
	← GNUmoon2 left	23:38
	→ junebug joined	23:38
	→ GNUmoon2 joined	23:38
Hi-Angel1	I have a weird problem I have no idea what to even think of. My "author name" is wrong. lol, easy, right, just change a `user.name` and it's done. Well, no: I tried setting user.name, both globally and not to the correct one; heck, I even tried to AMEND the commit by passing a parameter "--author="my actual name", but I still see in commits the incorrect name	23:38
	Wow	23:38
	← acebrianjuan left	23:40
Hi-Angel1	If it's a bug, it is a weird one, because you would expect it to be some random characters, but it is an actual string — another way of writing my name that I used long ago.	23:40
	So weird	23:40
	→ bambanxx joined	23:41
anom	Hi-Angel1 You might be referring to changing authors of old commits. Am I correct about this? Or does the error continue even on new commits?	23:42
Hi-Angel1	anom, it continues on new commits, and I can't change it on old commits by passing `--author` as well	23:42
	← The_Blode left	23:43
	← junebug left	23:45
	← kenanmarasli left	23:45
	← ThorMojito left	23:46
	← arescorpio left	23:46
	→ hello-smile618 joined	23:47
	hello-smile6 → Guest8830	23:47
	hello-smile618 → hello-smile6	23:47
	gildasio1 → gildasio	23:48
	→ junebug joined	23:48
Hi-Angel1	I tried `strace`ing git and making strace print all text the app reads, and the output has no that weird name, only the correct one. So weird…	23:49
	It's like git takes it out of pure air, out of nowhere. How is that even possible	23:50
thiago	to change the author in an existing commit, you need --reset-author	23:50
	← Guest8830 left	23:50
thiago	otherwise, commit --amend does not update it	23:50
	interesting, I can't find where it's finding my surname in the strace output either	23:53
	but since I know where it's coming from, I can actually find it	23:54
Hi-Angel1	thiago, I'm pretty it worked for me before. Either way, `reset-author` is incompatible with `author`, and when I removed author and left just reset-author, name is still left unchanged	23:54
thiago	it comes in a file descriptor sent over from nscd, which is mmap()ed to memory, so there's no read() call	23:54
Hi-Angel1	Hmmm	23:54
thiago	recvmsg(3<socket:[2537429]>, {msg_name=NULL, msg_namelen=0, msg_iov=[{iov_base="passwd\0", iov_len=7}, {iov_base="\310O\3\0\0\0\0\0", iov_len=8}], msg_iovlen=2, msg_control=[{cmsg_len=20, cmsg_level=SOL_SOCKET, cmsg_type=SCM_RIGHTS, cmsg_data=[4</var/lib/nscd/passwd>]}], msg_controllen=20, msg_flags=MSG_CMSG_CLOEXEC}, MSG_CMSG_CLOEXEC) = 15	23:54
	mmap(NULL, 217032, PROT_READ, MAP_SHARED, 4</var/lib/nscd/passwd>, 0) = 0x7f6cc922e000	23:55
Hi-Angel1	thiago, did you set a strace option `-s 9999` to have more text printed? I do find in strace output `git` reading my actual name (the one it for some reason refuses to use)	23:56
thiago	yep	23:56
	but I know this is where it's coming from	23:56
	it's getting my surname from /etc/passwd and it clearly isn't opening the file	23:56
	so this file descriptor passed from nscd must be it	23:56
	grep: /var/lib/nscd/passwd: binary file matches	23:57
	do you see the correct name in the output of getent passwd?	23:57
	← junebug left	23:58
Hi-Angel1	thiago, well, the `getent passwd` has incorrect one because that's my login name. But why would git use it, the login name can be pretty much anything. Also, the login name isn't capitalized, but commit author though matches login name, but is capitalized	23:59
thiago	getent does open /etc/passwd here, as it should	23:59
	because it's the default	23:59

Logs Search ←Prev date Next date→

Channels Documentation