IRCloggy #git 2020-01-12

Provider of IRC logs since 2005.

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

	2020-01-12
	← sebastian_nielse left	00:04
	→ seebyr joined	00:07
	→ _homme__ joined	00:08
	← theorangeone left	00:11
	← sbeyer left	00:11
	→ theorangeone joined	00:11
	← emmanuelux left	00:12
	→ storrgie joined	00:13
	← Jitta left	00:15
	ChanServ set mode: +o	00:17
	→ jimender2 joined	00:17
	Eugene changed the topic to: Welcome to #git \| First visit? https://gitirc.eu \| Current stable version: 2.24.1 \| Getting "cannot send to channel"? /msg gitinfo .voice \| This channel is logged: https://gitirc.eu/log \| Hadn't been for merge-eyed Joe, Ida been commited long time ago	00:17
	Eugene kicked Eugene (de-op)	00:17
	→ Eugene joined	00:17
	→ Jitta joined	00:18
	→ sidetrack joined	00:21
	← sgn left	00:22
	← Jitta left	00:26
	→ oatmealraisin joined	00:28
	← __salt left	00:33
	← lacrymology left	00:36
	→ sgn joined	00:36
	← mr_ab left	00:41
	← crose left	00:44
	← learningc left	00:52
	← plexigras left	01:03
	→ jhulten joined	01:04
	← fatpointer left	01:09
	→ fatpointer joined	01:10
	→ Wetmelon joined	01:13
	← arekm left	01:17
	→ arekm joined	01:17
	→ pandakekok9 joined	01:18
	→ learningc joined	01:20
	← mowcat left	01:21
	→ fragamus joined	01:22
	← owlscientist left	01:30
	← jhulten left	01:31
	← seebyr left	01:31
	→ owlscientist joined	01:33
	← owlscientist left	01:33
	← fragamus left	01:35
	← Onionnion left	01:40
	← sauvin left	01:42
	← CryptoDavid left	01:48
	→ sauvin joined	01:52
	← oatmealraisin left	01:52
	→ oatmealraisin joined	01:54
	← Lunatrius left	01:56
	← im0nde left	01:58
	→ im0nde joined	01:59
	← Aquazi left	02:00
	→ Onionnion joined	02:02
	← cd left	02:03
	→ pandakek1k9 joined	02:04
	→ Lunatrius joined	02:05
	← pandakekok9 left	02:05
	pandakek1k9 → pandakekok9	02:05
	← F0rTex left	02:06
	→ F0rTex joined	02:08
	← MylesBorins left	02:09
	→ MylesBorins joined	02:10
	→ duderonomy joined	02:20
jrm	rewt: Thanks again. I'll try gitk.	02:20
	← Arcaelyx left	02:26
	→ sentinal8473 joined	02:28
	← duderonomy left	02:29
	← davispuh left	02:30
	→ jhulten joined	02:31
	← sentinal8473 left	02:32
	→ davispuh joined	02:33
	→ sperry joined	02:35
	← finalbeta left	02:38
	→ YuGiOhJCJ joined	02:39
perrier-jouet	I want to add my pass .password-store to my dotfiles, should I create the pass git init inside dotfiles ?	02:39
	← pandakekok9 left	02:40
	→ dedowsdi joined	02:40
	← dedowsdi left	02:41
	→ dedowsdi joined	02:42
	← sidetrack left	02:43
	← Narrat left	02:44
	→ sidetrack joined	02:45
	← davispuh left	02:45
	→ Vampire0 joined	02:45
	← Vampire0 left	02:45
	→ davispuh joined	02:45
	← ChrisLane left	02:46
	→ finalbeta joined	02:48
	→ duderonomy joined	02:48
	← Wetmelon left	02:48
	→ ChrisLane joined	02:48
	← duderonomy left	02:50
	← sidetrack left	02:50
	→ lankanmon joined	02:51
	→ sidetrack joined	02:54
	→ bambanx joined	02:54
	← sidetrack left	02:55
	→ sidetrack joined	02:55
	→ _salt joined	02:57
	→ Narrat joined	02:58
	→ pandakekok9 joined	03:00
	← Narrat left	03:01
	← jstein left	03:01
	← hendry left	03:03
	→ duderonomy joined	03:06
	← duderonomy left	03:09
	← nowhere_man left	03:09
	← Cabanossi left	03:10
	← CCR5-D32 left	03:11
	→ duderonomy joined	03:11
	← jhulten left	03:11
	→ nowhere_man joined	03:12
	← duderonomy left	03:12
	→ SwiftMatt joined	03:13
	→ Cabanossi joined	03:18
	→ duderonomy joined	03:21
	← Stoot left	03:22
	← duderonomy left	03:22
	← SwiftMatt left	03:25
	→ duderonomy joined	03:29
	midnightmagic → midnight	03:31
	← lagothrix left	03:32
	→ lagothrix joined	03:32
	fatpointer → \v	03:36
	\v → r\	03:36
	r\ → \R\	03:36
	→ mArtale joined	03:37
	← \R\ left	03:37
	← mArtale left	03:37
	→ SwiftMatt joined	03:38
	← sborza left	03:39
	→ sborza joined	03:39
	← Heirlung left	03:40
	→ Heirlung joined	03:41
	→ jhulten joined	03:48
	← terrehbyte left	03:50
	← Heirlung left	03:51
	→ natechan joined	03:53
