IRCloggy #git 2022-01-31

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-01-31
	← causasui left	00:00
	← epolanski left	00:00
	→ causasui joined	00:01
	← Soni left	00:03
	← causasui left	00:06
	→ odoood joined	00:09
	← odoood left	00:10
	← nyah left	00:10
	→ odoood joined	00:10
	→ hinderaker joined	00:12
	→ causasui joined	00:13
	← clime left	00:15
foo	git log -S "some line"	00:16
	← odoood left	00:16
foo	That should find "some line" if it's been deleted, right?	00:16
	Per man page, I think yes, but I'm not seeing it	00:16
	← causasui left	00:18
	← kenanmarasli left	00:19
	→ dtux joined	00:20
	← noex left	00:21
	→ noex joined	00:22
	← hololeap left	00:23
	→ chenqisu1 joined	00:23
	→ causasui joined	00:26
	← toma left	00:29
	→ Codaraxis__ joined	00:30
	→ ackyshake joined	00:33
	→ Soni joined	00:33
	← Codaraxis_ left	00:34
	→ humanBird joined	00:34
humanBird	so i'm trying to clone from a windows machine and it fails over ssh	00:34
	git clone ssh://me@desktop-whatever/c/Users/me/repo fails with fatal: '' ssh://me@desktop-whatever/c/Users/me/repo '' does not appear to be a git repository	00:34
	← causasui left	00:35
	← cvmn left	00:40
	→ locrian9_ joined	00:40
	← ackyshake left	00:41
	← luke-jr left	00:41
	→ causasui joined	00:41
humanBird	it seems like it's adding extra quotes for no reason	00:42
	← jstein left	00:42
	→ luke-jr joined	00:43
	← locrian9 left	00:43
	← thiago left	00:46
	→ ackyshake joined	00:46
	← causasui left	00:46
	→ thiago joined	00:46
	→ Guest53 joined	00:47
	→ Akiva joined	00:48
	← AbleBacon left	00:52
	← thiago left	00:52
nedbat	humanBird: that could just be how it formats the message	00:54
humanBird	https://github.com/PowerShell/Win32-OpenSSH/issues/1237 this appears to be what i'm experiencing. i'm unable to edit the regsitry too	00:55
	← locrian9_ left	00:56
	→ jazzy joined	00:58
	← xx left	00:59
humanBird	i'm trying a space between the hostname and the file path and it says that no path is specified. i'm trying colons between path and host i'm trying forwardslash instead of colon in git bash and other ways of attempting to clone (adding .git at the end etc etc etc)	01:01
	it appears that i just cannot clone a remote git repository on a windows machine	01:01
	→ causasui joined	01:01
	← zen_coder left	01:02
	→ Null_A joined	01:02
humanBird	sometimes the error message says the path that it's trying to clone is not a git repository. i'm in the remote machine and it's a git repository that i can commit pull etc.	01:04
	is there a problem with cloning a remote repo on windows ?	01:05
	← m0viefreak left	01:05
humanBird	i've also tried the various shells on the client. the git bash the regular windows cmd powershell. nothing is working.	01:05
	← causasui left	01:06
	→ jazzy2 joined	01:08
	→ jazzy3 joined	01:09
	← jazzy left	01:10
	← jazzy2 left	01:12
	← ketas left	01:17
foo	I tried to remove a file from getting tracked but it seems like the file is now deleted in my repo. git rm --cached file.py should remove the file from being tracked but it should keep the file, correct?	01:18
	→ mud joined	01:19
humanBird	doesn't gitignore prevent the file from being tracked?	01:19
foo	humanBird: but the file was being actively tracked and then I removed it	01:19
	It is also in gitignore	01:19
	→ causasui joined	01:24
	← causasui left	01:29
DoofusCanadensis	foo, you are correct	01:32
	humanBird: if you track a file before choosing to add it to gitignore, it will stay tracked	01:32
	you can also add --force any file that is in gitignore to track it anyway	01:33
	← fikran left	01:36
humanBird	maybe you ran git rm without --cached heh	01:36
	→ fikran joined	01:38
	← splud left	01:41
	→ causasui joined	01:46
	→ R2robot joined	01:48
	← causasui left	01:51
	← Sulky left	01:51
	← arcatech left	01:59
	→ vicfred joined	02:00
	→ causasui joined	02:01
	← Guest53 left	02:02
	← causasui left	02:05
	← jazzy3 left	02:06
	← GreenAlpaca left	02:12
	← rgrinberg left	02:13
	→ rgrinberg joined	02:14
	→ structoha joined	02:15
	→ Chipzz joined	02:17
humanBird	hrm. it appears that windows shell is adding too many quotes over SSH and that's why i can't clone	02:17
	the people in #windows seem to say it's git's fault	02:17
	can someone clear this up with them. they seem pretty adamant that it's git's fault	02:17
DoofusCanadensis	never had any issues using git clone on windows	02:18
	← structoha1 left	02:19
