IRCloggy #git 2021-02-24

Provider of IRC logs since 2005.

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

	2021-02-24
	← shs3g32f left	00:00
	→ tiin57 joined	00:01
	← sunrunner20 left	00:01
	→ ferdna joined	00:03
	← long4mud left	00:03
	← stdedos left	00:03
	← totte_ left	00:04
	← magic_ninja left	00:06
	→ arcatech joined	00:11
	→ magic_ninja joined	00:11
	← diverdude left	00:13
	← durham left	00:14
	← dviola left	00:15
	→ totte joined	00:15
	→ stats464_ joined	00:16
	← magic_ninja left	00:16
	→ dviola joined	00:16
	← alystair left	00:17
	→ sunrunner20 joined	00:17
	→ Xenguy joined	00:18
	← sunrunner20 left	00:18
	← n3wborn left	00:18
	→ magic_ninja joined	00:19
	← NeoCron left	00:19
	← stats4647 left	00:19
	→ misuto joined	00:21
	← AnAverageHuman left	00:24
	← CodeSlingerPaul left	00:24
	← tiin57 left	00:27
	← cbreak left	00:29
	→ AnAverageHuman joined	00:29
	→ stats4647 joined	00:30
	← ChrisLane left	00:30
	← adhawkins left	00:30
	← andy25225 left	00:30
	→ tiin57 joined	00:31
	← v0lksman_ left	00:32
	→ adhawkins joined	00:32
	→ ChrisLane joined	00:33
	← benfelin left	00:33
	→ cbreak joined	00:33
	← nyxyn left	00:33
	← stats464_ left	00:33
	← Dotz0cat left	00:34
	← shush left	00:35
	→ andy25225 joined	00:36
	→ filcab joined	00:37
	→ Dotz0cat joined	00:37
	→ Gurkenglas joined	00:40
	← Voxel left	00:40
	→ Voxel joined	00:41
	→ MarkB2 joined	00:46
	← Shentino left	00:46
	→ Shentino joined	00:49
	→ FLHerne joined	00:49
	← cbreak left	00:49
	← sim590 left	00:50
	← przemoc left	00:50
	→ sim590 joined	00:50
	← Voxel left	00:51
	← lankanmon left	00:51
	← derpadmin left	00:51
	→ Voxel joined	00:52
	→ lankanmon joined	00:52
	→ derpadmin joined	00:52
	← bolovanos__ left	00:56
	← tiin57 left	00:57
MarkB2	I recently picked up a text... and on the front is "Examples can be downloaded from..." and gives a URL. But the publisher is long gone (text dated 2001) and I've been searching the net for more than a week looking for the example files mentioned in the text.	00:57
	→ justan0theruser joined	00:57
	← kprabhuv left	00:58
MarkB2	Put a request into a site dealing with the subject and voila! received an email with a pointer to a github repository.	00:58
	← Bigcheese left	00:58
MarkB2	But there is no "get zip file" to copy down the master.	00:59
	the files are all there... but it seems set up for a one-at-a-time manual copy.	01:00
	→ Bigcheese joined	01:00
	→ tiin57 joined	01:00
	→ EvanCarroll joined	01:01
MarkB2	I did try "got clone 'path_to_repository' and, per my ignorance of how to use git, received "fatal: repository https ... not found"	01:03
	Please, could someone be kind enough and walk me through this? The text deals with DirectShow, is 'way out of date...	01:05
	This is the repository: https://github.com/eaglezhao/tracnghiemweb/tree/master/TestKhoaLuan/DirectShowTVSample	01:05
	→ przemoc joined	01:07
	← Gurkenglas left	01:11
	← mowcat left	01:15
	← hexnewbie left	01:17
	→ hexnewbie joined	01:18
	→ ShekharReddy joined	01:18
	← mustache_ride left	01:21
	→ jedsharp joined	01:22
	← vdamewood left	01:22
	→ Muimi joined	01:25
	← tiin57 left	01:27
mackerman	MarkB2: github shows you clone and download hints at the root of the repo, https://github.com/eaglezhao/tracnghiemweb	01:31
	→ tiin57 joined	01:31
mackerman	git clone https://github.com/eaglezhao/tracnghiemweb.git	01:31
	→ vicfred joined	01:35
	→ Sleepy63 joined	01:35
	→ shush joined	01:41
	← lucasb left	01:44
MarkB2	mackerman: Apologies... my attention drifted away from this pane. Ah... I missed the .git at the end. Thank you.	01:45
EvanCarroll	is there an overlap between submodules and sparse-checkout I want to just checkout a specific directory from a submodule for my project. and I want to keep it in sync	01:49
	also it here a man page for the entirity of the .git? where I can read about the available submodule syntax and sparse-checkout syntaxes?	01:50
	← boutcher left	01:50
	← MarkB2 left	01:51
	→ R2robot joined	01:54
	← tiin57 left	01:57
	← tchan left	01:59
	→ tchan joined	01:59
	→ tiin57 joined	02:00
	← Maxattax left	02:08
	→ drbean_ joined	02:10
	← arcatech left	02:13
	← OnkelBlade left	02:14
EvanCarroll	oh fuck. the sparse checkout has to be in the .git for the submodule.	02:14
	that is the absolutely dumbest design decision ever.	02:15
	→ Maxattax joined	02:18
	→ nsc joined	02:21
	← Guest73553 left	02:21
	nsc → Guest41174	02:21
	← drbean_ left	02:25
	← tiin57 left	02:27
	← Dotz0cat left	02:29
	← zmt01 left	02:29
	→ zmt01 joined	02:30
	→ tiin57 joined	02:31
	← Lord_of_Life left	02:37
	→ Lord_of_Life_ joined	02:37
	← zebrag left	02:38
	→ zebrag joined	02:38
	← justan0theruser left	02:38
	Lord_of_Life_ → Lord_of_Life	02:39
	← shush left	02:46
	← jedsharp left	02:46
	→ shush joined	02:46
	← robink left	02:48
	→ sgn1 joined	02:49
	← shush left	02:51
	← sgn left	02:51
	→ robink joined	02:53
	→ shush joined	02:56
	← shush left	02:56
	← tiin57 left	02:57
	→ tiin57 joined	03:00
	← foul_owl left	03:00
	← ghost43 left	03:03
	→ ghost43_ joined	03:03
	→ shush joined	03:07
	← gp5st left	03:08
	← shush left	03:08
	→ Dotz0cat joined	03:11
	→ foul_owl joined	03:13
	→ jaziz joined	03:16
	→ FinnElija joined	03:21
	finn_elija → Guest75969	03:21
	FinnElija → finn_elija	03:21
	← Guest75969 left	03:24
	← tiin57 left	03:27
	→ gp5st joined	03:28
	← Betal left	03:28
	← foul_owl left	03:28
	→ tiin57 joined	03:31
	→ long4mud joined	03:35
	← vicfred left	03:38
	→ jaziz1 joined	03:41
	← ShekharReddy left	03:41
	← jaziz left	03:43
	→ foul_owl joined	03:44
	→ juhwad__ joined	03:49
	→ superbolide joined	03:49
	← orbyt_ left	03:51
	← jaziz1 left	03:52
	→ jstimm joined	03:57
	← tiin57 left	03:57
	← AlpineLlama left	04:00
	→ FH_thecat joined	04:00
	→ tiin57 joined	04:00
	→ Betal joined	04:01
	→ AlpineLlama joined	04:01
	← gast0n left	04:05
	← SwiftMatt left	04:09
	← thebope left	04:10
	→ Goplat joined	04:10
	→ orbyt_ joined	04:10
	← jstimm left	04:11
	← xelxebar_ left	04:17
	← Milos left	04:19
	→ xelxebar joined	04:19
	→ Milos joined	04:21
	← tiin57 left	04:27
	← naivesheep left	04:28
	→ naivesheep joined	04:28
	← magic_ninja left	04:28
EvanCarroll	https://stackoverflow.com/q/66344719/124486 (question on sparse checkout and ignoring files in /)	04:30
	→ tiin57 joined	04:31
	← heyitsrama left	04:31
	← Dotz0cat left	04:42
	→ Dotz0cat joined	04:43
	→ justan0theruser joined	04:45
	← zebrag left	04:46
	← CryptoClub left	04:49
	→ yetoo joined	04:51
	→ CryptoClub joined	04:51
	→ Nitrousoxide joined	04:55
	← tiin57 left	04:57