rewt	jrm, np... I just had another look at the repo, and am a bit confused; originally you said 7fc3de has a problem but 7025d3 does not... but the contents of these commits are identical... could there be a fragile test during the build that's causing the problem?	03:56
	← jhulten left	03:59
	→ Heirlung joined	03:59
	← _homme__ left	04:00
	← SwiftMatt left	04:01
	→ Newami joined	04:02
	pandakekok9 → pandakekok9\|away	04:03
	← Newami left	04:05
	← Anthaas left	04:16
	→ Anthaas joined	04:19
	→ donofrio joined	04:22
	→ hendry joined	04:30
	← sidetrack left	04:31
	← chrisml left	04:32
	→ chrisml joined	04:33
	← altendky left	04:33
	← Bigcheese left	04:34
	← gjnoonan left	04:34
	← Jeebiss left	04:34
	← OvermindDL1 left	04:34
	← nuxdie left	04:34
	← pandakekok9\|away left	04:34
	← prit left	04:34
	← blowry left	04:34
	← Manouchehri left	04:34
	← KennosiS left	04:34
	→ blowry joined	04:34
	← timwis left	04:34
	→ Manouchehri joined	04:35
	→ timwis joined	04:35
	→ Bigcheese joined	04:35
	→ nuxdie joined	04:35
	→ gjnoonan joined	04:35
	→ altendky joined	04:36
	← Fenhl left	04:36
	→ OvermindDL1 joined	04:36
	→ Jeebiss joined	04:36
	← no_maam left	04:36
	← madduck left	04:37
	→ Fenhl joined	04:37
	→ madduck joined	04:37
	→ prit joined	04:37
	← _flow_ left	04:38
	← kanzure left	04:38
	→ kanzure joined	04:39
	← AllenJB left	04:39
	← SCHAPiE left	04:39
	← Helenah left	04:39
	→ AllenJB joined	04:40
	→ SCHAPiE joined	04:41
	← hagabaka left	04:41
	→ Helenah joined	04:41
	← FutureTense left	04:42
	→ hagabaka joined	04:42
	→ KennosiS joined	04:42
	→ jackedin joined	04:43
	→ pandakekok9\|away joined	04:45
	pandakekok9\|away → pandakekok9	04:46
	← natechan left	04:46
	← jackedin left	04:53
	← CycoCid left	04:54
	← sperry left	04:54
	→ sperry joined	04:55
	← duderonomy left	04:59
	→ duderonomy joined	04:59
	→ pks_ joined	05:02
	← pks left	05:03
	pks_ → pks	05:03
	← jetchisel left	05:03
	← dartmouthed left	05:06
	→ _flow_ joined	05:07
	→ no_maam joined	05:07
	← duderonomy left	05:09
	← _flow_ left	05:11
	→ sidetrack joined	05:12
	← nowhere_man left	05:12
	→ _flow_ joined	05:18
	← donofrio left	05:21
	← FH_thecat left	05:27
perrier-jouet	hi all	05:34
	anyone here ?	05:34
	pandakekok9 → pandakekok9\|away	05:37
	→ inkbottle joined	05:37
	← zebrag left	05:39
	← sperry left	05:39
	← jleclanche left	05:40
	→ FH_thecat joined	05:47
	← FH_thecat left	05:51
	→ FH_thecat joined	05:52
	← bvdw left	05:55
	→ bvdw joined	05:56
	← kent\n left	05:58
	→ kent\n joined	05:59
	pandakekok9\|away → pandakekok9	06:02
	← g4570n left	06:04
	← doug16k left	06:08
	→ doug16k joined	06:09
	← FH_thecat left	06:24
	← gordonfish left	06:24
	← pandakekok9 left	06:24
b0nn	no	06:25
	→ FH_thecat joined	06:26
	→ gordonfish- joined	06:28
	gordonfish- → gordonfish	06:29
perrier-jouet	please help	06:29
	am trying yo setup this https://woile.github.io/gopass-cheat-sheet/	06:30
	I want my .password-store in github, how can I add the submodule ? on github I have already github/user/keys.git	06:31
	← sidetrack left	06:39
	→ duderonomy joined	06:45
	→ darkbit joined	06:51
	← cbreak left	06:54
	← bambanx left	06:55
	← begui left	06:55
	→ beastDiv_ joined	06:55
	→ cbreak joined	06:56
kreyren	is there some way for git to handle mirroring? For example making one remote for two URIs ?	07:01
	kreyren is trying to mirror github with gitlab	07:02
kreyren	(2-way mirror)	07:02
	← FH_thecat left	07:03
kreyren	` git remote set-url –add –push origin URI` ?	07:05
	← gpanders left	07:06
	→ FH_thecat joined	07:07
	→ jamm joined	07:11
	→ Wetmelon joined	07:13
	← Anthaas left	07:14
	→ danielzgtg joined	07:14
	→ Anthaas joined	07:15