DoofusCanadensis	mind you, I've never considered using windows as a git server with winssh in the mix	02:24
	← Wuzzy left	02:27
	→ causasui joined	02:28
	← DoofusCanadensis left	02:31
	← Null_A left	02:32
	← causasui left	02:33
	→ causasui joined	02:35
	← rgrinberg left	02:36
	→ pyeveryt_ joined	02:38
	→ Rashad joined	02:39
	→ eXtr3m0_ joined	02:40
	← causasui left	02:40
	← eXtr3m0 left	02:41
	← newpy left	02:46
	→ rgrinberg joined	02:47
	→ hololeap joined	02:53
	→ causasui joined	02:55
	← vakera_pingveno left	02:56
	← causasui left	03:00
	→ causasui joined	03:02
	← lemonsnicks left	03:03
	← FFY00 left	03:05
	→ XV8 joined	03:05
	← causasui left	03:06
	→ lemonsnicks joined	03:16
	← pretty_dumm_guy left	03:19
	→ causasui joined	03:28
	→ lainon joined	03:32
	← causasui left	03:33
	← lainon left	03:37
	→ geowiesnot joined	03:40
	← crashrep left	03:44
	← fikran left	03:45
	→ fikran joined	03:47
	→ causasui joined	03:51
	→ thiago joined	03:55
	← mannequin left	03:58
	→ Gustavo6046 joined	03:58
	→ crashrep joined	03:59
	← causasui left	03:59
	→ causasui joined	04:01
	→ euphrates[m] joined	04:01
	→ saroy joined	04:02
	saroy → bytehackr	04:02
	← thiago left	04:03
	← skapata left	04:03
	← causasui left	04:05
	→ Spr0cket joined	04:08
	→ causasui joined	04:08
	← cdown left	04:08
	← causasui left	04:13
	← bin101 left	04:13
	→ causasui joined	04:15
	→ bin101 joined	04:16
	← causasui left	04:20
	→ causasui joined	04:25
	→ DoofusCanadensis joined	04:27
	← humanBird left	04:27
	← causasui left	04:30
	→ Vonter joined	04:34
	→ causasui joined	04:40
	← foul_owl left	04:42
	← causasui left	04:45
	← luke-jr left	04:48
	→ luke-jr joined	04:50
	← rgrinberg left	04:50
	← DoofusCanadensis left	04:54
	→ foul_owl joined	04:55
	→ causasui joined	04:55
	→ maryo87 joined	04:56
	← pyeveryt_ left	05:00
	← foul_owl left	05:02
	← zebrag left	05:02
	← causasui left	05:04
	← vicfred left	05:07
	→ rgrinberg joined	05:09
	← Murr left	05:09
	→ Murr joined	05:10
	→ hbautista joined	05:11
	← Quack left	05:12
	← swistak left	05:12
	→ foul_owl joined	05:15
	← crashrep left	05:20
	→ FFY00 joined	05:28
	← M3troidman left	05:29
	→ Quack joined	05:31
	→ madewokherd joined	05:34
	← hbautista left	05:34
	→ swistak joined	05:34
	← madewokherd` left	05:37
	← tyson2 left	05:38
	← jkl1337 left	05:42
	→ jkl joined	05:43
	→ jazzy joined	05:52
	→ causasui joined	05:55
	← great_taste left	05:55
	← causasui left	06:00
	→ causasui joined	06:00
	→ XV9 joined	06:04
	← XV8 left	06:04
	← causasui left	06:05
	← bloody left	06:09
	← sudoforge left	06:13
	→ lgc joined	06:13
	← lgc left	06:15
	→ M3troidman joined	06:18
	← maryo87 left	06:31
	→ causasui joined	06:32
	→ retroid_ joined	06:34
	← ChmEarl left	06:36
	← jazzy left	06:37
	← causasui left	06:37
	→ jazzy joined	06:38
	→ zeenk joined	06:44
	← gumnos left	06:45
	→ splud joined	06:46
	→ hqdruxn08 joined	06:46
	← Pseudocrat left	06:47
	← hqdruxn08_ left	06:48
	→ maryo87 joined	06:48
	→ Guest9 joined	06:50
	→ lehinsun joined	06:51
Guest9	hi,	06:51
	i need to create branches locally,	06:51
	automate the git branches locally, use any script	06:51
	→ gumnos joined	06:52
	→ ykrons joined	06:52
	→ zeenk2 joined	06:53
	← zeenk left	06:54
Guest9	any body can help me on this...?	06:55
j416	Guest9: 'git branch mybranch' will create a new branch called mybranch. More info at man git-branch.	06:55
gitinfo	Guest9: the git-branch manpage is available at https://gitirc.eu/git-branch.html	06:55
	→ causasui joined	06:58
	← GNUmoon left	07:01
	→ GNUmoon joined	07:02
	← causasui left	07:02
	→ causasui joined	07:07
	← anaveragehuman left	07:09
	← causasui left	07:12
	→ jazzy2 joined	07:13
	→ jazzy3 joined	07:15
	← zeenk2 left	07:15
	← jazzy left	07:16
	← gumnos left	07:16
	→ zeenk2 joined	07:17
	← jazzy2 left	07:17
	← rgrinberg left	07:17
	← zeenk2 left	07:17
	→ AnapodoPsalidaki joined	07:19
	→ bkircher joined	07:21
	→ gumnos joined	07:22
	← structoha left	07:22
	→ causasui joined	07:22
	← M3troidman left	07:23
	← selckin left	07:23
	→ selckin joined	07:23
	→ M3troidman joined	07:24
	→ jazzy2 joined	07:27
	→ structoha joined	07:28
	← zmt01 left	07:29
	→ clime joined	07:30
	← jazzy3 left	07:30
	→ vysn joined	07:31
	← jazzy2 left	07:32
	← causasui left	07:33
	← Guest9 left	07:37
	← bkircher left	07:38
	→ GreenAlpaca joined	07:39
	→ bkircher joined	07:47
	→ iomari891 joined	07:48
	→ jazzy joined	07:51
	← GreenAlpaca left	07:53
	→ feriman joined	07:54
	→ GreenAlpaca joined	07:56
	← tirnanog left	08:00
	→ MajorBiscuit joined	08:00
	→ palasso joined	08:01
	→ rfuentess joined	08:01
	← geowiesnot left	08:04
	← unluckyshrubbery left	08:04
	← Akiva left	08:05
	→ AnapodoPsalidi joined	08:05
	→ coot joined	08:06
	← AnapodoPsalidaki left	08:08
	→ causasui joined	08:17
	← mns left	08:17
	→ mns joined	08:20
	← chenqisu1 left	08:24
	→ chenqisu1 joined	08:26
	← causasui left	08:30
	→ Gaboradon joined	08:31
	→ causasui joined	08:32
	← canton7 left	08:32
	← Vonter left	08:32
	→ bodiccea_ joined	08:33
	→ aminvakil4 joined	08:33
	← BinGOs left	08:34
	← BtbN left	08:34
	→ terrorjack5 joined	08:34
	→ BtbN joined	08:34
	→ FluffyFoxeh joined	08:34
	← lechner left	08:34
	← redrambles left	08:34
	→ PacKetIV joined	08:34
	→ tcurdt- joined	08:35
	→ shalok_ joined	08:35
	→ wynn joined	08:35
	← T_UNIX[m] left	08:35
	← danielsousaio[m] left	08:35
	← Celmor[m] left	08:35
	← Dhruvag2000[m] left	08:35
	← Pixelized[m] left	08:35
	← vodkra left	08:35
	← PocketKiller left	08:35
	← Frogging101 left	08:35
	← madduck left	08:35
	← Erawan left	08:35
	← tcurdt left	08:35
	← relipse left	08:35
	← shalok left	08:35
	← kristjansson left	08:35
	shalok_ → shalok	08:35
	→ Nixx joined	08:36
	← terrorjack left	08:36
	← bodiccea left	08:36
	← aminvakil left	08:36
	← wolf left	08:36
	← jjakob left	08:36
	← HumanG33k left	08:36
	← MiniontobyPI left	08:36
	← Flow left	08:36
	← Rondom_ left	08:36
	← Nixx_ left	08:36
	← niyawe_ left	08:36
	← silas left	08:36
	terrorjack5 → terrorjack	08:36
	aminvakil4 → aminvakil	08:36
	→ Vonter joined	08:36
	→ jjakob_ joined	08:36
	FluffyFoxeh → Frogging101	08:36
	wynn → wolf	08:36
	→ niyawe joined	08:36
	→ vodkra joined	08:36
	← causasui left	08:36
	→ madduck joined	08:37
	→ relipse joined	08:37
	→ Rondom joined	08:37
	→ redrambles joined	08:37
	→ kristjansson joined	08:37
	→ HumanG33k joined	08:37
	→ silas joined	08:37
	→ lechner joined	08:38
	→ bingos joined	08:38
	→ BtbN_ joined	08:39
	→ mexen joined	08:40
	← BtbN left	08:40
	BtbN_ → BtbN	08:40
	← pkal left	08:41
	→ Erawan joined	08:41
	→ MiniontobyPI joined	08:42
	← LiENUS left	08:42
	→ LiENUS joined	08:42
	→ canton7 joined	08:43
	→ causasui joined	08:45
	→ spare joined	08:46
	← Hobbyboy left	08:47
	→ danielsousaio[m] joined	08:48
	→ Celmor[m] joined	08:48
	→ Flow joined	08:49
	→ Dhruvag2000[m] joined	08:50
	← causasui left	08:50
	→ Pixelized[m] joined	08:50
	→ T_UNIX[m] joined	08:50
	→ TheCatBehemoth joined	08:55
	→ Sulky joined	08:58
	→ jim87 joined	08:58
	→ causasui joined	09:01
	→ Sulky_ joined	09:02
	← Sulky left	09:05
	bingos → BinGOs	09:05
	← causasui left	09:05
	← GreenAlpaca left	09:06
	← karstensrage left	09:10
	→ karstensrage joined	09:12
	← eXtr3m0_ left	09:16
	← Gustavo6046 left	09:19
	→ zen_coder joined	09:22
	→ Ilyu joined	09:24
	→ Hobbyboy joined	09:26
	→ causasui joined	09:26
	← dunc left	09:27
	→ dunc joined	09:29
	← nrg left	09:31
	← causasui left	09:32
	→ otisolsen70 joined	09:34
	→ nrg joined	09:34
	← Spr0cket left	09:35
	← sa left	09:35
	← coldmountain left	09:35
	← Vonter left	09:35
	← circuitbone left	09:35
	→ sa joined	09:35
	← DrAnything left	09:36
	→ DrAnything joined	09:37
	→ coldmountain joined	09:37
	→ circuitbone joined	09:37
	← celphi left	09:38
	→ Vonter joined	09:38
	← magic_ninja left	09:39
	→ celphi joined	09:39
	← howdoi left	09:39
	→ otisolsen70_ joined	09:39
	← nrg left	09:40
	← feriman left	09:40
	← ljharb left	09:40
	→ howdoi joined	09:41
	← structoha left	09:41
	→ magic_ninja joined	09:41
	→ ljharb joined	09:41
	← jwpapi left	09:42
	← molt left	09:43
	← otisolsen70 left	09:43
	→ otisolsen70__ joined	09:43
	→ jwpapi joined	09:44
	← ZachGibbens left	09:44
	→ Spr0cket joined	09:44
	→ nrg joined	09:45
	← Pr0phet left	09:45
	→ fling joined	09:45
	← Pent left	09:46
	→ feriman joined	09:46
	→ Pr0phet joined	09:46
	→ unluckyshrubbery joined	09:46
	→ ZachGibbens joined	09:47
	→ c4017_ joined	09:47
	← otisolsen70_ left	09:48
	← geirha left	09:48
	→ aniruddha joined	09:49
	→ Pent joined	09:49
	← c4017 left	09:50
	← otisolsen70__ left	09:52
	← feriman left	09:52
	→ pretty_dumm_guy joined	09:54
	→ causasui joined	09:55
	→ kenanmarasli joined	09:56
	→ feriman joined	09:58
	→ ketas joined	09:58
	← lehinsun left	10:03
	← Codaraxis__ left	10:05
	← causasui left	10:05
	→ Sulky__ joined	10:05
	→ Codaraxis joined	10:06
	← xkuru left	10:06
	→ OnkelTem joined	10:07
	← Sulky_ left	10:08
	← Codaraxis left	10:09
	→ Codaraxis joined	10:10
	→ goldfish joined	10:14
	→ cousteau joined	10:18
cousteau	Hi	10:18
	dob1_ → dob1	10:18
cousteau	If I create two commits with the exact same content, parent commit, commit message, author, author date, and commit date, they would have the same hash and be treated effectively as the same, right?	10:19
	→ GreenAlpaca joined	10:20
	→ structoha joined	10:21
cousteau	I was wondering if there was a way to replicate a commit exsctly on another repository without directly connecting to the original one and pulling/fetching the commit. But I guess the tricky part would be to replicate the commit date, which cannot be modified/faked.	10:21
	← feriman left	10:22
j416	cousteau: yes, you can do this.	10:22
	cousteau: they would be identical and have the same hash.	10:23
	cousteau: you can set the commit info using env vars. man git-commit look for GIT_	10:24
gitinfo	cousteau: the git-commit manpage is available at https://gitirc.eu/git-commit.html	10:24
j416	you can also create the commit object manually.	10:24
	or, create a commit and then modify it.	10:24
	(edit it to create a new commit from it)	10:25
	→ xx joined	10:25
	→ causasui joined	10:25
cousteau	Oh... interesting	10:25
	So I guess "git pull via email exchange" IS possible after all	10:26
	→ feriman joined	10:28
	→ geowiesnot joined	10:29
	← goldfish left	10:29
	← M3troidman left	10:30
	→ enoq joined	10:31
	→ geirha joined	10:31
	→ Codaraxis_ joined	10:32
	→ duxsco joined	10:32
cousteau	j416: interesting, I had no idea you could "fake" the committer info, only the author info. I assumed security/sanity reasons (being able to mess with commits like this seems risky, plus I vaguely recall that git uses commit date order for something). Although I guess if git didn't allow this directly it could still theoretically be faked by changing the system time.	10:33
	← Sulky__ left	10:33
	← Ilyu left	10:33
	← causasui left	10:34
	→ Ilyu joined	10:34
	→ molt joined	10:35
	← Codaraxis left	10:35
	→ mannequin joined	10:40
	→ moldorcoder7_ joined	10:40
	← moldorcoder7 left	10:40
	← duxsco left	10:47
cousteau	Oh, and I see that timestamps have a 1 second precision, so this "creating two identical commits" thing could even be done "manually" without much effort	10:50
	← spare left	10:50
	← structoha left	10:50
cousteau	Might be an interesting example	10:50
	→ ZenWalker joined	10:51
ZenWalker	fatal: unable to access 'https://gitlab.gnome.org/sc0w/phosh.git/': The requested URL returned error: 418	10:52
	I can't push, I see this error	10:52
	what happens?	10:52
	← Lord_of_Life left	10:53
	→ Lord_of_Life_ joined	10:53
ZenWalker	I did 'git push origin branchname'	10:53
	← dka left	10:54
	Lord_of_Life_ → Lord_of_Life	10:56
	→ dka joined	10:57
	← cation left	11:00
	→ eXtr3m0 joined	11:02
	→ kenanmarasli_ joined	11:04
	← TheCatBehemoth left	11:05
	→ Sulky__ joined	11:05
	← geowiesnot left	11:06
	← kenanmarasli left	11:07
	kenanmarasli_ → kenanmarasli	11:08
	← dka left	11:15
	← atrigent left	11:15
cousteau	Error 418? Sounds oddly familiar	11:18
	LadyLioness → LordLion	11:19
	jjakob_ → jjakob	11:21
	← [twisti] left	11:21
cousteau	ZenWalker: I suspect somebody with an odd sense of humor must have been messing with the error codes, because that's the standard http error code for "I am a teapot" that was introduced as an April fool's joke	11:22
	→ dbbr joined	11:22
canton7	Looks like it's used internally by gitlab's config of nginx: https://docs.gitlab.com/omnibus/settings/nginx.html	11:23
ikke	someone else reported it on #gitlab as well	11:24
	→ causasui joined	11:27
cousteau	canton7: I just found that as well. Wasn't sure if it was a gitlab-specific thing or if I got that because I specifically searched "error 418 gitlab"	11:29
	← causasui left	11:31
	→ causasui joined	11:34
	← igemnace left	11:35
	← causasui left	11:39
	← maryo87 left	11:39
	→ humanface joined	11:39
	→ M3troidman joined	11:43
	→ vitali64 joined	11:47
	→ causasui joined	11:50
	← jazzy left	11:50
	→ jazzy2 joined	11:52
	← vitali64 left	11:52
	jazzy2 → jazzy	11:53
	← Crispy left	11:54
	→ Keikai joined	11:56
	→ Crispy joined	11:57
	← Keikai left	12:01
	← Crispy left	12:01
	→ duxsco joined	12:01
osse	someone in gitlab has a sense of humor	12:02
	→ Crispy joined	12:03
	→ Sulky_ joined	12:03
	← causasui left	12:04
	→ causasui joined	12:04
ZenWalker	cousteau: it happens with https, with ssh I can push	12:05
	→ cdown joined	12:05
	→ geowiesnot joined	12:05
	← Sulky__ left	12:06
cousteau	osse: I suspect it had more to do with "I don't know which error code to use, so I'll use something that is otherwise unused, instead of using something meaningful, or creating a new error code"	12:07
	Or maybe you're trying to use gitlab to connect to giTea	12:08
	That would justify the teapot error, at least	12:09
osse	Now you're thinking with portals	12:09
	← vysn left	12:12
	← causasui left	12:14
	→ duxco joined	12:18
	← duxsco left	12:18
	duxco → duxsco	12:18
	→ Swahili joined	12:24
	← dsrt^ left	12:25
	→ dsrt^ joined	12:27
	← samuelbernardo left	12:29
	→ dka joined	12:29
	→ samuelbernardo joined	12:31
	→ maryo joined	12:35
	→ kenanmarasli_ joined	12:37
	← samuelbernardo left	12:37
XenophonF	I have a main branch with the original code, then I branched main -> fix1 to fix something, then I branched fix1 -> fix2 to fix something else. Should I merge fix1 into main first, then merge fix2 into main? Or should I just fix2 into main and call it done? (In reality, there are like a half dozen of these branches, which I intended to turn into patch sets for submission to the upstream project, to whose	12:40
	git repo I don't have access)	12:40
	← kenanmarasli left	12:40
	kenanmarasli_ → kenanmarasli	12:40
XenophonF	sorry *should I just _merge_ fix2 into main and call it done	12:40
osse	XenophonF: if you have not worked on fix1 since creating fix2 the end result would be the same	12:42
	because main would just be fast-forwarded	12:42
	← geowiesnot left	12:43
	→ samuelbernardo joined	12:43
	→ FH_thecat joined	12:45
	→ quite joined	12:46
	→ spare joined	12:46
quite	hey, with :/regex i can select a commit based on regex matching the commits msg. can i limit this to current/specific branch? my git show :/foo just picked up a stashed commit!	12:48
	← M3troidman left	12:49
osse	quite: HEAD^{/regex}	12:49
	or somebranch^{/regex}	12:49
	→ Adoi joined	12:50
	→ M3troidman joined	12:53
quite	osse: yay! thanks	12:54
	→ causasui joined	12:54
	← Ilyu left	12:57
	→ Ilyu joined	12:58
	← causasui left	12:58
	→ causasui joined	13:00
	← XV9 left	13:00
	← maryo left	13:01
	→ XV8 joined	13:02
	← reprazent left	13:03
	← causasui left	13:05
	← durham left	13:07
	← ofm left	13:08
	← dmvrtx left	13:08
	→ reprazent joined	13:10
	→ tyson2 joined	13:13
	→ dmvrtx joined	13:13
	→ hseg joined	13:18
	→ pileatedx joined	13:22
	→ causasui joined	13:24
	→ nyah joined	13:24
XenophonF	thanks osse	13:28
	← causasui left	13:29
	← olebra left	13:30
	→ olebra joined	13:30
	→ causasui joined	13:31
	← Adoi left	13:33
	← MajorBiscuit left	13:34
	→ igemnace joined	13:34
	→ MajorBiscuit joined	13:35
	← causasui left	13:36
	← dsrt^ left	13:37
	← quite left	13:37
	← pileatedx left	13:39
	← molt left	13:42
	← tyson2 left	13:44
	→ tyson2 joined	13:45
	→ geowiesnot joined	13:45
	→ vysn joined	13:49
	← frobnic left	13:49
	→ frobnic joined	13:49
	→ cdown_ joined	13:50
	← duxsco left	13:51
	→ vakera_pingveno joined	13:53
	← cdown left	13:53
	cdown_ → cdown	13:53
	→ causasui joined	13:54
	← FH_thecat left	13:55
	← geowiesnot left	13:55
	← Argorok left	13:58
	← causasui left	13:59
	→ node1 joined	13:59
	→ causasui joined	13:59
	→ Argorok joined	14:00
	LordLion → LadyLioness	14:04
	← causasui left	14:04
	← Xenguy left	14:07
	→ TheCatBehemoth joined	14:07
	→ durham joined	14:09
	← hinderaker left	14:11
	← hseg left	14:13
	→ hseg joined	14:14
	← MajorBiscuit left	14:15
	→ MajorBiscuit joined	14:16
	→ Adoi joined	14:16
	← chenqisu1 left	14:17
	← enoq left	14:18
	← gumnos left	14:19
	← MajorBiscuit left	14:22
	→ MajorBiscuit joined	14:22
	→ causasui joined	14:26
	→ cation joined	14:28
	← Adoi left	14:29
	← Vonter left	14:29
	← causasui left	14:31
	→ causasui joined	14:36
	← durham left	14:38
	← causasui left	14:40
	→ ChmEarl joined	14:45
	← cousteau left	14:47
	→ Vonter joined	14:47
	→ gasbag joined	14:48
	→ molt joined	14:48
	→ gh34 joined	14:50
	→ madewokherd` joined	14:51
	→ gast0n joined	14:52
	← madewokherd left	14:54
	← gasbag left	14:56
	→ gumnos joined	14:56
	→ causasui joined	14:57
	→ Thanatermesis joined	14:58
	→ toma joined	14:58
	← spare left	15:00
	← karstensrage left	15:03
	→ karstensrage joined	15:03
	→ great_taste joined	15:04
	← causasui left	15:04
	→ causasui joined	15:06
	→ skapata joined	15:08
	← skapata left	15:08
	→ skapata joined	15:08
	→ atrigent joined	15:11
	← causasui left	15:14
	→ vdamewood joined	15:16