yetoo	I made a change in master, I I then git stashed that change, I then created and checked out another branch, I then applied the stash to the new branch, I then updated both branches to be up to date with master (git pull), I checkout master, I then did a git reset --hard origin/master, I then checkout the other branch, I then do stash apply 0 (0 referring to the id of the only stashed change), I check to make sure those changes were	04:59
	applied, I then checkout master branch and I see that for some reason the changes from stash were applied to master despite me applying them while in the other branch. Why did this happen and how do I only apply a stash to the current branch	04:59
	→ tiin57 joined	05:01
	← wiindigo left	05:04
	→ Nitrousoxide_ joined	05:05
	→ arcatech joined	05:05
	→ riksteri joined	05:07
	← Zenstecm left	05:08
	← Nitrousoxide left	05:08
	← wallacer left	05:08
yetoo	essentially how to apply stash only to a specific branch rather than the whole repository because I find the workflow with commit and reset is hacky and prone to data loss	05:09
	→ abrac joined	05:10
	→ thebope joined	05:16
	← arcatech left	05:18
	← gp5st left	05:19
	← thebope left	05:23
	← tiin57 left	05:27
	→ wallacer joined	05:29
	← austin987 left	05:30
	→ tiin57 joined	05:31
	→ arcatech joined	05:33
	← arcatech left	05:33
	← Aquazi left	05:34
	← cd left	05:38
	← abrac left	05:41
	→ austin987 joined	05:44
	→ abrac joined	05:48
	← lulu_ left	05:49
	← orbyt_ left	05:52
	Nitrousoxide_ → Nitrousoxide	05:54
	← Nitrousoxide left	05:54
	→ Nitrousoxide joined	05:55
	← tiin57 left	05:57
	← abrac left	05:57
	→ tiin57 joined	06:00
	← Mattiaslndstrm left	06:01
	← Betal left	06:02
	→ Mattiaslndstrm joined	06:07
	← Maxattax left	06:09
	→ n3wborn joined	06:13
	← superbolide left	06:14
	← ELFrederich left	06:15
	← madewokherd left	06:16
	→ ELFrederich joined	06:17
	← FH_thecat left	06:18
	→ karab44 joined	06:23
	← AnAverageHuman left	06:24
	← tiin57 left	06:27
	← moldorcoder7 left	06:27
	← tsdh left	06:29
	→ moldorcoder7 joined	06:29
	← karab44 left	06:30
	→ tiin57 joined	06:30
	→ jla joined	06:31
	← jla left	06:31
	← Technodrome left	06:32
	← jtmusky left	06:34
	→ tsdh joined	06:40
	→ rfmind joined	06:44
	← crose left	06:45
	← hussam left	06:49
	→ jtmusky joined	06:49
	→ sord937 joined	06:53
	← tiin57 left	06:57
	→ tiin57 joined	07:01
	→ rcoote joined	07:01
amosbird	Hello, how can I add back the submodule that is resetted?	07:05
	→ john_johnk joined	07:05
	→ sgn joined	07:06
amosbird	there is here	07:06
	http://oracle.wentropy.com/e68839128c276ea1	07:06
	do I need to commit the submodule so that I can sync it?	07:07
	← sgn1 left	07:08
amosbird	what does "git add submodule add .." do ?	07:11
	← fling left	07:13
	→ ExeciN joined	07:14
	→ cbreak joined	07:16
	→ lulu_ joined	07:18
	→ fling joined	07:18
	← lulu_ left	07:18
	→ lulu_ joined	07:18
	→ abrac joined	07:18
	← rfmind left	07:18
	← fling left	07:23
	← milkt left	07:26
	→ milkt joined	07:26
	→ karab44 joined	07:26
	← tiin57 left	07:27
	← Furai left	07:27
	← Goplat left	07:29
	← is_null left	07:31
	→ _Borkr_ joined	07:31
	→ tiin57 joined	07:31
	← thiago left	07:31
	→ fling joined	07:32
	→ thebope joined	07:34
	wrobinso1 → wrobinson	07:35
	→ Furai joined	07:35
	← thebope left	07:39
	← fling left	07:39
	→ amahl joined	07:44
	← howdoi left	07:45
	← k3yp left	07:49
	→ fling joined	07:50
	→ LetoThe2nd joined	07:54
	← tiin57 left	07:57
	→ tiin57 joined	08:00
	← wrobinson left	08:01
	← dff left	08:03
	← ryab left	08:04
	← esc left	08:06
	← unluckyshrubbery left	08:06
	→ ryab joined	08:06
	→ esc joined	08:06
	← esc left	08:06
	→ esc joined	08:06
	→ Haohmaru joined	08:07
	→ rfuentess joined	08:09
	→ chele joined	08:12
	← ryab left	08:12
	→ ryab joined	08:15
	→ gioyik_ joined	08:16
	← gioyik left	08:17
	→ DevAntoine joined	08:18
	← tiin57 left	08:27
	→ tiin57 joined	08:31
	← yetoo left	08:31
	← mat001 left	08:32
	→ AppleGaming joined	08:35
	← gioyik_ left	08:35
	← brethil left	08:38
	← ferdna left	08:38
	→ ArchNoob joined	08:39
	← abrac left	08:39
	→ brethil joined	08:40
	→ oxymoron93 joined	08:42
	→ stdedos joined	08:45
	→ mexen_office joined	08:48
	→ NeoCron joined	08:48
	→ abrac joined	08:50
	→ radsmoo joined	08:50
	→ Aquazi joined	08:50
	← lxsameer left	08:55
	→ mozgalom joined	08:57
	← tiin57 left	08:57
stdedos	Hello there	08:58
	I want to exclude any and all .gitignore files from the `git-archive` command, wherever they may be	08:58
	if I write `git archive ... '!:.gitignore'`, it will only ignore `repo/.gitignore`	08:58
	if I write `git archive ... '!:**/.gitignore'`, it will keep `repo/.gitignore` (but remove every other one)	08:58
	I thought `**` expands to 0 and infinite directories 😕	08:58
	← Vaanir left	08:58
osse	it expands to between one and infinite for some stupid reason	08:59
	try :!(glob)**/.gitignore	09:00
	→ tiin57 joined	09:01
	← CryptoClub left	09:01
	← Bombe left	09:03
	→ kafl joined	09:03
osse	or simply give both	09:04
	← Mattiaslndstrm left	09:04
	→ bolovanos__ joined	09:04
stdedos	Nope	09:04
	Doesn't work	09:04
	Yeah, I did the second	09:05
	but isn't it a bug?	09:05
	→ CryptoClub joined	09:05
osse	I have had this discussion before, but I don't remember	09:06
	I think it's not a bug because the there is a / there that needs to be matched	09:06
	it's more like a plain string matching	09:06
stdedos	Why does the `/file.xyz` works then in .gitignore?	09:06
osse	the patterns in .gitignore have their own rules	09:07
stdedos	OH REALLY? :-D	09:07
	I thought it was the same "library" that handled those	09:07
osse	it probably is. but it's configurable?	09:08
	→ silverbaq joined	09:08
stdedos	I didn't get that last one	09:08
osse	try '!(exclude,glob)**/.gitignore'	09:09
	→ Bombe joined	09:09
stdedos	even workse :-D	09:09
	→ dionysus69 joined	09:10
	← radsmoo left	09:10
osse	I mean the same library can offer different matching modes	09:10
stdedos	I thought you said "they are distinct" for some reason	09:11
	s/said/meant/	09:12
	on a different question, for the same matter: I am using `git-archive` to produce a zip, in order to feed that to SomeProgram (tm)	09:13
	→ radsmoo joined	09:13
stdedos	However, SomeProgram requires a top-level directory	09:13
osse	So what happens here is that ** is not special without the (glob) thing. It's just two * next to eachother, which is reduntant. So */foo effectively the same as /foo and that needs to match the / which means it will match at least one dir	09:14
	Use the --prefix option	09:14
stdedos	so, I did `git archive HEAD -o file-0.3.0.zip --prefix="$(basename "$(realpath .)")/"`	09:16
	However, SomeProgram complains that the "structure of the plugin is different"	09:16
	Out of lack of imagination, I just compressed the git-dir, removed what I didn't want, and gave that to SomeProgram	09:17
	It was all happy and jolly to read _that_ one	09:18