kreyren	`git sync-remote URI1 URI2` ?	07:16
	← Wetmelon left	07:19
	→ g00s joined	07:26
	← ferdna left	07:32
	← orbyt_ left	07:33
	← jimender2 left	07:45
	→ robh71 joined	07:51
	→ gitter1234 joined	07:54
	← FH_thecat left	07:54
	→ FH_thecat joined	07:55
	← FH_thecat left	07:55
	→ dviola joined	07:57
	← g00s left	08:00
	→ Elundia joined	08:02
	→ g00s joined	08:02
	→ thebope joined	08:03
	→ Heirlung- joined	08:03
	← Elundia left	08:03
	→ Elundia joined	08:03
	← jamm left	08:04
	← Heirlung left	08:04
	← Elundia left	08:04
	Heirlung- → Heirlung	08:04
	→ Elundia joined	08:04
	← Elundia left	08:04
	→ Elundia joined	08:06
	← thebope left	08:07
	← milkt left	08:08
	← beastDiv_ left	08:08
	→ beastDiv_ joined	08:13
	→ milkt joined	08:13
	← Elundia left	08:13
	→ Elundia joined	08:16
	← kjartan left	08:23
	→ kjartan joined	08:25
	yawkat` → yawkat	08:28
	← Elundia left	08:28
	→ Elundia joined	08:29
	→ FH_thecat joined	08:33
	← oatmealraisin left	08:34
	← FH_thecat left	08:36
	→ FH_thecat joined	08:37
	→ iNs_ joined	08:38
	← FH_thecat left	08:38
	← duderonomy left	08:39
	← iNs left	08:39
	← jesopo left	08:42
	→ sidetrack joined	08:50
	← learningc left	08:52
	→ feriman joined	08:53
	← sidetrack left	08:54
	← mat001 left	08:55
	← cbreak left	08:56
	→ cbreak joined	08:58
	← ChrisLane left	08:59
	→ ChrisLane joined	09:00
	← Goplat left	09:06
	← tsujp left	09:14
	→ learningc joined	09:20
	→ crose joined	09:24
	→ Noti joined	09:25
	← Noti left	09:29
	pd098 → pd064	09:31
	pd064 → pd066	09:31
	pd066 → pd068	09:31
	→ Mattiaslndstrm joined	09:31
	pd068 → pd070	09:31
	pd070 → pd072	09:31
	→ javashin joined	09:32
	← javashin left	09:34
	→ javashin joined	09:34
	→ wootehfoot joined	09:38
	← Elundia left	09:40
	→ fphilipe joined	09:40
	→ duderonomy joined	09:42
	← JanC left	09:43
	→ misuto5 joined	09:43
	← bleb left	09:43
	→ JanC joined	09:44
	← misuto left	09:45
	← JanC left	09:46
	← darkbit left	09:46
	→ JanC joined	09:46
	→ bleb joined	09:48
	→ yamppa joined	10:00
	← veegee left	10:00
	→ veegee joined	10:03
	→ dionysus69 joined	10:04
j416	perhaps a one-way sync would be better	10:04
	you could of course do the former (set-url [...]), but it'd of course assume you're the only one working on the project	10:06
	kreyren: ^	10:06
	→ mowcat joined	10:15
	→ paws_ joined	10:17
kreyren	j416, it's expected that multiple people are working on it	10:18
	→ Elench joined	10:22
	→ Noti joined	10:22
	gitinfo set mode: +v	10:23
	← feriman left	10:24
	← g00s left	10:26
j416	there are probably articles about this	10:26
	spontaneously I'm thinking cron -> clone --mirror + push	10:27
kreyren	j416, i found few but none that mensions 2-way mirror	10:27
j416	but of course you'd need to remove anything that might have been added to the mirror, too	10:27
kreyren	about cron i would rather want something that triggers on commit	10:27
j416	I don't think 2-way sync is sane	10:27
kreyren	why not?	10:27
j416	how would you handle a conflict?	10:28
kreyren	if everything works as it should it should never conflict since it would basically be changing the same repository	10:28
j416	there are two repositories.	10:28
	if it were the same you wouldn't need a sync	10:29
	why do you need 2-way sync?	10:29
kreyren	it's one repository that i want available on two hosters with same commits, merge requests and issues	10:29
	well multiple hosters	10:29
j416	in that case git won't be enough	10:30
kreyren	j416, what do you propose?	10:30
j416	you'd need to build something using the APIs of github and gitlab	10:30
	→ FH_thecat joined	10:30
j416	I propose you pick just one.	10:30
kreyren	for issues i assume, trying to resolve the git part now	10:31
	(issues including merge requests)	10:31
j416	if you must have two, I'd suggest that either one is a read-only copy, at the very least for the main branch(es).	10:31
kreyren	i want both writable	10:32
j416	.s/either//	10:32
	kreyren: have fun with that	10:32
kreyren	since my contributors like to use github and gitlab	10:32
j416	the only way I can think of is if you set up something in front of these that you push to	10:33
	that will in turn push to both, so that they can be kept read-only	10:33
	but you can't have write access to two separate things and expect there to be no conflicts	10:34
	→ theoceaniscool joined	10:35
	← fphilipe left	10:48
	→ fphilipe joined	10:50
	→ tsujp joined	10:52
kreyren	conflicts would be resolved in MR itself in that case no? Neither of them won't approve merge if it's conflicting	10:57
	← fphilipe left	11:06
j416	I don't mean code conflicts	11:07
	I mean repo conflicts.	11:07
kreyren	eh?	11:07
j416	what if two people create a new branch by the same name and push their code to it, one to github and one to gitlab?	11:07
	how is the sync going to know which one wins?	11:08
kreyren	Shoudn't happend since i'm the only one managing branches	11:08
j416	so then why do you need push access at all	11:08
	work with one remote and mirror to the other	11:09
	→ moo joined	11:09
j416	if I understand correctly, you pull changes from people and then you push those to branches on the remote?	11:10
	others don't push directly to github/gitlab	11:10
	← tsujp left	11:10
j416	sounds like an odd workflow, but if that's the case, I suppose the risk of conflict would be quite small indeed.	11:11
	← wootehfoot left	11:11
j416	a script to fetch everything from one repo and push it all to the other (clone --mirror + subsequent fetches), and vice versa.	11:12
	you'd still need to think about how to handle conflicts, though.	11:12
kreyren	to simplify it i have contributors using gitlab only and i have other contributors using only GitHub so i want to satisfy both for development	11:12
j416	kreyren: are they pushing their branches directly to each remote?	11:13
	← st-gourichon-fid left	11:13
kreyren	Since they are working on the same project so it has to work like it's one hoster	11:14
j416	kreyren: then tell me, how are you managing these branches to avoid two different branches of the same name being pushed to each respective remote?	11:14
kreyren	for example i might get 5 commits from gitlab and 2 from github per day	11:15
	i don't resolve branches since i will be the only one making them	11:15
j416	then how do they push commits?	11:15
kreyren	planing to make a logic for it in the future	11:15
	using `git` through merge requests	11:15
j416	merge requests of whaat	11:15
	whaat*	11:15
	.. sorry, a key is acting up	11:16
	kreyren: I'm trying to tell you that they are pushing branches.	11:16
kreyren	merge requests of contributions and new functions	11:16
	they are using their forks to push merge requests to be approved and check by QA	11:16
j416	this is irrelevant	11:17
	they are pushing commits by using branches	11:17
kreyren	in their forks?	11:17
	ah i see if contributor makes the same branch used in the merge request as source?	11:17
j416	so they _don't_ have write access to these repos like you mentioned?	11:18
	→ Stoot joined	11:18
kreyren	they do have write access as long as it passes QA then it gets auto-approved	11:18
j416	then you have no control over branch naming	11:18
	→ dartmouthed joined	11:19
j416	but if the only workflow is merginb by pull requests, perhaps that does avoid branch name conflicts	11:19
	→ tsujp joined	11:19
j416	I still would recommend you stick to one provider	11:19
kreyren	contributor's branch naming for their forks should be irelevant though github has a way to recognize the branch per repository afik	11:19
	*afaik	11:20
j416	in a fork yes	11:20
kreyren	sticking to one provider is not an option..	11:20
j416	why?	11:20
	you don't need to tell me, just think about it	11:20
kreyren	since my contributors wont use github and vice-versa	11:20
j416	it'd simplify things a lot	11:20
	why won't they?	11:21
kreyren	one is owned by microsoft and the other has terrible gui	11:21
j416	and why do you need to spend hours on end managing this monster?	11:21
kreyren	to satisfy their need and follow fsf phylosophy to support everything	11:21
j416	what if they want to contribute using svn	11:22
	another sync?	11:22
	what you are asking for is of course doable (anything is), but it won't be without issues	11:22
kreyren	another thing to be resolved but svn is not important atm	11:22
j416	...	11:22
	I've given you a few alternatives, anyway.	11:23
	I'm off o/	11:23
kreyren	i'm going to lower priority for it then and investigate later, write a backend for it if needed O.o	11:23
	i have the power of regex so nothing is impossible! :p	11:24
	← tsujp left	11:27
	← dionysus69 left	11:28
	→ dionysus69 joined	11:31
	→ nowhere_man joined	11:32
	→ pandakekok9 joined	11:36
	← Heirlung left	11:38
	→ fphilipe joined	11:41
	← javashin left	11:42
	← dviola left	11:44
	→ tsujp joined	11:45
	→ systemhalted joined	11:50
	← bvdw left	11:55
	→ bvdw joined	11:55
	← Mattiaslndstrm left	11:56
	← systemhalted left	11:57
	← magic_ninja left	11:57
	→ magic_ninja joined	12:00
	→ Mattiaslndstrm joined	12:01
	→ neunon joined	12:02
	→ lioh joined	12:02
lioh	hi. i am using gitweb and have realized that my html blob is not displayed in the correct charset (umlauts are not rendered correctly): https://my.freedombox.rocks/gitweb/LinuxKurs.git/blob_plain/HEAD:/Installation.html	12:03
	do you have any idea what can be the root cause?	12:03
	→ royal_screwup21 joined	12:04
CarloWood	Is there a way to run git submodule foreach --recursive ... and return a non-zero value when any invocation of the script returns a non-zero value, but not stop when that happens? I want the script to be run on all submodules, and then return 0 only when all of them returned 0.	12:04
j416	kreyren: you might want to check how large open-source projects handle similar situations, having their own preferred way to accept patches and then one or more additional ways.	12:04
	kreyren: some have just one way of course, but some have several.	12:04
	→ omnireq_ joined	12:06
	→ pks_ joined	12:07
	→ Brainium joined	12:07
j416	lioh: either your file is of the wrong encoding, your html isn't specifying the encoding correctly, or something simply ignores all of it	12:08
	kreyren: it looks to me like the file itself is UTF-8.	12:08
	← pks left	12:08
	pks_ → pks	12:08
j416	kreyren: if you set your browser to UTF-8, it displays correctly	12:09
	← omnireq left	12:09
j416	not kreyren; sorry	12:09
	lioh: ^	12:09
	lioh: the server specifies a response header: Content-Type: text/html; charset=ISO-8859-1	12:10
	that's likely it.	12:10
	← vishal left	12:10
	← maxwilliamson left	12:11
	→ vishal joined	12:13
	→ maxwilliamson joined	12:13
	← omnireq_ left	12:13
	→ omnireq_ joined	12:14
	← _xor left	12:16
lioh	j416, so you think it is most likely an webserver configuration issue (apache2 in this case)?	12:17
	or something that has to be configured in gitweb? because when i put the same html file just in a webroot on the same server it is displayed correctly.	12:17
	i was thinking it might have to do with the encoding settings in the gitweb configuration but changing e.g. $fallback_encoding does not result in anything visible.	12:19
j416	lioh: web server yes	12:26
	dunno if gitweb sets headers; maybe it does.	12:26
	← tryte left	12:26
	→ tryte joined	12:27
lioh	looks like. because adding AddDefaultCharset UTF-8 to the apache conf does not seem to have any effect on gitweb	12:27
nedbat	is there one command that will do the same as: git checkout some-branch; git reset --hard some-commit # that is, make some-branch refer to some-commit	12:28
	← FH_thecat left	12:30
CarloWood	git branch [--track \| --no-track] [-f] <branchname> [<start-point>]	12:30
	git branch -f some-branch some-commit	12:30
	Well	12:30
	that doesn't checkout	12:30
	it just moves your branch 'tag' to some-commit.	12:31
	so, you will lose anything that some-branch was pointing to before, if that wasn't merged into some other branch.	12:31
nedbat	CarloWood: no, that's perfect. i didn't need to have it checked out, that's just how i new to move it. thanks.	12:32
	← shored left	12:33
	→ shored joined	12:34
	→ Heirlung joined	12:35
	← Mattiaslndstrm left	12:35
	qsx` → qsx	12:37
	← omnireq_ left	12:38
	→ FH_thecat joined	12:39