gajus	Is there a way to create a repository that only contains changes from a sub-path in another repository?	15:19
	→ kaiseisei joined	15:19
bookworm	yes, subtree gajus	15:20
gajus	thank you	15:22
	← Ilyu left	15:23
	← kaiseisei left	15:24
	→ lavos joined	15:24
	→ causasui joined	15:24
gajus	useful thread https://stackoverflow.com/questions/23937436/add-subdirectory-of-remote-repo-with-git-subtree	15:26
	→ kaiseisei joined	15:27
	← molt left	15:28
	→ thiago joined	15:30
	← causasui left	15:31
	← kaiseisei left	15:32
	→ DoofusCanadensis joined	15:33
	→ Codaraxis__ joined	15:39
	← aniruddha left	15:40
	← Codaraxis_ left	15:41
	→ spare joined	15:43
	→ mat001 joined	15:44
	→ ThorMojito joined	15:45
	→ Codaraxis joined	15:46
	→ ralf joined	15:46
	→ causasui joined	15:49
	← Codaraxis__ left	15:50
	← skapata left	15:51
	← causasui left	15:54
	← jazzy left	15:54
	→ schuelermine joined	15:55
ralf	Hi! Hope someone can help. Following situation: In one repo we switched to Git from SVN two years ago without migrating the history. So, the first commit in the Git repo is the last revision in SVN. Now, we want to incoroporate the old history (as migrated by the nirvdrum/svn2git) . Which order of commands would you recommend? I tried it before with 1. Add the new repo as a remote to the old one (the newly migrated one) 2.	15:55
	Rebase master branch (other branches are irrelevant) of new repo onto last commit of old repo -> The result is a ton of merge conflicts that do not seem necessary	15:55