osse	try --prefix=foo( instead of --prefix=$(shell madness) and see if that helps	09:20
	foo/	09:20
stdedos	And let's just say that, SomeProgram has no logs to say what it doesn't like, and that SomeProgram's devs, while almighty powerful, decide to shrug it off "you did something wrong" ....	09:20
osse	and open the different zip files in and compare them yourself	09:20
stdedos	didn't help	09:20
	I had plain dir before the shell-fu. didn't help*	09:20
	I did `unzip -l files` and I cannot see real differences	09:20
	→ jla joined	09:21
stdedos	I can actually see more files in the dumb version vs the git-archive ...	09:21
	→ Gurkenglas joined	09:22
osse	is there a different in the path?	09:22
	→ PJBoy joined	09:23
stdedos	No	09:23
osse	then something else is the problem	09:23
stdedos	I literally did `diff` on the `unzip` output	09:23
osse	try git archive without any exclusions	09:23
stdedos	The only thing that has bothered me, is that some old version of that zip file does not contain `Length 0 \| dir/name/` entries, but that's all	09:24
	dumb and archive version have those	09:24
	→ petrj joined	09:24
	← thansen left	09:26
	→ thansen joined	09:26
petrj	hi, what is the proper way to follow http redirects with clone?	09:27
	← tiin57 left	09:27
petrj	$ git clone -c http.followRedirects=true https://git.io/Jt5yR	09:27
	tried this but it doesn't work with 2.25.1	09:28
stdedos	osse ... it works 😂	09:29
	→ Raging_Hog joined	09:29
osse	stdedos: hmm what works now?	09:30
stdedos	SomeProgram accepts the zip without exclusion rules given on the command line	09:30
	→ tiin57 joined	09:30
	juhwad__ → jaziz	09:31
osse	Then for SomeReason it requires .gitignore files in the zip?!?!	09:31
	→ jimmiehansson joined	09:31
osse	do the unzip diff thing with and without the exclusions. Maybe you exclude something other than just .gitignore files	09:31
stdedos	I did	09:31
	the dumb file has an extra Makefile, and the archive file has the `.idea` folder	09:32
	both of which are not necessary to SomeProgram	09:32
	← downunder left	09:33
stdedos	Is it possible that there is some weird "corruption-like" error from the extra excludes?	09:33
osse	dumb meaning you zipped the folder yourself?	09:34
	→ downunder joined	09:35
	← mobidrop left	09:35
	→ thebope joined	09:35
	→ mobidrop joined	09:35
osse	Firstly, git archive will only produce an archive with the versioned files. So if the Makefile is something that your IDE produces and that is required then you're fucked either way	09:36
	→ mowcat joined	09:36
	← petrj left	09:36
	→ Dreadnaught joined	09:37
stdedos	dumb is the manual compression,. yeah	09:37
osse	try this: git check-attr -a .idea	09:37
	→ gearnode joined	09:37
stdedos	empty	09:37
	(and no, the Makefile I wrote it myself to not remember commands)	09:37
	← Kulrak left	09:37
osse	what does the "no" mean	09:38
stdedos	So if the Makefile is something that your IDE produces --> No, I wrote Makefile myself	09:38
osse	But is it part of the git repo?	09:38
stdedos	no, it's unchecked at the moment	09:39
	s/unchecked/untracked/	09:39
	→ dimi1947 joined	09:40
osse	that means you're fucked	09:40
	at least by default. But git archive --add-file exists	09:41
stdedos	Yeah, but I don't need the Makefile 😕	09:41
osse	Oh shit, I misread	09:41
stdedos	It's just that my manual sanitization process was not complete	09:41
	← jla left	09:41
stdedos	anyway "the important files" are there in both cases	09:42
osse	Then I give up	09:42
stdedos	It's just that "something" happens to git-archive artifact, when I ask for more exclusions	09:42
	👍	09:42
osse	I don't see any way for me to debug this	09:42
	just to be clear: git archive --prefix=whatever/ -o whatever.zip works?	09:43
stdedos	yeah	09:43
	just tried it	09:43
osse	ànd: git archive --prefix=whatever/ -o whatever.zip -- ':!(exclude,glob)**/.gitignore' doesn't?	09:43
stdedos	':!(glob)/.gitignore' ':!requirements.txt ':!.idea'	09:44
	← hnOsmium0001 left	09:44
stdedos	yes, it doesn't	09:44
	← mexen_office left	09:47
osse	remove them one by one until it works	09:47
	hmm the quoting there is screwed	09:48
stdedos	even if I just add ':!(exclude,glob)**/.gitignore' it's messed up	09:48
osse	typo. the ! is not supposed to be there	09:49
	← thebope left	09:49
stdedos	I think "somehow" `git-archive` "messes up" the archive when it's given extra pathspec	09:49
	(yeah, I wanted to tell you about that typo - do you think `git` should fix it?)	09:49
osse	not sure what you mean by that	09:50
	→ unluckyshrubbery joined	09:51
stdedos	':!(glob)**/.gitignore' does not work	09:52
	calcul0n__ → calcul0n	09:52
stdedos	I thought git recognized `!` (magic-signature) and `(glob)` (long form) on the same command	09:53
	However, I think that it stops at `!`, and ignores `(glob)`, as if I have a directory named `(glob)`	09:53
	Should that crash and burn, if not recognized?	09:54
	← gearnode left	09:55
	→ gearnode joined	09:56
	→ radsmoo_ joined	09:57
	← jimmiehansson left	09:57
	← tiin57 left	09:57
	← radsmoo left	09:57
	→ jimmiehansson joined	09:57
	← lightstalker left	10:00
osse	I don't know the exact details	10:00
	→ tiin57 joined	10:01
	← pagios left	10:01
	→ marlun joined	10:01
	→ jimmie_ joined	10:01
	← jimmiehansson left	10:01
	← oxymoron93 left	10:01
marlun	When viewing a commit with git show <commit> can I somehow show the full file as context?	10:02
	→ lightstalker joined	10:02
ikke	-U9999	10:03
	→ pagios joined	10:03
marlun	ikke: thanks, I just found it as well in the diff options, didn't know that worked here as well :)	10:04
	→ oxymoron93 joined	10:04
	← adlternative left	10:06
	→ KnoP joined	10:09
	→ jla joined	10:09
	← abrac left	10:15
	→ OnkelBlade joined	10:15
	→ def_jam joined	10:17
	→ abrac joined	10:18
	→ eb0t_ joined	10:18
	← eblip left	10:18
	← eb0t left	10:18
	→ feriman joined	10:21
	→ eb0t joined	10:26
	→ eblip joined	10:26
	← eb0t_ left	10:26
	← eb0t left	10:26
	← def_jam left	10:27
	← tiin57 left	10:27
	→ vinleod joined	10:28
	→ Technodrome joined	10:29
	→ eb0t joined	10:29
	→ tiin57 joined	10:30
	vinleod → vdamewood	10:30
	← ExeciN left	10:33
	← stinkpot left	10:36
	yousef9_ → yousef9	10:38
	← milkt left	10:40
	→ Sc0tty- joined	10:42
	→ Nitrousoxide_ joined	10:42
	← Nitrousoxide_ left	10:43
	← jla left	10:43
	→ _nightw0lf joined	10:43
	→ clime joined	10:43
	← Nitrousoxide left	10:45
	→ adlternative joined	10:50
	← tiin57 left	10:57
	→ onizu joined	10:58
	← silverbaq left	11:00
	→ tiin57 joined	11:00
	→ silverbaq joined	11:00
	← silverbaq left	11:05
	→ silverbaq joined	11:05
	→ mp3 joined	11:06
	← axsuul left	11:10
	→ axsuul joined	11:11
	← Jackneill left	11:16
	← radsmoo_ left	11:20
	→ Mattiaslndstrm joined	11:24
	← tiin57 left	11:27
	→ tiin57 joined	11:30
	← herren left	11:31
	← ArchNoob left	11:32
	→ Jackneill joined	11:32
	→ ch joined	11:33
	→ kerframil joined	11:34
	→ AckSynAck joined	11:34
	→ erro__ joined	11:39
	← _Borkr_ left	11:42
	← iokill left	11:44
	← finn_elija left	11:47
	→ faceface joined	11:47
	→ finn_elija joined	11:47
	→ iokill joined	11:50
	tgunr_ → tgunr	11:51
	→ ExeciN joined	11:52
	← nuala left	11:52
	← mowcat left	11:53
	← Mattiaslndstrm left	11:54
	→ klonn joined	11:55
	← klonn left	11:57
	← tiin57 left	11:57
	← abrac left	11:58
	→ tiin57 joined	12:01
	← terabyte left	12:03
	← AckSynAck left	12:03
	→ ArchNoob joined	12:09
	→ mexen_office joined	12:09
	→ rsx joined	12:09
	→ p0a joined	12:10
p0a	Hello can someone please walk me through contributing a PR for a project on github?	12:10
	I have downloaded github/foo and have made my changes which I now wish to contribute to the project	12:10
	as I undestand it, I now need to make a branch that is my own local copy, then somehow mirror that information on my github profile and then use github's functionality to do the PR	12:11
Venemo	you make a fork of the project. you clone the fork, add commits, push to the fork. then you open a PR on GitHub	12:11
p0a	I haven't yet committed anything	12:11
	well I cloned the official project instead	12:11
	can I remedy this?	12:11
Venemo	yes, you can add your fork as a remote to the local repo	12:12
p0a	my repo?	12:12
	my github profile repo right?	12:12
Venemo	sorry I don't understand the question	12:12
p0a	I don't either	12:12
Norrin	Venemo does it even need to be a fork?	12:13
p0a	there's my local copy, the official github page and my page	12:13
Norrin	can't he just make a new repo	12:13
	?	12:13
Venemo	Norrin: not if you have access to the upstream repo	12:13
	p0a typically spends a day, every time, trying to figure out how to contribute a PR	12:13
Norrin	Venemo he doesn't	12:13
	i kinda don't think it needs to be a "fork" though	12:13
	just make a new repo	12:13
	yes. start a new repo under your account and push local repo to that new repo in your account	12:13
Venemo	it's easiest to use the fork feature	12:13
p0a	spend your years learning programming only to be foiled by that evil github	12:13
	→ benfelin joined	12:14
Norrin	Venemo ok, no harm	12:14
p0a	I don't like having a repo on github, it makes me anxious about whether it is up to date or what	12:14
	so I typically just delete everything, fork it and so on	12:14
Norrin	p0a that's fine	12:15
p0a	It's not fine, it's awful	12:15
Norrin	so yeah, your "profile" is not a repo	12:15
p0a	So what do I do?	12:16
	← dimi1947 left	12:16
Norrin	"<Venemo> yes, you can add your fork as a remote to the local repo"	12:16
	you got stuck there?	12:16
p0a	Yeah I don't understand what it means	12:16
Venemo	so, you go to the upstream repo, you click "fork". that will give you a repo on github.	12:16
p0a	By upstream, you mean the official repo?	12:16
Venemo	yes	12:16
p0a	but I've already done that in the past	12:16
	should i first delete it?	12:17
Venemo	you don't need to	12:17
	why would you	12:17
p0a	Because it probably has information I've createrd	12:17
Norrin	well.... if it is diverged from what he has locally, he has to delete it	12:17
p0a	that I don't remember what it's purpose was anymore	12:17
	← mexen_office left	12:17
Venemo	you can rebase your branch on top of the latest upstream, and go from there	12:17
p0a	I don't really like rebase	12:17
	I fondly remember spending a day rebasing	12:17
	I don't even know what it means in terms of github	12:18
Norrin	but it could still have garbage in it that he doesn't want in his PR	12:18
p0a	right, I'll just delete it	12:18
	if only i can find the delete button now	12:18
Norrin	it means a force push and you don't want to get in the habit of doing that whenever you feel lik eit	12:18
Venemo	well, in this case, you don't actually need to rebase then, you can just overwrite the branch in your repo with a branch from upstream	12:18
	← kafl left	12:18
	→ mexen_office joined	12:18
p0a	I hate github, it's so disfunctional	12:19
	open source is disfunctional	12:19
Venemo	I don't see your problem	12:19
p0a	holy cow	12:19
	well I do just fine using git on my own for my local projects	12:19
Venemo	what I just described to you, is doable in like 2 minutes	12:19
p0a	but anything github related is a pain	12:19
Norrin	only because you haven't learned it	12:20
	→ kafl joined	12:20
Norrin	it's not complicated	12:20
p0a	true and I never will!	12:20
Norrin	not with that attitude	12:20
Venemo	so. you have a local repo which is a clone of the official upstream repo of that project, right?	12:20
p0a	It doesnt' stick, I contribute to OSS once every 5 months	12:20
Venemo	and you also a have a fork on your github profile, which is outdated, if I understood correctly	12:20
Norrin	it's not about OSS. Most companies use github	12:20
	if you had a job where you needed to use github, you'd learn it	12:21
p0a	I don't work in programming	12:21
Norrin	well there you go	12:21
Venemo	so, all you have to do is create a branch in your local repo, push that branch to your fork, and then you can open a pull request from that	12:21
Norrin	true ^	12:21
p0a	I don't understand the purpose of a local repo	12:21
Norrin	can get back without deleting the fork	12:21
p0a	I'll delete everything	12:21
	I'm just tired of thinking about how this works	12:22
Venemo	the local repo is a copy of the repo on your computer, where you actually make changes, that is its purpose.	12:22
Norrin	you've sunken into a defeatist attitude lol	12:22
p0a	Norrin: It's been many years that every few months I spend a day trying to figure out github	12:22
	It's a real pain	12:22
	It's really awful trying to contribute something when the real block is always gihtub	12:23
Norrin	github is free to use. you should use it for your local projects so that you can retain how to use it	12:23
p0a	that's just the cloud hip	12:23
Venemo	p0a: this is how it is done for both github and gitlab, and bitbucket as well.	12:23
p0a	What's optimal is ssh'ing into a box that has a local git repo	12:24
osse	any kind of collaboration with git uses a local repo	12:24
Venemo	p0a: I think I've given you straightforward instructions. I do something like this several times every day. it takes about 2 minutes, including the time spent on downloading things from the network.	12:24
Norrin	git is basically always git. those corps just had kinda tiny features to their web interface, but git itself doesn't change	12:24
p0a	I hate the web interface	12:24
osse	!spindle	12:24
gitinfo	[!git-spindle] https://github.com/seveas/git-spindle is a handy tool to use the features of GitHub (and GH Enterprise), GitLab, BitBucket and possibly more from the command line.	12:24
Venemo	you don't need the web interfact for any of the steps I described above	12:25
	← finalbeta left	12:25
p0a	okay so I forked upstream, now I create a branch, then I push to my branch	12:25
Norrin	try again Re: Venemo	12:25
	true*	12:25
p0a	but how do I note that my online branch is there in my local git repo?	12:25
	I need to do something with origin and master and all that stuff	12:25
Venemo	a local repo can have multiple remotes set up	12:26
	Norrin leaving. might not be back	12:26
Venemo	"origin" refers to the place that you cloned, so based on what you told us, it is currently the official upstream repo of the project	12:26
	you can add your own fork as another remote	12:27
	← tiin57 left	12:27
p0a	I have some stuff in my computer	12:27
	I want to put in my github profile whatever	12:27
bremner	sounds like you might want https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes	12:28
	and related material.	12:28
p0a	please no more of that	12:28
bremner	shrug	12:29
p0a	I'm so sick of reading about git and github and remote and origin and master and fetch clone push pull and the git cmd line crazynesss	12:29
	It has to be simple	12:29
bremner	why?	12:29
p0a	well here's the thing	12:29
	I always find myself in a unique state	12:29
	it's always a little different	12:29
	and I always have to delve into the git book again	12:29
Venemo	so, you dislike the web interface, and you also think the command like is crazy	12:29
p0a	I'm sick and tired of this torture	12:29
bremner	well, that's not really our problem	12:30
	I mean, you get this channel is volunteers helping you out of kindness right?	12:30
p0a	I'm just so frustrated with github	12:31
	→ tiin57 joined	12:31
	← feriman left	12:31
p0a	I'm trying to log into a file a routine that I can always follow to contribute to OSS without thinking about it	12:31
	← jaziz left	12:31
p0a	but I don't have the energy to read the git book again	12:31
	I'll just upload the files in a github comment and ask someone to do it for me lol	12:33
	I mean, if they want to. I mean, that's it. I can't do it	12:33
	→ Norrin joined	12:34
Venemo	sorry p0a but I don't see what exactly you want from us. we already told you how you can solve your problem	12:36
	→ abrac joined	12:36
	← Technodrome left	12:36
p0a	I posted the changes in a zip file in a github comment	12:41
	It's not the time to be reading the git book for the nth time when you're trying to do something completely unrelated in your life	12:41
Norrin	Venemo you should have stopped when i did	12:42
Venemo	heh :)	12:42
	← NeoCron left	12:46
	→ NeoCron joined	12:47
	→ Mattiaslndstrm joined	12:50
	→ cdown joined	12:50
	← dviola left	12:50
	→ cdown_ joined	12:52
	← cdown_ left	12:53
	→ dviola joined	12:53
	→ cdown_ joined	12:53
	← cdown left	12:54
	cdown_ → cdown	12:54
	→ maxster joined	12:56
	← Mattiaslndstrm left	12:57
	← tiin57 left	12:57