lioh	j416, ah, it's the mime lookup which sets it. going to define an own mime table now.	12:40
	→ omnireq joined	12:44
	→ sebastian_nielse joined	12:47
sebastian_nielse	If I modify a file out of many already staged, and then commit. What is then in the snapshot created by me commiting? Is it only the modified file, or is it all the files in my directory?	12:48
osse	sebastian_nielse: what is staged is commited	12:50
sebastian_nielse	Okay, so all the files in my working tree (directory) is commited and thus in the newly created snapshot?	12:51
_ikke_	sebastian_nielse: What is part of the snapshot is what is staged\	12:51
	any change not staged won't be part of the next commit	12:52
sebastian_nielse	Okay, got it, thanks :)	12:52
kreyren	j416, do you know about such project? usually the mirror is self-hosted and mirrored	12:52
	← yonder left	12:53
	← BtbN left	12:54
	→ BtbN joined	12:58
	← omnireq left	13:01
	→ omnireq joined	13:01
	← qsx left	13:07
	→ qsx joined	13:09
	← matheusmoreira left	13:11
	→ matheusmoreira joined	13:12
	← Noti left	13:12
	← qsx left	13:15
	→ qsx joined	13:16
perrier-jouet	hi all	13:20
	I am trying to store my password store in github, am following this https://woile.github.io/gopass-cheat-sheet/	13:23
	I have a anyone here use pass with github ?	13:24
	← gitter1234 left	13:30
	→ jstein joined	13:32
	← royal_screwup21 left	13:33
	→ greatgatsby joined	13:34
	→ pandakek1k9 joined	13:35
	← pandakekok9 left	13:36
	pandakek1k9 → pandakekok9	13:36
	→ jesopo joined	13:37
	← beastDiv_ left	13:38
	→ algiss joined	13:40
	← algiss left	13:41
	→ algiss joined	13:41
	← devster31 left	13:42