schuelermine	Help, I somehow ended up with two identical git worktrees	15:56
	← node1 left	15:56
	← mat001 left	15:57
schuelermine	I have three worktrees, two in folder [A], one on branch b1, one with detached head and one in another folder [B] on b0…	15:57
	→ mat001 joined	15:57
schuelermine	I can’t remove them because one of the [A] ones is the main working tree, and git worktree remove [A] doesn’t work…	15:57
	→ leib joined	15:58
	→ causasui joined	16:01
	← dflick left	16:02
	← ThorMojito left	16:02
	← madewokherd` left	16:03
j416	schuelermine: just delete the directory (worktree, not main repo), then run git worktree prune to remove the reference.	16:08
schuelermine	The doubled up worktree is the main worktree	16:08
j416	I suppose you should be able to use remove, too.	16:08
	schuelermine: so you have two repos?	16:08
schuelermine	j416: two folders, and in the main folder, there’s two worktrees	16:08
j416	you nested the worktrees within the first repo?	16:09
schuelermine	“nested”? idk. but there’s two of them.	16:09
j416	sorry, I don't understand what you did.	16:09
	you can remove a worktree with git worktree remove, or by removing the diretory (rm -r) and then git worktree prune.	16:09
schuelermine	one moment	16:09
j416	sorry, no time.	16:09
	I bet someone can help.	16:10
	gl o/	16:10
schuelermine	But you can’t remove the main directory	16:10
	→ vitali64 joined	16:10
schuelermine	This is what happens:	16:12
	user@host$ git worktree list	16:12
	user@host$ git worktree remove /folder1	16:12
	fatal: '/folder1' is a main working tree	16:12
	oh, no	16:12
	the lines got mangled	16:12
	sorry	16:12
	https://pastebin.ubuntu.com/p/XRQzrvvYbT/	16:13
	← bkircher left	16:14
	→ bkircher joined	16:15
	← hseg left	16:16
	→ hseg joined	16:17
	→ rsx joined	16:20
	← leib left	16:22
	← gast0n left	16:25
	← Vonter left	16:25
	→ bn_work joined	16:27
	→ gast0n joined	16:27
	← rsx left	16:27
	→ Vonter joined	16:28
schuelermine	OK, I fixed it	16:30
	git clone --bare --no-hardlinks $folder1 $folder1bkp && rm -r $folder1 && git clone --no-hardlinks $folder1bkp $folder1 && rm -r $folder1bkp	16:31
bn_work	hi, git 2.24.3, when I committed 17 files that had anywhere from 3-4 lines to 2/3rds line differences between them, I expected to see 1 line per file changed in the commit output but instead I get 6 lines + something like `foo/{bar.bash => baz.bash} (57%)`, why is that showing as a copy? & where are the rest of the 10 files in the commit output? (note, oddly when I do a `git diff` (or `git diff --cached`) between bar.bash and	16:31
	baz.bash there is no output, but regular diff does?	16:31
	→ jumpcutking joined	16:31
bn_work	(it does mention there were `17 files changed, ...` at the top though)	16:32
	... of the commit output that is)	16:34
	← gast0n left	16:40
	→ madewokherd joined	16:41
	→ crashrep joined	16:41
bn_work	interestingly enough when I do `git log --stat` it does show each file individually for that commit, so is this some weird `git commit ...` output shorthand?	16:44
	← vitali64 left	16:44
bn_work	(algorithmic-based shorthand)	16:44
	← wilz left	16:44
	LadyLioness → LordLion	16:44
	→ emf joined	16:44
	→ ThorMojito joined	16:45
	→ nkm joined	16:46
nkm	hello	16:46
	I am new to using git commands.	16:46
	→ maryo joined	16:46
nkm	I have created a bitbucket account. and also created a repository	16:46
	→ zmt00 joined	16:47
	← maryo left	16:47
nkm	now i want to know how can i connect it to my local project?	16:47
	→ maryo joined	16:47
nkm	they provide some 'sourcetree' option. but i don't know how it works. I have checked many youtube videos. but they are for old versions.	16:47
	need help in this issue.	16:48
	→ emf_ joined	16:49
nkm	i am getting this error message when try to push.	16:49
	$ git push -u origin master	16:49
	Permission denied (publickey).	16:49
	fatal: Could not read from remote repository.	16:49
	Please make sure you have the correct access rights	16:49
	and the repository exists.	16:49
imMute	bn_work: that "foo/{bar.bash => baz.bash} (57%)" is rename detection. git does not record renames but instead tries to "find" them after the fact based on the simliarity between files (in this case 57%)	16:49
	← emf left	16:49
	→ durham joined	16:50
	→ molten joined	16:54
	← schuelermine left	16:54
	← hseg left	16:55
	→ hseg joined	16:56
	→ nkm77 joined	16:57
nkm77	i was disconnected	16:57
ralf	nkm: Check if there are multiple public keys in your .ssh directory. Maybe the wrong one is picked? Or havent you uploaded any public key to bitbucket?	16:57
nkm77	i don't know what is publick key. and where to check	16:58
	→ sudoforge joined	16:58
nkm77	i am using wamp	16:58
	← lavos left	16:58
	← Celelibi left	16:58
ralf	I guess you should check out this: https://support.atlassian.com/bitbucket-cloud/docs/set-up-an-ssh-key/	16:59
	← nkm left	17:00
nkm77	okay	17:00
bn_work	imMute: so it thinks 57% of the files were "renamed"? or 57% was "renamed" between only those two files? Either way, that seems a strange way to report it since clearly there were more files and those two files weren't renamed and both independently still exist post-commit	17:01
	→ hinderaker joined	17:03
nkm77	rafl. i have created my two keys. which is told in this article	17:07
	← adder left	17:07
nkm77	but i don't understand what this below content means.	17:07
	To start the agent, run the following:	17:07
	$ eval $(ssh-agent)	17:07
	Agent pid 9700	17:07
	Enter ssh-add followed by the path to the private key file:	17:07
	$ ssh-add ~/.ssh/<private_key_file>	17:07
	when i try to enter eval $(ssh-agent) it gives error message in cmd.	17:08
	→ adder joined	17:08
	← Murr left	17:09
	→ Murr joined	17:09
ralf	sorry nkm, cant support on this	17:09
nkm77	you also don't know this?	17:10
	→ Celelibi joined	17:11
ralf	nope sorry	17:11
nkm77	okay	17:11
	i have also tried sourcetree. but it is also not working. i don't know why	17:12
OnlineCop	nkm77: Do you have two files under ~/.ssh/ : id_[something] and id_[same_something].pub ?	17:15
nkm77	yes	17:15
OnlineCop	Okay; if you run just `ssh-agent` does it show any output, or show that the file can't be found?	17:15
	For me, `ssh-agent` shows `SSH_AUTH_SOCK=...; export SSH_AUTH_SOCK; SSH_AGENT_PID=...; export SSH_AGENT_PID;`	17:16
nkm77	it gives this message unable to start ssh-agent service, error :1058	17:17
	→ epolanski joined	17:17
OnlineCop	Google/DDG search for "ssh-agent unable to start 1058" shows several people with that same error, across multiple OSes and many of their fixes/solutions.	17:18
nkm77	i am searching.	17:19
OnlineCop	nkm77: Is your OS Linux, Mac, or Windows?	17:19
nkm77	windows	17:19
OnlineCop	PowerShell: `cd Program Files\OpenSSH-Win64` then within that, `.\install-sshd.ps1` and then ssh-agent started to work.	17:20
	Of course, you need OpenSSH installed (change directory to whatever makes sense on your system).	17:20
	^ those comments came from https://github.com/lukesampson/pshazz/issues/70#issuecomment-404335354 (URL typed, not copy-pasted, so I may have typo'd).	17:21
	→ duxsco joined	17:22
OnlineCop	A comment just below that one also mentions `Set-Service ssh-agent -StartupType Manual`	17:22
nkm77	should i install it in the keys directory?	17:23
OnlineCop	Install what?	17:23
nkm77	or make a new directory in program files?	17:23
	i means to run this command install-sshd.ps1	17:23
	like they did cd .\Program Files\OpenSSH-Win64	17:23
	← Rashad left	17:23
nkm77	should i make a new directory with name OpenSSH-Win64 and then run that command?	17:24
OnlineCop	If you install via Chocolatey, `choco install openssh` should install it to C:\Program Files\OpenSSH-Win64. You can choose a different location if you'd like.	17:24
	And then within that directory, running the `.\install-sshd.ps1` is what fixed it for other people.	17:24
	`ssh-agent` should then be added to your environment PATH, so you should be able to access it anywhere.	17:25
nkm77	okay. i created a directory in program files with name "OpenSSH-Win64" and then using powershell went to this directory and run this comand "choco install openssh"	17:26
	→ meder joined	17:27
nkm77	but it gives choco : The term 'choco' is not recognized as the name of a cmdlet........ error message	17:27
OnlineCop	I think `choco install openssh` will actually create that directory for you, regardless of where you run it.	17:27
	Alright, so your system doesn't use Chocolatey. You may just need to install it from the openssl website.	17:27
nkm77	openssl website ??? means/	17:28
meder	I created a new branch 'feature_1' from a source branch 'version_7'; I'm trying to merge the latest changes from that version_7 branch into my feature branch, but 'git merge version_7' shows already up to date, but I don't believe it has the latest updates from that branch - am I doing something wrong? also tried git pull; this was initially created within Jira for the branch from source	17:29
	^ and git pull would only grab changes for my feature branch so I don't think that's what I'd need	17:30
OnlineCop	meder: Which branch are you on currently?	17:30
meder	feature_1	17:30
OnlineCop	Does the branch `feature_1` have an upstream set?	17:31
meder	how can I verify that?	17:31
OnlineCop	From the command line, does `git branch -vv` show a remote?	17:31
meder	next to feature_1 in the second col it shows origin/feature_1 so I believe so	17:32
DoofusCanadensis	try origin/version_7 if the changes in that branch are from another person	17:32
meder	and I usually do a git push and it pushes to codecommit aws	17:32
	← maryo left	17:33
meder	'git merge origin/version_7' says not something we can merge	17:33
	btw - I have done a merge from version_7 before but 2 weeks ago, not sure if that's relevant / screwed anything up	17:34
DoofusCanadensis	sounds like your version_7 and origin/version_7 have deviated	17:34
	might want to check version_7 out and attempt to clean that up	17:34
	← bytehackr left	17:34
meder	so stash my files for this branch, git checkout version_7, git pull, then go back and try to merge again?	17:34
	← hseg left	17:35
	→ bloody joined	17:35
	→ hseg joined	17:35
	→ tulpa_ joined	17:36
meder	ah, got it I think; yeah had to do that basically	17:36
	thanks	17:36
nkm77	OnlineCop. i followed this link https://stackoverflow.com/questions/52113738/starting-ssh-agent-on-windows-10-fails-unable-to-start-ssh-agent-service-erro	17:36
meder	so always update the 'source' branch locally before merging basically	17:36
nkm77	and setup ssh-agent to Automatic	17:36
	what is next to do?	17:37
OnlineCop	nkm77: Does `ssh-agent` show output?	17:37
	→ rgrinberg joined	17:37
nkm77	now when i type this command in my command promt then it don't give any error message. before setting it gives the error ''ssh-agent'' is not recognized as an internal or external command,	17:38
	operable program or batch file.	17:38
imMute	bn_work: more like the two files are 57% similar, so git is considering it a rename (with modifications to the other 43% of the file).	17:43
	bn_work: given both files still exist and 57% being pretty low, I'm not sure why it did that. you can control that threshold for what counts as a rename though	17:44
	→ mruss0 joined	17:45
nkm77	OnlineCop. can you help me ?	17:46
	i have created private and public ssh keys	17:46
OnlineCop	Sorry, AFK for a few hours (at work).	17:46
nkm77	okay. thanks for your time	17:47
	→ arcatech joined	17:48
	→ Guest509 joined	17:50
	← Swahili left	17:51
	← cryptonector left	17:51
	→ shailangsa joined	17:54
Guest509	hi all	17:57
	→ ___nick___ joined	17:57
	→ neverfindme joined	17:57
	→ wilz joined	17:58
mruss0	Hello all, I have some troubles with git. I have two branches, main and feature. They have a common ancestor, then a common file has been modified on both branches. So, if I want to merge feature in main, I have a merge conflict. I need to solve this conflict with a single merge commit, how can I do?	17:59
	← neverfindme left	17:59
Guest509	I reinstalled linux again and what is the process to recreate the dotfiles ? git clone https://github.com/me/dotfiles , then what ?	17:59
	→ neverfindme joined	18:00
	→ cryptonector joined	18:00
imMute	mruss0: fix the file, git add it, then 'git commit' (no other options) and that'll open an editor with the default merge commit message in it.	18:01
	→ randallb joined	18:02
	→ Rimrul joined	18:02
	← neverfindme left	18:02
	← Rimrul left	18:03
mruss0	imMute so I should git merge --no-ff main	18:04
	← ___nick___ left	18:04
	→ ___nick___ joined	18:05
	← toma left	18:05
nkm77	i have setup the ssh-keys. i also added my public key in bitbucket account. but still when i typed this command git push -u origin master. it gives this error	18:06
	Permission denied (publickey).	18:06
	fatal: Could not read from remote repository.	18:06
	Please make sure you have the correct access rights	18:06
	and the repository exists.	18:06
	← ralf left	18:06
	← ___nick___ left	18:06
nkm77	i don't know where i am doing wrong.	18:06
	need help in this issue	18:06
	→ Jong joined	18:06
Guest509	nkm77 maybe you did not fork the repo, I think you are writing to another person repo	18:07
nkm77	i created my own	18:07
Guest509	nkm77 me I fork a repo before I amke changes	18:07
nkm77	first i typed the clone command.	18:07
	← MajorBiscuit left	18:07
	→ nasamuffin joined	18:07
	→ ___nick___ joined	18:07
nkm77	$ git clone [email@hidden.address]	18:08
	fatal: destination path 'youtubeclone' already exists and is not an empty directory.	18:08
bn_work	imMute: why would git even consider anything < 100% a rename?	18:08
nkm77	then i typed git push -u origin master. and it gives me error	18:08
Guest509	nkm77 you have github access token setup É	18:08
	?	18:09
bn_work	imMute: also, what of the other files? why were those not listed in the commit output?	18:09
nkm77	i setup the ssh-keys in bitbucket account also	18:09
imMute	bn_work: sometimes you rename a file and change a class name but it's still the same class, so it would be nice if it counted as a rename even though the files aren't 100% the same.	18:09
nkm77	and followed all what is here https://support.atlassian.com/bitbucket-cloud/docs/set-up-an-ssh-key/	18:09
imMute	bn_work: as for the other thing, I have no idea. if you can replicate it so we can look for ourselves we might be able to help.	18:10
	← jim87 left	18:10
	→ lavos joined	18:10
imMute	nkm77: did you do the step 8 under step 3 "Add the public key to your Account settings" ?	18:11
nkm77	yes	18:11
	i added public key to my account	18:11
imMute	nkm77: you got the message about being logged in as naveedwd?	18:11
nkm77	ssh -T [email@hidden.address]	18:12
	authenticated via ssh key.	18:12
	You can use git to connect to Bitbucket. Shell access is disabled	18:12
	i got this	18:12
imMute	okay, so your SSH stuff seems to be setup fine.	18:12
	nkm77: what is the output of 'git remote -v' and can you use a pastebin instead of sending paragraphs to the channel?	18:13
nkm77	yes	18:13
	ok	18:13
	let me paste it	18:13
	← molten left	18:14
nkm77	git remote -v gives me this output https://wtools.io/paste-code/b9ii	18:14
imMute	nkm77: did you create a "youtubeclone" repo under your account on bitbucket.org? if you did, it's private as I can't see it	18:15
nkm77	yes	18:15
	its private	18:15
	i want to make a private repo	18:15
imMute	you want to make it or you already did make it?	18:16
nkm77	i already did	18:16
imMute	IDK what's wrong then. your remote is setup fine, SSH access seems to be fine. should just work.	18:17
nkm77	should i change it to public?	18:17
	← mruss0 left	18:17
nkm77	i changed it to public	18:18
	can you check it now?	18:18
imMute	it's there	18:18
nkm77	is it working at your end?	18:19
	← GreenAlpaca left	18:19
imMute	yeah, I can see it in the web interface. I don't have a bitbucket account so I can't try cloning it	18:19
	← rfuentess left	18:20
nkm77	can you tell me what to do next?	18:20
imMute	I don't know what's going wrong, so I dunno.	18:20
nkm77	because after changing it to public git push -u origin master still have that same error	18:20
imMute	wait, did you do that git push command from inside the repository or outside?	18:21
nkm77	inside repo	18:21
	→ asbachb joined	18:21
	← asbachb left	18:22
imMute	because earlier you said you did a clone (which failed) and then you did a push, no mention of changing directories or anything about the failed clone command	18:22
nkm77	should i delete this repo. and make a new one. and then try using that?	18:22
imMute	you could make another local clone somewhere else - no need to delete the existing one	18:23
nkm77	how can i de-clone or reverse my clone command from project directory	18:23
imMute	you can just delete the folder the 'git clone' created.	18:23
	← ThorMojito left	18:23
	→ skapata joined	18:24
	← skapata left	18:24
	→ skapata joined	18:24
nkm77	i don't have 'git clone' folder. i have this directory structure	18:25
	https://ibb.co/TH8djDq	18:25
imMute	where did all that stuff come from?	18:25
	← causasui left	18:25
nkm77	i have already created a project. now want to upload it to bitbucket for upcoming changes and updates	18:25
	and to have a code backup there	18:26
imMute	I don't see a .git folder in that image..	18:26
nkm77	yes. i don't have .git folder	18:26
	← zen_coder left	18:26
foo	I have a branch that's deleting a local file that I don't want to be tracked. Is there a way to see if a branch is A) tracking or a file or B) attempting to clear the file?	18:26
nkm77	is it created .gt folder?	18:27
	.git*	18:27
foo	nkm77: I don't think that was for me but if it was let me know	18:27
nkm77	foo. it is not for you buddy. i have just started with this git. and have only 1 or 2 hours experience.	18:28
	XD	18:28
foo	nkm77: welcome to a new world. :)	18:28
nkm77	thanks	18:29
	i am not even still able to clone a repo.	18:29
	stuck in this issue. and i am here to solve that problem	18:29
imMute	nkm77: that folder isn't in the repo. the repo starts where the .git dir is.	18:30
	nkm77: when you did 'git clone [email@hidden.address] that created a subdir 'youtubeclone' and THAT is the repo	18:30
nkm77	i don't know. i just created a repo in bitbucket. and have all this	18:30
	now i delete that subdirectory	18:31
	now should i again clone it?	18:31
imMute	sure.	18:32
	also if you only have 1-2 hours of experience with git, you should probably read a tutorial first.	18:32
nkm77	okay. again clone it and get this output http://codepad.org/A9n5qaou	18:33
imMute	right, now copy all your project files into that youtubeclone directory that it created.	18:33
	git add them, and then git commit and then you can push them	18:33
nkm77	is it necessary? because it will disturb my directory structure	18:34
	is there any other way ? to avoid copy everything into that directory?	18:34
	← Guest509 left	18:35
imMute	you could clone the repo into where your files already are, but that might cause issues if you're not careful.	18:35
	you can move the files around as long as you move the .git folder with them.	18:35
	← Vonter left	18:35
nkm77	should I move/cut-paste the files inside that newly directory or copy-paste it. means keep two copies of code?	18:36
imMute	copy to be safe until you're comfortable with git	18:36
	→ structoha joined	18:37
nkm77	but then to change which code? the copy one or the original?	18:37
	if i need to change any code..	18:37
imMute	ideally the git repo copy, since you'll want git to track your changes too	18:37
nkm77	okay.	18:38
	all of you guys do the same? means keep two copies of code. one original and one in git directory	18:39
imMute	no, most people work directly out of the git repo	18:39
	but since you're new to git, it's safer to keep a backup copy while you're still learning	18:39
nkm77	how to do that?	18:39
	for now i just want to push my this code to my repo.	18:40
imMute	just edit the files in that youtubeclone directory (that's the git repo)	18:40
	← jumpcutking left	18:41
nkm77	okay. let me copy everything to this new directory	18:41
	if i copied everything. then just type git push -u origin master command?	18:42
	for testing i copy some files to this newly directory to check if it works or not	18:42
imMute	no, you need to do other things. seriously, you need to read how to use git.	18:43
	https://git-scm.com/book/en/v2	18:43
	→ polyphem_ joined	18:43
imMute	IDK if there's a better tutorial, but that page can't be all bad	18:43
nkm77	okay thanks	18:44
	← iomari891 left	18:44
	← arcatech left	18:45
	← polyphem left	18:45
	→ hbautista joined	18:45
	→ maxzor_ joined	18:45
	→ arcatech joined	18:48
	→ xkuru joined	18:51
_lungaro_	is there a way with git, given a path, find where the .git dir is by searching up the tree?	18:52
ikke	git -C <path> rev-parse --show-toplevel	18:53
	<path> needs to be a directory	18:53
_lungaro_	sweet	18:54
ikke	That would show the top-level, so you would need to append /.git to get the .git directory	18:54
imMute	and for older gits there's a trick with an "! pwd" alias	18:54
ikke	right, aliases are run in the toplevel	18:54
	← nkm77 left	18:54
imMute	I wonder how that plays with worktrees. I've never used worktrees...	18:59
	← bkircher left	19:00
ikke	imMute: it would show the root of the worktree	19:04
	where .git is a git reference	19:04
_lungaro_	what in the world is a worktree	19:04
	→ ThorMojito joined	19:04
ikke	man git worktree	19:04
gitinfo	the git-worktree manpage is available at https://gitirc.eu/git-worktree.html	19:04
_lungaro_	i need to figure out how to stay up to date on git featuers	19:04
ikke	_lungaro_: github always has a very nice overview after each git release	19:04
	← nyuszika7h left	19:05
_lungaro_	sweet, may have just missed it	19:05
ikke	https://github.blog/2022-01-24-highlights-from-git-2-35/	19:05
	for example	19:05
	but worktrees are already older	19:05
	→ zebrag joined	19:05
	→ nyuszika7h joined	19:05
	← arcatech left	19:07
	→ arcatech joined	19:07
	→ AbleBacon joined	19:09
	→ GreenAlpaca joined	19:11
	← structoha left	19:17
	← ThorMojito left	19:17
	← clime left	19:22
	→ while joined	19:22
	← lechner left	19:22
	← OnkelTem left	19:23
	← gh555222 left	19:24
	→ zen_coder joined	19:24
	→ ThorMojito joined	19:24
	→ lechner joined	19:25
	← austin987 left	19:25
	← hinderaker left	19:25
	→ meator joined	19:26
	← meator left	19:32
	← Sulky_ left	19:32
	→ hqdruxn08_ joined	19:33
	→ hinderaker joined	19:34
	← hqdruxn08 left	19:34
	Bitflux → Byteflux	19:35
	→ causasui joined	19:36
	→ meator joined	19:37
	← rgrinberg left	19:42
	→ structoha joined	19:43
	→ jstein joined	19:47
	→ ThePhilgrim joined	19:48
	← TheCatBehemoth left	19:49
	→ gast0n joined	19:51
	← duxsco left	19:54
	→ duxsco joined	19:54
	← structoha left	19:55
	← ThorMojito left	19:59
	→ ThorMojito joined	20:00
	← XV8 left	20:00
	→ Shashin joined	20:05
	→ vicfred joined	20:08
	→ clime joined	20:11
	← duxsco left	20:11
	→ duxsco joined	20:11
	← skapata left	20:12
	→ sept joined	20:15
sept	Just to be clear, annotated tags are never involved in the commit hash calculation, correct?	20:17
ikke	correct	20:17
	tag objects point to commits (or other objects), not the other way around	20:18
sept	ikke: thanks.	20:18
	→ ekathva joined	20:20
	← hololeap left	20:21
	← Codaraxis left	20:25
	→ Codaraxis joined	20:25
	→ Guest91 joined	20:26
	← Guest91 left	20:26
	← ThePhilgrim left	20:29
	→ ThePhilgrim joined	20:29
	→ Akiva joined	20:30
	→ rgrinberg joined	20:30
	→ nehsou^ joined	20:32
	← meator left	20:47
	→ meator joined	20:47
	→ roxlu joined	20:51
roxlu	hi! when a repository uses sub modules, how can I see what commit is being followed?	20:52
	oh sorry.. `git submodule status`	20:52
	← spare left	20:53
	← sept left	20:54
roxlu	oh hmm that doesn't show me anything	20:54
	→ caveman joined	20:55
ikke	git ls-tree HEAD <path>	20:55
	← epony left	20:56
	→ Betal joined	20:57
roxlu	thanks ikke what should I use with for <path> ?	20:58
ikke	The path to the submodule in the workingree	20:58
	relative	20:58
	← tehenderz_ left	20:58
ikke	If the submodule lives in a directory foo in the root of the repo, then it would be `git ls-tree HEAD foo`	20:59
	→ tehenderz joined	21:00
	← crashrep left	21:00
roxlu	ok thanks, (/me feeling stupid) .. so I cloned a repose with `git clone --recursive [address]` and there is a .gitmodules with 2 repositories. When I use `git submodule status` or `git ls-tree HEAD <path>` i don't get any output	21:01
	← Vaelatern left	21:03
	← ___nick___ left	21:04
	← Shashin left	21:05
	→ Vaelatern joined	21:06
	← Vaelatern left	21:06
	→ Vaelatern joined	21:06
	← tulpa_ left	21:06
	← meator left	21:06
	← MrC left	21:08
roxlu	ikke: ok so I think I'm not crazy :) it should show something and fetch something	21:08
	I'm not sure what happens tbh. This is the repos: https://github.com/awslabs/amazon-kinesis-video-streams-webrtc-sdk-c/blob/master/.gitmodules	21:09
ikke	roxlu: what do you provide for <path>?	21:09
roxlu	the value after "path =" from that file	21:09
ikke	right, that should work	21:09
DoofusCanadensis	isn't git submodule init a separate step?	21:10
	cool if they added it into the clone itself, though	21:10
roxlu	DoofusCanadensis: I've done that too; `git submodule --init`	21:10
ikke	DoofusCanadensis: --recursive handles that	21:10
	→ anaveragehuman joined	21:10
	→ m0viefreak joined	21:10
roxlu	I've test it on 2 diff. PCs; maybe something silly was happening, but that doesn't seem to be the case as I can't get the status on the other pc either	21:11
ikke	roxlu: it seems the submodules are no longer there	21:12
	only the .gitmodules file	21:12
	there is no open-source directory	21:12
roxlu	ah I see what you mean; so besides the .gitmodules the submodules info is also stored somewhere else? I mean, git "should" be able to fetch the modules based on the info in those files, right?	21:13
ikke	roxlu: well, the commit it should checkout is stored in the tree object (what git ls-tree should output)	21:14
	without that entry, there is basically no submodule	21:14
roxlu	.. I do know that the repository uses a build system I wouldn't use; they download a bunch of libs into that dir, then remove it	21:14
ikke	https://github.com/awslabs/amazon-kinesis-video-streams-webrtc-sdk-c/commit/2f7db86a0be3cf341e5bce7e039e22ecf8dabedf	21:15
	this commit removed them	21:16
roxlu	Thanks ikke!	21:16
	How did you find that so quickly?	21:16
ikke	on a local clone	21:16
	git log -- open-source	21:16
	that was the last commit to touch them	21:17
	→ tuskkk____ joined	21:17
roxlu	oh nice!	21:17
	ah so here are all the dependencies: https://github.com/awslabs/amazon-kinesis-video-streams-webrtc-sdk-c/tree/master/CMake/Dependencies	21:18
	I was looking for that, thanks a lot ikke!	21:18
ikke	You're welcome	21:18
	← zebrag left	21:22
	← ekathva left	21:22
	← lavos left	21:24
	→ ekathva joined	21:24
DoofusCanadensis	ikke: that's good to know	21:24
	← zulutango left	21:30
	← ekathva left	21:31
	→ skapata joined	21:32
	← skapata left	21:32
	→ skapata joined	21:32
	→ ZacSharp joined	21:36
roxlu	ikke: when you use `git log -- [query]` does it search for file/dir names?	21:37
ikke	roxlu: not recursively	21:38
	just in the current dir	21:38
roxlu	ah oke	21:38
ikke	You could do -- '**/foo' and it should look recursively	21:38
	← nasamuffin left	21:40
	→ beco joined	21:42
	← CalimeroTeknik left	21:44
	→ stef204 joined	21:46
	→ iffraff joined	21:47
	→ MrC joined	21:48
	← Jong left	21:52
	→ dextercd joined	21:55
	→ austin987 joined	21:57
	→ spare joined	21:57
	← Tykling left	21:58
	← arcatech left	21:58
	→ CalimeroTeknik joined	22:00
	→ jinsun__ joined	22:03
	← stef204 left	22:04
	← gh34 left	22:05
	← jinsun left	22:06
	← randallb left	22:09
	← axisys_ left	22:09
	→ ZacSharp49 joined	22:12
	→ kilobyte2 joined	22:12
	← dansan left	22:13
	→ tykling joined	22:14
	← kilobyte_ch left	22:14
	→ dansan joined	22:16
	← ZacSharp left	22:16
	← zen_coder left	22:16
	← madewokherd left	22:18
	← rgrinberg left	22:18
	← kilobyte2 left	22:19
	← coot left	22:22
	← lmat left	22:26
	→ lmat joined	22:28
	→ crashrep joined	22:30
	→ kilobyte2 joined	22:31
mehwork	if i do `git submodule update --recursive --remote` in my branch and commit the modified submodule, that will update the commit in the remote for everyone who uses the submodule, right?	22:32
	← kenanmarasli left	22:32
mehwork	it doesn't merely update my branch's submodule with whatever is it the remote, it goes both ways?	22:33
	← ThePhilgrim left	22:34
	← hseg left	22:34
mehwork	said another way: When using update --remote, what happens after commiting/pushing the changes? Does it affect just the current repo or the also the repo the submodule came from?	22:39
foo	How can I tell if git is tracking a file? I have a feeling I told git to stop tracking a file (git rm --cached file.py) but it's actually deleting the file.	22:46
	← ThorMojito left	22:47
	→ zebrag joined	22:47
	← atrigent left	22:48
	← epolanski left	22:49
	← dextercd left	22:51
	→ whatsupdoc joined	22:52
	← tehenderz left	22:53
	→ tehenderz joined	22:54
	→ madewokherd joined	22:55
	← maxzor_ left	22:56
	← jstein left	22:57
	← reprazent left	22:59
	← crashrep left	23:00
	← tehenderz left	23:01
	→ tehenderz joined	23:03
	← feriman left	23:03
	→ pizdets_ joined	23:04
	→ crashrep joined	23:04
	← pizdets left	23:04
	← emf_ left	23:05
	→ reprazent joined	23:05
	→ toma joined	23:08
	→ ferdna joined	23:08
	← Murr left	23:08
	← crashrep left	23:09
	→ Murr joined	23:09
	→ austin_ joined	23:09
	→ ThorMojito joined	23:10
	→ Lord_of_Life_ joined	23:10
	← Lord_of_Life left	23:10
	← austin987 left	23:11
	← infernix left	23:12
	→ infernixx joined	23:12
	→ emf joined	23:13
	infernixx → infernix	23:13
	← ThorMojito left	23:13
	Lord_of_Life_ → Lord_of_Life	23:13
	→ ThorMojito joined	23:14
	← ThorMojito left	23:17
	← iffraff left	23:17
	→ crashrep joined	23:20
mackerman	foo: git status -- afilename.txt	23:21
	Will limit the Untracked files display to only the given pathspec	23:21
	← vysn left	23:22
	← oprypin left	23:23
	→ oprypin joined	23:23
mackerman	git rm --cached will remove from staging area but leave it in your working tree.	23:24
foo	deleted by us: app/config.py	23:26
	Trying to merge, I get that. Meh.	23:26
	mackerman: if I'm seeing that, does that mean I did git rm app/config.py at one point?	23:26
	This branch is always deleting my config.	23:26
	← tehenderz left	23:26
	→ tehenderz joined	23:28
mackerman	Could be a commit you are merging in that deletes it.	23:29
foo	mackerman: if that's the case, which I think it is, how do I stop that?	23:30
mehwork	git rm --cached removes from worktree/tracking from what i've read	23:30
mackerman	Do you want it deleted for people using this branch or not?	23:31
foo	mehwork: correct, but in my case, it seems like - per mackerman's point - I have some commit on my branch that is deleting this file. Which means I switch branches and my local config gets deleted. And I'm not sure how to stop this. *thinks	23:31
	mackerman: I do not, I don't want git to track it or delete it	23:31
	it's already in git ignore	23:31
	← vicfred left	23:31
mackerman	gitignore does not affect already comitted files.	23:32
foo	mackerman: understood, which is why I believe I need to do git rm --cached file.py	23:32
	which I think should be sufficient and be enough	23:32
mehwork	correct	23:32
foo	My sense is I did git rm file.py at some point which is in a commit	23:32
	And I want to stop that from happening	23:33
mackerman	Determine if commits are actually deleting it	23:33
foo	mackerman: how?	23:34
mackerman	git log --diff-filter=D --oneline --summary -- afilename.txt	23:34
	← GreenAlpaca left	23:35
mackerman	Maybe add --all if you are unsure of the branhc.	23:35
mehwork	those checks are confusing because they'll show nothing even if a file isn't av alid file name	23:35
mackerman	The file name should be app/config.py in this case	23:35
foo	https://bpa.st/XCZA	23:36
	Hmm, what tdoes that mean to you? Looks like I just stopped tracking unless I'm misreading it	23:36
	With --all it does the same	23:36
	→ rgrinberg joined	23:37
mackerman	Is commit made from the repo you did the git rm --cached with ?	23:38
	If not and it was merged it, it will delete the file.	23:38
	* merged in	23:38
	A different possibility, you said this is now gitignore'd, did you git clean ?	23:39
	→ structoha joined	23:40
foo	mackerman: 5557e31 is where I did git rm --cached , ahh, the issue is - it might be merging it in, and instead of ignoring it it's deleting the file which I don't want it to do. I just want it to ignore it	23:40
	mackerman: I didn't do git clean	23:40
mackerman	"git rm --cached" does not mean ignore this file, it means delete it from the index	23:42
foo	mackerman: I thought it simply stopped tracking	23:42
	mackerman: is there a way to rectify this?	23:42
mackerman	You already did, you committed a delete.	23:43
foo	mackerman: maybe once someone checks out from master and resets their branches, when I merge in it won't try to delete the file	23:44
	The issue is it's deleting the local file when I try to merge or switch branches	23:44
mackerman	Possibly that's moving before and after 5557e31, applying the delete again.	23:45
foo	mackerman: yes, and it's deleting the local file. Haha. I think if everyone merges from master (which has that) it should fix this, right?	23:45
	← M3troidman left	23:46
mackerman	Everyone who merges this in will have it deleted.	23:46
	→ atrigent joined	23:46
foo	mackerman: so, people need to A) merge it in and then B) add the file back, right?	23:46
	Then that should be ignored (since it's already in git ignore)	23:46
	← sudoforge left	23:47
	← tuskkk____ left	23:47
	← ZacSharp49 left	23:48
	→ sudoforge joined	23:48
	← spare left	23:48
	← crashrep left	23:49
	→ M3troidman joined	23:49
mackerman	Yes.	23:50
	However they won't have a copy on disk, as it is deleted.	23:50
foo	mackerman: Excuse me if I seem to be asking obvious questions. I'm trying to A) understand how this happened and B) rectify it. I think I understand A. As for B, if I'm following, someone will need to manually add the file after they merge in master, correct? Unless you're implying git will indefinitely attempt to delete this file always and forever...	23:51
mackerman	If you must have some version of app/config.py in version control, example or whtever, consider renaming it to a different file name.	23:51
foo	Which I doubt.	23:51
	← palasso left	23:51
foo	I want it in the repo but I don't want it tracked	23:51
mackerman	You must pick one of those.	23:52
foo	mackerman: one of those being A) rename or B) merge in master thne add file back, correct?	23:52
mackerman	"In the repo" and "not tracked" are mutually exclusive	23:52
foo	mackerman: I mean, on the filesystem, in the repo root but not tracked	23:53
	eg. this is a local config file relative to each instance	23:53
	or intended to be, anyway	23:53
	← The_Tablet left	23:54
	→ molt joined	23:55
mackerman	What caused this problem is commiting a file then gitignore it later	23:56
foo	mackerman: yup	23:56
	← clime left	23:59

Logs Search ←Prev date Next date→

Channels Documentation