p0a	thank you for the effort, I'm just too incapable of following advice right now	12:57
	← p0a left	12:57
	→ tiin57 joined	13:01
	→ bolovanos_ joined	13:04
	← sweatsuit left	13:05
	← Gurkenglas left	13:05
	→ Gurkenglas joined	13:05
Gurkenglas	When I add a Notes.txt to my local version of a repository it naturally wants to add that file to commits so I add it to .gitignore but now it wants to add that .gitignore change to commits so I add .gitignore to .gitignore but that doesn't work, what do?	13:05
	← DevAntoine left	13:07
	→ DevAntoine joined	13:07
avu	Gurkenglas: the .gitignore file in the repo belongs to the repo so it gets tracked there, if you want to ignore some files just for you locally, you can use core.excludesfile	13:07
	← cliluw left	13:08
	← bolovanos__ left	13:08
avu	Gurkenglas: I have it set to ~/.gitignore_global here, not sure what the default is, check with `git config --get core.excludesfile`	13:08
	→ cliluw joined	13:09
Gurkenglas	avu, no output	13:09
avu	Gurkenglas: then the default might be it not being set at all	13:10
	Gurkenglas: set it to some file outside of the repository	13:10
	→ boutcher joined	13:11
ikke	There is also a repo specific ignore file	13:11
	.git/info/exclude	13:12
	← CryptoClub left	13:15
	← maxster left	13:17
	→ CryptoClub joined	13:17