perrier-jouet	nm	13:45
	→ devster31 joined	13:45
eqw	1. Is it true that the only place where the name of branch is stored(connected to particular commits) is .git/refs/heads/<branchname> ? 2. If so, does that mean that it is not possible to say whether commits were made to particular branch if they are parent to a merge commit?	13:56
nedbat	eqw: it's true that commits don't record the branch they were a part of (unlike mercurial)	13:57
osse	eqw: you can tell which parent leads to a commit, which is often good enough	13:59
	← quackgyver left	14:01
_ikke_	eqw: recent mailing list post about that: https://lore.kernel.org/git/CAEW0o+jV+r1UMZReRXa3g_fyqCYxHTVYVf6pWvjB7_isofbBaw@mail.gmail.com/	14:07
	→ mat001 joined	14:08
	→ beastDiv_ joined	14:13
	→ st-gourichon-fid joined	14:13
	→ g4570n joined	14:18
cbreak	eqw: branches in git are transient pointers	14:21
	they are not part of history, and not recorded anywhere	14:21
	other than default commit messages of merge commits :D	14:21
dzho	yay for merge commits then ;-)	14:22
	I know a lot of people hate them, is why I bother to mention that	14:22
	not so much to irritate them as to offer a counterpoint	14:22
sebastian_nielse	Branches in git are lightweight moveable pointers* (just read that from git pro)	14:24
	I am reading about branches atm	14:24
	CarloWood made an alias 'git upsh' which is the same 'git push' but first UPdates the Submodule gitlinks before pushing.	14:26
	→ jetchisel joined	14:26
dzho	nice	14:27
CarloWood	:)	14:27
	https://gyazo.com/67bec0d3ff7ed68117ff1387a5543044	14:31
	So, I did a commit in submodule cwds there and then a 'git upsh' in the root of the project. The result is kinda like as if cwds was just a normal subdirectory.	14:33
	← Eryn_1983_FL left	14:35
	← pandakekok9 left	14:35
	← storrgie left	14:43
	→ storrgie joined	14:45
	← algiss left	14:49
	→ thebope joined	14:52
	→ BluesKaj joined	14:53
	← BluesKaj left	14:54
	← jaziz left	14:55
	← sweatsuit left	14:56
	← thebope left	14:57
	→ satifant joined	14:58
	← dedowsdi left	15:00
	← R2robot left	15:00
	→ Trieste joined	15:01
	→ R2robot joined	15:05
	→ Eryn_1983_FL joined	15:05
	→ sweatsuit joined	15:07
	← dionysus69 left	15:07
	← dskull left	15:08
	← misuto5 left	15:08
	→ misuto joined	15:12
	→ dimi1947 joined	15:21
	← dsnow left	15:22
	← xcm left	15:25
	→ dsnow joined	15:25
	→ xcm joined	15:25
	← Belliash left	15:27
	→ thebope joined	15:30
	← sebastian_nielse left	15:31
jrm	rewt: Sorry, commit 7fc3def builds fine. I'm not sure how I screwed that up. Commit 2f073d8 fails to build, but 747b6c3 is fine, so it seems 2f073d8 introduces the problem.	15:32
	→ Belliash joined	15:33
	← thebope left	15:38
	← Helenah left	15:39
	→ alich joined	15:40
	→ Helenah joined	15:40
	→ gpanders joined	15:43
	→ wondiws joined	15:46
wondiws	is it possible to remove the last commit from git on github (that has been pushed)?	15:46
Habbie	!force	15:48
gitinfo	[!force_push] If you need to overwrite the history of a remote git repository (be carefull, see !rewrite), you can do so with `git push --force-with-lease`. Note that the remote server may reject this. See man git-config and search for receive.denyNonFastForwards. Best practice is for upstream servers to denyNonFastForwards.	15:48
	→ sperry joined	15:48
	← sperry left	15:49
	→ sperry joined	15:49
	→ jleclanche joined	15:50
	→ gitter1234 joined	15:54
	← alich left	15:55
	← R2robot left	15:57
	← apetresc left	15:58
	→ apetresc joined	16:02
	→ natechan joined	16:02
	→ dskull joined	16:04
	← Brainium left	16:08
	→ feriman joined	16:10
	← apetresc left	16:11
	→ alich joined	16:15
	→ apetresc joined	16:15
	← storrgie left	16:16
	→ storrgie joined	16:18
	← theoceaniscool left	16:27
	← JanC left	16:30
	→ JanC joined	16:30
	← feriman left	16:32
	→ emmanuelux joined	16:32
	→ feriman joined	16:33
	→ Newami joined	16:33
	← Newami left	16:35
	← moo left	16:37
	→ wootehfoot joined	16:37
	→ st-gourichon-f joined	16:38
	← st-gourichon-fid left	16:38
	← wondiws left	16:45
	← nowhere_man left	16:48
	← lioh left	16:56
	→ R2robot joined	16:58
	← tsujp left	16:59
	→ royal_screwup21 joined	17:00
	→ Mattiaslndstrm joined	17:02
	← xSke left	17:05
	→ xSke joined	17:06
	→ sbeyer joined	17:09
	→ fstd_ joined	17:10
	← Murr left	17:11
	→ Murr joined	17:14
	← fstd left	17:15
	fstd_ → fstd	17:15
	→ sidetrack joined	17:15
	→ theoceaniscool joined	17:19
	← Trieste left	17:20
	→ Trieste joined	17:20
	→ begui joined	17:22
	← royal_screwup21 left	17:27
	← sidetrack left	17:28
	→ mad_moses joined	17:29
mad_moses	hi	17:29
	→ sidetrack joined	17:30
mad_moses	I added within my git project a submodule with the command "git submodule add urltorepsoitory.git". Is it possible to rename the added root submodule folder? I tried to use "git mv" but it is creating a new folder and addind into the folder a submodule. Thats not what I wanted	17:31
	← natechan left	17:32
	→ natechan joined	17:34
	→ _xor joined	17:36
	← sidetrack left	17:47
	→ sidetrack joined	17:47
	← bvdw left	17:55
	→ bvdw joined	17:56
	→ Goplat joined	18:00
	→ jackedin joined	18:05
	→ thebope joined	18:07
	← kleisli left	18:10
	← thebope left	18:12
	→ simpl_e joined	18:18
CarloWood	git mv should just work	18:19
	← xcm left	18:19
	← gpanders left	18:20
	→ xcm joined	18:20
CarloWood	If 'git submodule add https://urlto/repository.git' cloned stuff into 'repository', then you can do 'git mv repository newname'	18:20
	Provided you don't have an ancient git version.	18:20
	→ owlscientist joined	18:21
	← natechan left	18:27
gitter1234	Isn't there an easier way than rebasing if you want to force send a file back to a commit? Like in just one command? Rebasing takes several plus often tends to run into conflicts.	18:28
	→ royal_screwup21 joined	18:29
gitter1234	Such a feature would make life so much easier!	18:29
_ikke_	gitter1234: I don't think so	18:30
CarloWood	I have no idea what you mean.	18:30
_ikke_	Moving a change to an earier commit	18:30
CarloWood	What means 'force send a file back to a commit' ... I mean, a commit is basically a hash of the whole repository, so what does that have to do with a file - and how can you send a file heh to it?	18:31
gitter1234	I was just speaking in layman's terms CarloWood	18:31
CarloWood	Ok, so reverting a file back to what it was in an earlier commit.	18:31
gitter1234	Yup	18:31
CarloWood	I'd just copy it over.	18:32
gitter1234	Or wait, no	18:32
CarloWood	Make a new commit thus.	18:32
gitter1234	I don't wanna	18:32
	← sidetrack left	18:32
CarloWood	A commit is a snapshot of the WHOLE repository - there isn't such a thing as going back for a single file - its the whole repository or nothing.	18:33
gitter1234	You're making things too complicated	18:33
	You know what I mean, don't you?	18:33
CarloWood	yes	18:33
	If you change just one file back, but nothing everything - then the result is a new repository state (snapshot) that never existed before. So, there is no related hash and you will just have to create it with a new commit.	18:34
	→ lucasb joined	18:34
	← milkt left	18:34
CarloWood	Hence, get the old file, copy it over the existing file and commit that.	18:34
	but not* everything	18:34
	→ sgen joined	18:35
CarloWood	It's not complicated - it's how you have to get used to think about sha1's and git :/	18:35
	→ milkt joined	18:36
gitter1234	I've made changes to a file. Those changes are too tiny and insignificant to make a new commit out of, and in addition, they ought to be part of a commit I made last night.	18:36
	Rebasing gets tedious after a while. If there just was a way to cheat :) I'm aware it would rewrite my entire history but that's okay, I haven't shared my repo with anybody so.	18:37
	Tedious is the wrong word. Tiresome, sorry	18:37
	← dimi1947 left	18:40
	→ fragamus joined	18:41
CarloWood	Sounds like that is exactly what you (actually) want though: rewrite the history.	18:41
	So, that would be a rebase... Personally I don't give a *** about the history; just don't look at it lol.	18:42
gitter1234	lol	18:42
	← Stoot left	18:42
CarloWood	You won't laugh anymore after looking at this: https://gyazo.com/165aaab1d7740cdc181a0d1a31b20195	18:43
	And that isn't even spagethi! lol	18:43
gitter1234	I guess. but rebasing is like 7 steps. and that's without the merge conflicts somebody with my luck is guaranteed to run into	18:43
	→ orbyt_ joined	18:43
gitter1234	Oh dear :D	18:44
CarloWood	I work differently when I work on a project that has a team ;).	18:44
	Here it's just me... so I use git as a glorified backup system	18:45
	← milkt left	18:45
	← bvdw left	18:46
gitter1234	hehe me too	18:46
	I was just about to profess my newfound love for Git before I thought of this feature request	18:46
	→ bvdw joined	18:47
	← bvdw left	18:47
CarloWood	Right now I need to figure out how to get hunter to build a package that needs autotools :/ sigh	18:47
gitter1234	Is there a way to get heard among the main git developers? I guess posting an issue over at https://github.com/git/git?	18:48
	→ plexigras joined	18:49
	← qsx left	18:50
	→ qsx joined	18:50
	→ southernvg joined	18:51
	← Elench left	18:52
	→ Narrat joined	18:54
	← qsx left	18:55
	← Trieste left	18:57
	→ qsx joined	18:58
	→ Trieste joined	18:58
gitter1234	Something along the lines of "git rebase --off-she-goes <file> <hash>" maybe? As opposed to "git stash && git rebase --interactive '<hash>^' && <change pick => edit> && <apply changes manually> && git add <file> && git commit --amend && git rebase --continue && git stash pop && <merge conflict that requires manual intervention> && git rebase --continue && git stash pop && <still a conflict> && <go to IRC and beg for	18:58
	help>"	18:58
	→ bvdw joined	18:58
	← bvdw left	19:00
	→ bvdw joined	19:01
	← xcm left	19:02
	→ xcm joined	19:02
	→ troulouliou_div2 joined	19:07
	← _salt left	19:11
	← shored left	19:12
	→ shored joined	19:13
	← troulouliou_div2 left	19:14
	→ CryptoDavid joined	19:17
	← royal_screwup21 left	19:17
	→ thebope joined	19:17
	← duderonomy left	19:18
	→ Fernando-Basso joined	19:19
	← Kaivo left	19:19
	← FH_thecat left	19:20
	→ brettgilio joined	19:21
	← jackedin left	19:22
	→ jackedin joined	19:26
	← jackedin left	19:27
	→ troulouliou_div2 joined	19:28
	→ jackedin joined	19:28
	← jackedin left	19:29
	→ jackedin joined	19:30
	← troulouliou_div2 left	19:38
	← jackedin left	19:39
	→ jackedin joined	19:39
	← theoceaniscool left	19:47
	→ vicfred joined	19:48
	← fragamus left	19:49
	← southernvg left	19:50
	→ natechan joined	19:50
	← Mattiaslndstrm left	19:51
	→ southernvg joined	19:52
	→ FH_thecat joined	20:02
	→ bvdw8 joined	20:05
	← bvdw8 left	20:06
	→ bvdw4 joined	20:06
	← bvdw left	20:06
	bvdw4 → bvdw	20:06
	→ fragamus joined	20:07
	← thebope left	20:08
	← xSke left	20:08
	→ thebope joined	20:09
	← mad_moses left	20:10
	→ howdoi joined	20:10
	→ mad_moses joined	20:11
	← sgen left	20:11
	← southernvg left	20:11
	→ duderonomy joined	20:12
	← YuGiOhJCJ left	20:13
	← thebope left	20:13
	→ southernvg joined	20:13
	→ thebope joined	20:17
	← duderonomy left	20:17
	← mad_moses left	20:17
	← natechan left	20:22