Gurkenglas	avu, git config --get core.excludesfile is now G:\Git\excludesfile and that is now G:/ss13/Notes.txt	13:19
	but git status still lists Notes.txt as added	13:19
ikke	Gurkenglas: it should point to a file that contains files to ignore, just like .gitignore	13:21
Gurkenglas	ikke, yes thats what I did and described in the last two lines right?	13:22
	→ sweatsuit joined	13:22
avu	Gurkenglas: just put 'Notes.txt' in there	13:22
	Gurkenglas: I don't think putting full paths in there that start outside of the repo where it should be applied works	13:23
Gurkenglas	ah okay then code.excludesfile makes some more sense than I thought. .git/info/exclude worked thanks	13:24
	← rfuentess left	13:27
	← abrac left	13:27
	← tiin57 left	13:27
	→ rfuentess joined	13:27
	→ linuxguru joined	13:29
	→ mat001 joined	13:30
	→ tiin57 joined	13:31
	← benfelin left	13:34
	→ Maxattax joined	13:35
	→ benfelin joined	13:36
	→ Pickchea joined	13:37
	→ Technodrome joined	13:38
	← DevAntoine left	13:42
	→ DevAntoine joined	13:42
	→ thebope joined	13:45
	← staafl_inv0022 left	13:45
	→ k3yp joined	13:46
	← silverbaq left	13:46
	← benfelin left	13:47
	→ benfelin joined	13:48
	← Dotz0cat left	13:49
	← thebope left	13:50
	← Xenguy left	13:55
	← tiin57 left	13:57
	→ thebope joined	14:00
	→ tiin57 joined	14:01
	→ Qo027 joined	14:01
	→ rosco_y joined	14:01
rosco_y	list	14:01
	← benfelin left	14:01
	← thansen left	14:02