cpackham	gitter1234: the main communication with the git devs is via the mailing list [email@hidden.address] (note you don't need to subscribe to the list just send an email to that address) some do hang out here occasionally and I believe there is a #git-devel IRC channel as well	20:23
gitter1234	Cool thanks cpackham	20:24
	← mat001 left	20:25
cpackham	@gitter	20:25
	→ cd joined	20:26
gitter1234	:D	20:26
	→ spacefrog joined	20:27
cpackham	gitter1234: skiming the IRC logs I think what you might be after is `git add; git commit --fixup=<sha1-of-commit-to-fix>; git rebase --interactive --autosquash`	20:27
	I use that all the time to juggle commits to clean them up before they get published	20:28
gitter1234	nice	20:29
	really nice!	20:29
	seems i got a similar answer from the mailinglist.. thanks a lot man!	20:29
	cpackham: curious, are there any other neat commands like that that you tend to use all the time?	20:30
	← jedsharp left	20:30
	→ sgen joined	20:31
	← brettgilio left	20:31
cpackham	`git rebase --interactive` is definitely the command I use heavily. It means I can commit away and sort things out into a coherent series later. I also have an alias that does `git log --oneline --graph @{u}..` that shows me the things that I haven't published	20:33
	Basically it tells me the "safe" range I can rebase	20:33
gitter1234	hmmm	20:33
	← southernvg left	20:34
gitter1234	very cool!	20:35
	→ gpanders joined	20:35
	← jackedin left	20:37
	→ jackedin joined	20:37
gitter1234	cpackham: regarding `git add; git commit --fixup=<sha1-of-commit-to-fix>; git rebase --interactive --autosquash` - the guy from the mailinglist mentioned git stash but only if necessary, before the rebasing.. when is it necessary to rebase?	20:38
	← beastDiv_ left	20:39
	→ beastDiv_ joined	20:39
	← heftig left	20:40
	→ heftig joined	20:41
gitter1234	i should probably read the docs at this point :-)	20:41
	again tho i really appreciate the the help!	20:41
cpackham	There are two times you might want to rebase. The first is when there are upstream changes that you want to incorporate but you also want to keep a linear history so you do a `git fetch && git rebase` which is the long way of saying `git pull -r`	20:42
	← thebope left	20:43
cpackham	The second is when you've been hacking away committing as you go and you want to turn the pile of commits into a coherent series to publish	20:43
	→ dionysus69 joined	20:43
cpackham	That's when I use `git rebase --interactive HEAD~N` (where N is the number of commits back you want to juggle)	20:44
	→ fphilipe_ joined	20:44
	← beastDiv_ left	20:45
cpackham	Using the interactive mode I can re-arrange the commits to tell a story or squash commits together so they are one logical change. You can even split big commits up again to follow the one logical change per commit rule.	20:46
	There is the usual caveat about re-writing history	20:46
	In particular you don't want to rebase changes that have been published	20:47
	← fphilipe left	20:47
	← sgen left	20:47
	← jackedin left	20:47
	← stux\|RC-only left	20:49
	→ natechan joined	20:50
cpackham	Stashing has it's place. Its effectively the same as `git commit -a -m"temp"; git pull -r; git reset HEAD^`	20:51
	It's not a silver bullet that will help you avoid conflicts	20:51
	If there is a conflict it needs to be resolved one way or the other.	20:52
	→ gareppa joined	20:52
gitter1234	wow	20:52
	← rcartax left	20:53
gitter1234	im falling more and more in love with git for every day that passes :)	20:53
	a coherent history is indeed what im after...	20:54
	→ CarlFK joined	20:57
gitter1234	came across this the other day, i believe the same principle applies to ones git repos: CLEAN YOUR ROOM - Powerful Life Advice \| Jordan Peterson: https://www.youtube.com/watch?v=Vp9599kwnhM	20:57
	especially mine..	20:57
	thanks again man! i gotta go take a break been staring at the screen for 15 hours straight. peace	20:58
	→ Phylock joined	20:59
	→ untermensch joined	21:01
	→ duderonomy joined	21:02
	← gareppa left	21:04
	← gpanders left	21:09
	→ stux\|RC-only joined	21:09
	→ mat001 joined	21:09
j416	kreyren: https://go.googlesource.com/go for example	21:11
	← duderonomy left	21:12
	→ _salt joined	21:13
	← mat001 left	21:13
	→ duderonomy joined	21:14
	→ royal_screwup21 joined	21:15
	← untermensch left	21:16
	→ untermensch joined	21:16
	← iam730 left	21:18
	← R2robot left	21:19
	→ salsa20 joined	21:19
	→ iam730 joined	21:20
	← alich left	21:20
	→ R2robot joined	21:20
	→ Soni joined	21:20
Soni	so given that I have a repo with two repos inside it, do I just manually rebase/cherry-pick the stuff I wanna split off?	21:21
	like, I had a project, then I made a side project to help me with that project	21:22
	now I wanna bring that side project into its own project with its own repo	21:22
	but I'd like to keep the full history	21:22
	(also not gonna touch the main project's commits. those stay.)	21:22
	← royal_screwup21 left	21:24
j416	Soni: when you say repo with repo inside it, do you mean that it's a submodule?	21:26
Soni	no	21:27
j416	please clarify	21:27
Soni	I mean I have commits for two different projects in the same repo	21:27
j416	so it's just one repo	21:27
Soni	in the same branch, even	21:27
	j416: I have 2 logical repos on one physical repo	21:27
j416	I don't know what that means.	21:27
Soni	eh w/e	21:28
j416	ok	21:28
Soni	anyway how do I split a file off a branch?	21:28
j416	whatever.	21:28
Soni	with full history for that file	21:28
	clone the repo, git rebase the whole thing?	21:29
_ikke_	Soni: so you have 2 projects in one git repo I guess?	21:30
Soni	yeah	21:30
	→ Stoot joined	21:30
osse	Soni: git filter-branch	21:31
	← simpl_e left	21:32
	← natechan left	21:37
	→ fphilipe joined	21:38
	← fphilipe_ left	21:41
	← untermensch left	21:41
Soni	@_@	21:42
	I... think I'll go with the rebase/manual approach	21:42
	→ Jackneill joined	21:46
	← feriman left	21:48
	→ beastDiv_ joined	21:48
	→ Kulrak joined	21:51
	← beastDiv_ left	21:53
	← CarlFK left	21:55
	← Jackneill left	21:58
	← Trieste left	22:03
osse	if there are many commits that might be problematic	22:03
	→ yonder joined	22:03
	→ Trieste joined	22:04
	← wootehfoot left	22:04
	→ gioyik joined	22:04
	→ sidetrack joined	22:05
	→ beastDiv_ joined	22:10
	→ kleisli joined	22:10
	→ natechan joined	22:13
	← JanC left	22:13
	→ JanC joined	22:14
	→ misuto8 joined	22:15
	→ royal_screwup21 joined	22:15
	← fragamus left	22:16
	← Xiti left	22:16
	← webstrand left	22:17
	→ webstran- joined	22:17
	webstran- → webstrand	22:18
	← dmc left	22:19
	→ null1337 joined	22:19
	→ polyzen joined	22:19
	← misuto left	22:20
	← Inline left	22:24
	← Phylock left	22:24
	→ davispuhh joined	22:26
	← gioyik left	22:27
	← davispuh left	22:28
	→ mat001 joined	22:31
	→ mat001_ joined	22:31
	→ jackedin joined	22:34
	→ wootehfoot joined	22:36
	← mat001 left	22:36
	→ Wetmelon joined	22:36
	→ Phylock joined	22:38
	← Phylock left	22:43
	← Fernando-Basso left	22:46
	← natechan left	22:46
	← plexigras left	22:47
	→ sgen joined	22:48
	→ safe joined	22:49
	← greatgatsby left	22:49
	← sgen left	22:50
	→ sgen joined	22:50
	← Khisanth left	22:51
	← dionysus69 left	22:52
	← salsa20 left	22:55
	← veegee left	22:59
	→ b1101 joined	22:59
	← b1101 left	22:59
	→ gioyik joined	23:00
	→ b1101 joined	23:00
	← royal_screwup21 left	23:00
b1101	can someone assist me in getting to this commit within the source. https://github.com/pond3r/ggpo/pull/52/commits/86673e87b9b9040d6e119699ae6948dd8dfc9f2c#	23:01
	→ veegee joined	23:04
	→ Khisanth joined	23:04
	→ Newami joined	23:05
	← sidetrack left	23:06
	← Newami left	23:06
cbreak	b1101: what's wrong with checking it out?	23:07
b1101	I think there are 12 commits that I require total	23:08
	in order to get to that one with all the changes, to make it build as the page says.	23:08
cbreak	that is one commit	23:08
b1101	so just checkout followed by the hash?	23:09
cbreak	yes. the newest commit	23:09
b1101	because that didn't work. I think I'm on the wrong branch then	23:09
	even though it's supposed to be on master	23:10
cbreak	that pull request is not merged yet	23:10
	it's not on master	23:10
b1101	remote master? or where is it	23:11
cbreak	Shugyousha:linuxpr	23:11
	it's in a different repository	23:11
	but pull requests often get a new ref too	23:11
	so do a git ls-remote thatrepo	23:12
	and you might see a pr 52 ref	23:12
	(if you see one, git fetch and check that one out)	23:12
	← sgen left	23:13
	← gitter1234 left	23:13
	→ sidetrack joined	23:14
	← sidetrack left	23:14
	→ sidetrack joined	23:14
b1101	cbreak: ls-remote "http link of repo" ? because that didn't work	23:15
cbreak	I use ssh	23:15
	but if you want to use https, sure, that'll work just as well	23:15
	→ natechan joined	23:16
	← polyzen left	23:16
	← Wetmelon left	23:17
b1101	was able to clone that repo and checkout that commit. thanks	23:18
	→ dmc joined	23:22
	← xcm left	23:27
	→ xcm joined	23:27
	← Decobus left	23:28
	→ dedowsdi joined	23:29
	→ ozzloy joined	23:34
	→ Wetmelon joined	23:34
ozzloy	i have a commit from another contributor. i'd like to break it up into smaller commits, all with the same author and date as the original. is there a way i can do something like 'git commit --date=use-date-from-commit-abc123 --author=use-author-from-commit-abc123' ?	23:36
Timvde	ozzloy: --reuse-message takes commit message, author and timestamp	23:38
cbreak	-C	23:38
ozzloy	awesome!	23:38
Timvde	If you use --reedit-message, git will put you in vim so you can still edit the message	23:38
ozzloy	kk	23:39
Timvde	-C like cbreak says is --reuse-message, -c is reedit-message, fwiw	23:39
ozzloy	thanks Timvde and cbreak	23:39
	→ TheJollyRoger joined	23:41
	← duderonomy left	23:42
	← g4570n left	23:42
	→ g4570n joined	23:42
	← jackedin left	23:44
	→ jackedin joined	23:45
	← jackedin left	23:46
	→ jackedin joined	23:47
	→ buckworst joined	23:49
	← natechan left	23:50
	→ natechan joined	23:51
	← buckworst left	23:54
	← bvdw left	23:55
	→ bvdw joined	23:56
	← sidetrack left	23:56

Logs Search ←Prev date Next date→

Channels Documentation