osse	!list	14:02
gitinfo	[!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git	14:02
	→ benfelin joined	14:04
	← erro__ left	14:04
	→ fabs joined	14:04
ikke	Bot trigger by proxy :-D	14:07
	← karab44 left	14:10
	← meropyri left	14:11
	← thebope left	14:12
	→ thebope joined	14:12
	→ meropyri joined	14:12
	→ nuala joined	14:16
	enrh_ → enrh	14:20
	← enrh left	14:20
	→ enrh joined	14:21
	← tiin57 left	14:27
	→ gast0n joined	14:28
	→ crose joined	14:29
	→ tiin57 joined	14:30
	← boutcher left	14:30
	→ thansen joined	14:34
	← bravespear\|2 left	14:36
	→ superschnell joined	14:38
superschnell	Hi all. How do I show a single commit by revision id using git on the cli? I'm having problems showing the commit in context in PHPstorm's git log viewer.	14:38
	→ mustache_ride joined	14:39
	→ itp_student\|54 joined	14:39
superschnell	eh, sorry, nvm	14:39
	I can show it.. problem is.. I can't see in which branch it was	14:40
osse	superschnell: that information is not directly stored by git	14:41
	← itp_student\|54 left	14:42
osse	superschnell: you can try git branch --contains={revisionhere} but if it's an old commit that might list many branches, one of which is master	14:42
superschnell	It's not even stored remotely? I don't understand how PHPstorm can then filter commits by branch	14:44
	thebope → evan	14:45
	evan → thebope	14:45
	← mobidrop left	14:45
osse	probably by filtering out commits that appears in other branches as well	14:47
	← benfelin left	14:53
	→ abrac joined	14:53
	→ benfelin joined	14:55
	→ AnAverageHuman joined	14:55
	← tiin57 left	14:57
	← Pickchea left	14:59
	← mexen_office left	15:00
	→ tiin57 joined	15:01
graphicsv	Hi. `git reset --hard HEAD@{N}` works only for the current branch I'm in, right?	15:06
	→ vicfred joined	15:06
graphicsv	I mean, it won't mess with other branches.	15:06
	→ shush joined	15:10
osse	yes	15:10
	→ CodeSlingerPaul joined	15:11
	← shush left	15:14
	→ hbautista joined	15:15
	→ wiindigo joined	15:17
	← austin987 left	15:17
	← benfelin left	15:18
	← abrac left	15:18
	→ madewokherd joined	15:18
	← crose left	15:20
	→ benfelin joined	15:20
	← AppleGaming left	15:21
	← geirha left	15:21
	← ArchNoob left	15:22
	→ hussam joined	15:22
	← vdamewood left	15:23
	← ELFrederich left	15:24
	→ ELFrederich joined	15:24
	← tiin57 left	15:27
	→ muhaha joined	15:29
	→ boutcher joined	15:29
	→ tiin57 joined	15:30
	→ austin987 joined	15:31
	← hussam left	15:32
	→ hussam joined	15:32
	← stats4647 left	15:35
	→ stats4647 joined	15:36
	→ sgn1 joined	15:40
	→ Newami joined	15:42
	← sgn left	15:42
	→ thiago joined	15:42
	← rosco_y left	15:45
	← rosco left	15:45
	← oxymoron93 left	15:48
	← moldorcoder7 left	15:49
	→ jla joined	15:54
	← wiindigo left	15:55
	← Newami left	15:55
	→ arcatech joined	15:56
	← tiin57 left	15:57
	→ kupi joined	15:57
	← axisys left	15:58
	← jla left	15:58
	→ axisys joined	15:58
	→ mowcat joined	15:58
	← rcoote left	15:59
	← axisys left	15:59
	→ moldorcoder7 joined	15:59
	← clime left	16:01
	→ tiin57 joined	16:01
	→ rosco_y joined	16:02
	← mowcat left	16:03
	→ Ranhir joined	16:03
	→ axisys joined	16:04
	← mozgalom left	16:06
	→ sgn joined	16:06
superschnell	exit	16:06
	← superschnell left	16:06
	← ldiamond left	16:08
	← sgn1 left	16:09
	← teclator left	16:09
	→ teclator_ joined	16:09
	→ gioyik joined	16:10
	← ExeciN left	16:13
	← teclator_ left	16:13
	→ teclator joined	16:14
	→ clime joined	16:14
	← Ranhir left	16:17
	→ maxster joined	16:17
	← Thorn left	16:19
	← fling left	16:20
	→ Kodak22 joined	16:21
	→ sgn1 joined	16:22
	← sgn left	16:24
	gitinfo set mode: +v	16:25
EvanCarroll	https://stackoverflow.com/questions/66353917/can-sparse-checkout-patterns-be-added-to-gitmodules	16:25
	← gearnode left	16:25
Kodak22	Hello all. I know only very little about git, and am considering it a somewhat easy way to manage a community based CAD file managment	16:25
	This project is an open sourced mecanical watch movement, where people will be able to make their own versions, based on our "official" one, and it sounded to me like something git would do, but of course, these are binary files, so a lot of the advanced compare functions will not work	16:26
	→ gearnode joined	16:26
	→ jla joined	16:27
	← tiin57 left	16:27
maxster	sounds cool Kodak22	16:27
	← Lord_of_Life left	16:28
	→ sudoforge joined	16:29
	← cods left	16:30
	→ cods joined	16:30
	→ tiin57 joined	16:31
	← sudoforge left	16:31
Kodak22	Thanks! I just have my doubts if its a good idea, or if we should go with airtables or excel or something else. Key is low effort (since we are all volunteering our time)	16:32
	→ sudoforge joined	16:32
	← sudoforge left	16:32
	→ Lord_of_Life joined	16:32
Kodak22	CRM's sound like a better idea (could even handle inventory etc, when we get there), but setting up a CRM scares me a bit...	16:32
	→ vdamewood joined	16:32
	← Peng left	16:34
	→ Peng joined	16:34
	→ sudoforge joined	16:35
	← Cork left	16:36
mackerman	Kodak22: git has the advantages of being good at tracking history, distributed, and free from the control of any one company or service	16:38
	Disadvantages, binary diffs aren't meaningful, and also won't compress well increasing repo size.	16:39
	→ m0viefreak joined	16:39
	← AnAverageHuman left	16:40
mackerman	Lowest effort would be getting a git hosting which also offers collaborative features. GitLab, GitHub.	16:40
	→ fling joined	16:40
	→ Cork joined	16:41
Kodak22	and just use the webinterface i guess? I'm also wondering how things work between forks in git. Once you fork, are you still dependent to "main"?	16:42
mackerman	However, all of this is focused on file based release, CAD designs, code, whatever. Product inventory or customer relatiionship management is generally out of scope for such things.	16:43
	→ dimi1947 joined	16:43
	→ karab44 joined	16:43
mackerman	A fork is an entirely independent repository.	16:44
ikke	Kodak22: is the format purely binary?	16:44
	Kodak22: word documents are for example zipped xml files	16:44
mackerman	fork is a verb for core git, but rather what various git hosters call making your own copy of a thing.	16:44
	* fork is not verb for core git	16:45
Kodak22	yeah, CAD files (either inventor .iam, .stp, itp etc) and .pdf files	16:45
ikke	Kodak22: It's the process of making a copy of a project that still has a reference to the forked project, with the goal of having a space to push commits / branches to without the original project having to add you as a collaborator, and provide pull / merge requests from there	16:46
	→ AnAverageHuman joined	16:46
	← boutcher left	16:47
Kodak22	so if the base project changes something, you could be notified that there is a change (but since its binary, you of course can't know what has changed without opening and comparing)	16:47
	?	16:47
	→ mowcat joined	16:48
mackerman	Not really, you need to fetch and read the progress of the "upstream" remote.	16:48
	→ orbyt_ joined	16:49
Kodak22	And since its binary, only the commit comments will be a way of documenting changes i imagine?	16:49
ikke	right	16:49
imMute	Kodak22: because it's binary, git won't be able to show you a diff itself. if you have a tool that can diff these binary files somehow, you can instruct git to use that tool when you ask for a diff.	16:49
	→ hnOsmium0001 joined	16:49
ikke	and merging is at most a matter of choosing one of 2 versions	16:49
imMute	ikke: can't you setup a merge tool like you can with diffs?	16:50
	(assuming such a tool for the binary file type in question exists)	16:50
	→ heyitsrama joined	16:51
Kodak22	Not certain imMute, they use AutoCad and Inventor where i work, and i'm not sure they can track changes.	16:52
ikke	imMute: yes	16:52
	if you have something that's able to do that	16:52
	→ abrac joined	16:52
imMute	Kodak22: I mean a tool where you can say "here's version A and here's version B, show me the differences". the tool doesn't track the differences, it just shows them to you.	16:52
	← long4mud left	16:53
Kodak22	aaah, right, sorry.	16:53
	← gearnode left	16:53
	← arcatech left	16:54
	→ gearnode joined	16:54
	← tiin57 left	16:57
mackerman	textconv filters are a way to call a program to get some text out of a file for use by diff and log https://git-scm.com/docs/gitattributes#_performing_text_diffs_of_binary_files	16:57
	→ arcatech joined	16:58
mackerman	Assuming such a program exists, its very specific to the file formats used.	16:58
Kodak22	gotcha, thanks!	16:59
	→ tiin57 joined	17:01
mackerman	Even with non-diffable binary blobs, git basics are useful. A history, documented commit messages, and GPG signed releases.	17:02
	← DevAntoine left	17:03
	→ DevAntoine joined	17:04
Kodak22	yeah. btw, talking about repo size, does git keep copies of old files?	17:04
ikke	yes	17:05
	that's it's whole purpose	17:05
Kodak22	right, ofc (like i said, only know very little about git), thanks for clearing that up >.<	17:06
	← Sc0tty- left	17:06
ikke	so dependening on the size of the cad files, that could increase the size of the repository significantly	17:07
	← Cork left	17:09
	← Haohmaru left	17:09
	→ wootehfoot joined	17:10
	← rsx left	17:10
imMute	note that git compresses the files, so it's not like it's storing 1:1 copies of every version of the file. but "binary" files tend to not compress well.	17:10
	← sgn1 left	17:11
	→ sgn joined	17:11
Kodak22	I'm not really stressed about that though, now that i think about it, commits will be rare (atleast once we're ready to publish). What i'm more stressed about is tracking dependencies over versions of the movements (skeletonised, automatic vs manual wind etc)	17:11
EvanCarroll	Kodak22: I wouldn't use git if the files are strictly binary, what's the point? What do you want to achieve if you can't meaningfully use delta-diffs.	17:11
	→ Cork joined	17:11
Kodak22	Its to track versions of the same base movement, track dependencies (like this pinion goes in versions A, B, D, but not in C, for example). I know its not a perfect fit, but setting up a CRM is scaring me	17:12
mackerman	git is better at tracking history than your average file sharing application.	17:12
Kodak22	brb, gotta run to the store real quick (i'm getting really useful feedback btw, thanks a million!!)	17:13
	← rfuentess left	17:17
	← Cork left	17:21
	← led_belly left	17:24
	→ Cork joined	17:25
	← jimmie_ left	17:25
	→ cd joined	17:26
Kodak22	The use-case of "this pinion goes in versions A, B, D, but not C". is that a realistic usecase of Git?	17:27
	← tiin57 left	17:27
	← hussam left	17:29
	→ hussam joined	17:30
mackerman	Could make sense as a feature branch from which A B D are derived	17:30
nedbat	Kodak22: it depends what you mean by "versions"? would these be separate branches?	17:30
	→ tiin57 joined	17:31
	← austin987 left	17:31
	→ led_belly joined	17:32
	← Xiti left	17:32
	← mehwork left	17:35
	→ sgn1 joined	17:36
	← orbyt_ left	17:37
Kodak22	nedbat i guess? they would be different watch movements, so i'm unsure if those would be branches or forks	17:37
	(again, forks, sorry)	17:38
	← chele left	17:38
	← karab44 left	17:38
	→ dimi1979 joined	17:38
	→ orbyt_v7 joined	17:38
	→ nyxyn joined	17:39
	← sgn left	17:40
	→ Xiti joined	17:40
	← nyxyn left	17:40
	← dimi1947 left	17:41
	← HumanG33k left	17:41
	→ mexen_office joined	17:43
	← hussam left	17:45
	→ hussam joined	17:45
	← sudoforge left	17:46
	→ sudoforge joined	17:47
	→ HumanG33k joined	17:50
	← sudoforge left	17:50
	→ sudoforge joined	17:50
	← HumanG33k left	17:51
	→ HumanG33k joined	17:52
	← wootehfoot left	17:53
	← Technodrome left	17:54
	← tiin57 left	17:57
	→ ArchNoob joined	17:58
	← Muimi left	17:59
	→ tiin57 joined	18:01
	→ maskat- joined	18:02
	← maskat- left	18:02
	→ austin987 joined	18:03
	← fflam left	18:04
	→ fflam joined	18:04
	← iskander left	18:04
	→ kek_ joined	18:05
kek_	hi	18:05
	→ charking joined	18:05
kek_	There is a repo A. I want to fork it. I want to pull changes from it but I want to push to my fork. Can I just fork it and add a second remote?	18:06
j416	yes	18:06
charking	Hello. On Linux how can you make a Git repository only readable by the owner (without setting umask globally)?	18:07
	If I chmod -R go-rwx the .git directory, as soon as I commit a new file, several files in .git get 0644 permissions.	18:07
kek_	thanks :)	18:08
kerframil	charking: as long as the top-most directory is 700, only the owner will be able to descend into it.	18:08
j416	o/	18:08
	→ noidea joined	18:08
	→ iskander joined	18:09
charking	kerframil: ah, right! Thanks.	18:10
	← iskander left	18:10
	← elSueco left	18:11
	→ elSueco joined	18:12
	← austin987 left	18:13
	→ Betal joined	18:16
	→ henri joined	18:16
	← henri left	18:16
	→ henri joined	18:17
	← maxster left	18:17
	→ Pickchea joined	18:18
nedbat	Kodak22: before we get to git: just using plain files, how would you manage these versions?	18:18
	→ wrobinson joined	18:19
nedbat	Kodak22: git is best for managing the time dimension of a project, keeping track of what it was like a year ago, and how it is now.	18:19
	→ durham joined	18:20
Kodak22	probably in a spreadsheet to be honest, which is why im frantically trying to find something a little bit more futureproof, but still manageable by people who are not tech-savvy	18:20
	← muhaha left	18:21
Kodak22	which is why the web interface of something like github sounds not too bad (where I, or someone else, could manage rights and if commits are accepted or not)	18:21
	→ durham_ joined	18:22
	→ stinkpot joined	18:23
Kodak22	I am also looking into open sourced, self hosted CRM as an option, but i am pessimistic	18:24
	← durham left	18:24
	← dmc left	18:25
	← durham_ left	18:27
Kodak22	er, sorry, i meant ERP (entreprise resource managment, not customer)	18:27
	→ austin987 joined	18:27
	← tiin57 left	18:27
	← gpanders left	18:27
	→ gpanders joined	18:27
	→ durham joined	18:28
Betal	Kodak22: did you check the selfhosted list?	18:28
Kodak22	@betal	18:29
	oops, Betal, no i dont know that list	18:29
	stinkpot → gigas_cedar	18:29
Betal	it might have something you like, https://github.com/awesome-selfhosted/awesome-selfhosted#enterprise-resource-planning	18:29
Kodak22	ah, thanks Betal!	18:30
	→ tiin57 joined	18:31
Betal	Kodak22: I did not tested 99% of this list :P	18:31
	← ghost43_ left	18:31
	→ ghost43 joined	18:31
	← Cork left	18:32
Betal	most git related selfhost are in "software development"	18:33
	Kodak22: try to make a list of things of what you need (like requeriments), and see if one of these projects can help	18:34
	→ Cork joined	18:34
	← ArchNoob left	18:36
	→ dmc joined	18:38
	→ dimi1947 joined	18:38
	→ maxster joined	18:38
	← durham left	18:38
	→ durham joined	18:38
	← Cork left	18:39
	← elSueco left	18:39
	← dimi1979 left	18:40
	→ impermanence joined	18:40
	→ shush joined	18:40
	← henri left	18:40
impermanence	is there an easy way to tell if my shop has github enterprise?	18:41
	I've literally never used it so I'm not sure how to tell the difference between community and enterprise	18:41
	→ henri joined	18:41
	→ oriba joined	18:43
	→ Cork joined	18:43
	← LetoThe2nd left	18:44
kerframil	try ##github, perhaps?	18:44
	← clime left	18:46
	← kek_ left	18:46
	→ Technodrome joined	18:47
	← Cork left	18:48
	← NeoCron left	18:49
	→ ArchNoob joined	18:52
	← abrac left	18:53
	← maxster left	18:53
	→ Cork joined	18:54
	→ worc3131 joined	18:54
	← tiin57 left	18:57
	→ wisbit joined	18:59
	← wisbit left	18:59
	→ wisbit joined	19:00
	← mexen_office left	19:00
	→ tiin57 joined	19:00
	← john_johnk left	19:01
	← Raging_Hog left	19:02
	← nasamuffin left	19:02
	→ nasamuffin joined	19:03
	← Hello71 left	19:04
	→ Hello71 joined	19:04
	→ bolovanos__ joined	19:05
	← AnAverageHuman left	19:05
	→ mitigate joined	19:05
	← moldorcoder7 left	19:06
	← DevAntoine left	19:06
	→ DevAntoine joined	19:07
	← stdedos left	19:07
mitigate	with git -v git-2.17, if I do git add -A -f and then do a git commit, the permissions of my [changed] files get changed: "mode change 100755 => 100644 configure" - why would this happen? is it a bug of that version in some ubuntu?	19:07
	I dont have a .gitattributes	19:08
	← bolovanos_ left	19:08
Kodak22	thanks Betal!!	19:09
mitigate	the permissions of the files on the disk havent changed. it is checked out on /dev/shm though	19:10
	→ clime joined	19:10
	← DevAntoine left	19:11
	→ john_johnk joined	19:12
	→ rond_ joined	19:14
	→ roadie joined	19:15
	← durham left	19:15
	→ durham joined	19:15
mitigate	git diff doesnt show anything. if i check it out in a different directory the permissions are lost	19:18
	→ moldorcoder7 joined	19:19
	→ abrac joined	19:23
	← ArchNoob left	19:23
	qsx` → qsx	19:23
mitigate	why is it doing the mode change??	19:23
	when the mode hasn't changed	19:24
	← sgn1 left	19:25
	← kupi left	19:27
osse	mitigate: what does ls -l configure say?	19:27
	← tiin57 left	19:27
	← fabs left	19:27
mitigate	it shows it correctly: -rwxr-xr-x 1 user group 1057 Feb 17 07:50 configure	19:28
	→ ArchNoob joined	19:28
mitigate	i'm just importing an unpacked tarball	19:29
	and a new version on top of it	19:29
osse	and what does git config core.fileMode say?	19:29
mitigate	hmm it says false	19:30
	it shouldnt	19:30
osse	add --show-origin	19:30
	→ tiin57 joined	19:31
	→ sgn joined	19:31
	→ AnAverageHuman joined	19:31
mitigate	yes it's changed in the .git/config. but i dont know how that could happen. i've already got a bunch of imported history without this happening.	19:32
osse	I don't know either	19:32
mitigate	i certainly didnt touch it.	19:32
osse	but it's probably the reason for this	19:33
mitigate	yes i should have spotted it. thanks	19:33
	← cdown left	19:33
	→ long4mud joined	19:34
	→ [[1g01wk]] joined	19:39
	← durham left	19:42
	→ durham joined	19:43
	← riksteri left	19:45
	← cliluw left	19:47
	→ cliluw joined	19:47
	← abrac left	19:50
	← rond_ left	19:53
	← tiin57 left	19:57
	← Lord_of_Life left	19:59
	← Kodak22 left	20:00
	→ jnavila joined	20:00
	→ elSueco joined	20:00
	→ tiin57 joined	20:01
	← srinidhi left	20:01
	← ArchNoob left	20:01
	→ milkt joined	20:02
	← elSueco left	20:02
	→ DarthRadar9 joined	20:04
CrtxReavr	So I made a commit of two file changes that's already been associated to a PR.	20:06
	← mitigate left	20:06
	← tgunr left	20:06
CrtxReavr	But I need to amend the commit by dropping the changes to one file, and adding a different version of the other file.	20:06
	← DarthRadar9 left	20:07
	→ srinidhi joined	20:07
	← POQDavid left	20:07
	← pikapika left	20:08
	← niv left	20:08
	→ elSueco joined	20:08
	→ sgn1 joined	20:10
	→ Lord_of_Life joined	20:10
	← jla left	20:11
	← dionysus69 left	20:11
	← sgn left	20:12
	→ maxster joined	20:13
	→ POQDavid joined	20:14
	→ pikapika joined	20:14
osse	go on	20:16
	→ niv joined	20:18
	→ jstein joined	20:20
	→ abrac joined	20:22
	← shush left	20:23
	→ dudebbn__ joined	20:25
	← sord937 left	20:25
	← abrac left	20:26
	← elSueco left	20:26
	→ bongjovi joined	20:26
	← tiin57 left	20:27
	→ elSueco joined	20:27
	→ tiin57 joined	20:30
	← srinidhi left	20:32
	→ tgunr joined	20:33
	← cliluw left	20:34
	← roadie left	20:34
	→ roadie joined	20:35
	→ heysucko joined	20:35
	→ cliluw joined	20:35
	← elSueco left	20:35
	→ srinidhi joined	20:36
	→ elSueco joined	20:36
	→ jla joined	20:36
	← jla left	20:37
	← Pickchea left	20:37
	← cliluw left	20:38
	→ cliluw joined	20:39
	← charking left	20:40
	← worc3131 left	20:41
	→ worc3131 joined	20:42
	← srinidhi left	20:43
	← cliluw left	20:43
	← tonythomas left	20:44
	→ srinidhi joined	20:44
	← shabius_ left	20:45
	← srinidhi left	20:46
	← maxster left	20:46
	← noidea left	20:51
	→ shabius joined	20:53
	→ srinidhi joined	20:53
	→ p-core joined	20:54
	← tiin57 left	20:57
	← p-core left	20:57
	→ shush joined	20:59
	→ boutcher joined	20:59
	→ tiin57 joined	21:00
	→ cyrus_mc_ joined	21:01
	→ cdown joined	21:01
	← ndorf left	21:02
	→ maxster joined	21:02
	→ ndorf joined	21:02
	→ zebrag joined	21:06
	← pikapika left	21:07
CrtxReavr	Can I remove changes to a file that's been committed and pushed, but not merged?	21:08
	← niv left	21:08
	← POQDavid left	21:08
CrtxReavr	'git show' lists changes to two files.	21:09
	← n3wborn left	21:10
osse	CrtxReavr: yes	21:10
CrtxReavr	And how would I go about that?	21:10
osse	do e.g. git checkout -p HEAD~1 -- file	21:10
	pick and choose changes	21:10
	→ NeoCron joined	21:10
osse	(or just edit the file, whichever is easiest)	21:10
	git commit --amend and git push --force	21:10
	→ bolovanos_ joined	21:11
	→ niv joined	21:11
	→ n3wborn joined	21:12
	→ pikapika joined	21:12
CrtxReavr	'git commit --amend' gives me:	21:13
	error: insufficient permission for adding an object to repository database .git/objects	21:13
	error: Error building trees	21:13
	← bolovanos__ left	21:14
CrtxReavr	The first line actually prints twice.	21:14
	→ royal_screwup21 joined	21:14
osse	hmm	21:14
	← maxster left	21:14
osse	judging by the error it sounds like the kind of error you'	21:14
	d get with just a plain git commit as well	21:14
CrtxReavr	I need to amend the commit message too.	21:15
	← Karyon left	21:15
osse	you will be prompted to modify the message	21:16
	→ POQDavid joined	21:16
	→ Karyon joined	21:17
	→ tgunr_ joined	21:17
	← roadie left	21:18
	← Maxattax left	21:18
	→ tgunr- joined	21:19
	← tgunr left	21:19
	← impermanence left	21:20
	← tgunr_ left	21:22
	← bolovanos_ left	21:24
	← cdown left	21:25
	→ rc_the_sound_guy joined	21:26
	→ bn_work joined	21:26
	← tiin57 left	21:27
	← heysucko left	21:27
	← tgunr- left	21:28
	← rc_the_sound_guy left	21:30
	→ tiin57 joined	21:31
	→ sgn joined	21:31
	← jelmer left	21:31
	→ tgunr joined	21:33
	← sgn1 left	21:33
	→ jelmer joined	21:34
	← shush left	21:34
	→ shush joined	21:35
	← CryptoClub left	21:37
	→ Socialoutcast joined	21:37
	→ tgunr_ joined	21:38
	← shush left	21:38
	→ shush joined	21:38
	→ CryptoClub joined	21:38
	← tgunr left	21:39
	→ maxster joined	21:39
	← zmt01 left	21:40
	← henri left	21:43
	← worc3131 left	21:44
	← dimi1947 left	21:50
	→ rak joined	21:51
rak	I have branches B and C forked from a common ancestor A. I have deleted some files from B, and some files from C. How can I develop these two branches independently and merge changes from B into C and vice versa without the file deletions propagating?	21:52
	I had hoped that doing a 'git merge -s ours' from B into C and from C into B at the outset would somehow create a merge resolution and that git would remember the merge going forward, but every time I try to make a subsequent merge, git keeps trying to delete the files again.	21:53
	→ tedfernau joined	21:53
imMute	git wasn't designed to handle a use case like that...	21:53
	→ irc_user joined	21:54
	→ cliluw joined	21:54
	← tiin57 left	21:57
	← Socialoutcast left	21:58
	→ ArchNoob joined	21:58
	← maxster left	21:59
	→ tiin57 joined	22:00
	← dgw left	22:03
	→ dgw joined	22:04
	→ codebam_ joined	22:05
	← stats4647 left	22:05
	← jnavila left	22:06
	→ stats4647 joined	22:06
	→ maxster joined	22:07
	← royal_screwup21 left	22:08
	→ royal_screwup21 joined	22:08
	← boutcher left	22:09
	← bongjovi left	22:11
	→ durham_ joined	22:13
	← durham left	22:13
	← skered left	22:18
	← m0viefreak left	22:19
	← NeoCron left	22:20
	→ Maxattax joined	22:21
	← maxster left	22:23
	← misuto left	22:23
	→ skered joined	22:24
	← tiin57 left	22:27
	← Technodrome left	22:29
	← jess left	22:30
	→ tiin57 joined	22:30
	→ geirha joined	22:31
	← gearnode left	22:32
	← amahl left	22:35
	→ durham joined	22:37
	← durham_ left	22:37
	→ jaziz joined	22:41
	← orbyt_v7 left	22:42
	→ impermanence joined	22:44
	← sgn left	22:45
	← durham left	22:47
	← soifou left	22:48
	← jstein left	22:48
	→ soifou joined	22:48
	← royal_screwup21 left	22:51
	→ sgn joined	22:51
	→ royal_screwup21 joined	22:53
	→ durham joined	22:54
	→ maxster joined	22:56
	← tiin57 left	22:57
	← cd left	22:58
	→ misuto joined	22:59
	← LouWestin left	23:00
	→ tiin57 joined	23:00
	→ jess joined	23:01
	→ LouWestin joined	23:01
	→ durham_ joined	23:03
	← durham left	23:03
	← Maxattax left	23:07
	→ Maxattax joined	23:07
	← wrobinson left	23:09
	← john_johnk left	23:12
	→ bolovanos joined	23:12
	← BlessJah left	23:15
	→ john_johnk joined	23:15
	← maxster left	23:15
	→ BlessJah joined	23:15
	→ oatmealraisin joined	23:15
	→ maxster joined	23:15
	→ Dotz0cat joined	23:16
	→ zmt00 joined	23:17
	← onizu left	23:18
	← impermanence left	23:18
	← royal_screwup21 left	23:19
	→ royal_screwup21 joined	23:19
	→ ferdna joined	23:20
	→ bolovanos_ joined	23:21
	← arcatech left	23:23
	← bolovanos left	23:23
	← royal_screwup21 left	23:24
	← justan0theruser left	23:25
	← shush left	23:26
	← john_johnk left	23:26
	← tiin57 left	23:27
	← bolovanos_ left	23:27
	→ tiin57 joined	23:30
	→ gearnode joined	23:30
	→ sgn1 joined	23:37
	← zebrag left	23:38
	→ codebam__ joined	23:38
	→ zebrag joined	23:38
	← codebam_ left	23:38
	← sgn left	23:38
	← codebam__ left	23:41
	← nehsou^ left	23:43
	← calcul0n left	23:44
	→ arcatech joined	23:50
	← arcatech left	23:52
	sgn1 → sgn	23:54
	← ArchNoob left	23:54
	→ royal_screwup21 joined	23:56
	→ shush joined	23:56
	→ Xenguy joined	23:57
	← adder`` left	23:57
	← tiin57 left	23:57
	← adder left	23:57
	→ arcatech joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation