IRCloggy #git 2021-11-02

Logs Search ←Prev date Next date→ Channels Documentation

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-11-02

← pah left00:00
→ pah_ joined00:00
→ w0ng joined00:00
← shokohsc8 left00:04
← pah_ left00:05
→ shokohsc8 joined00:05
← TJ- left00:07
→ average joined00:12
→ causaui1 joined00:19
→ ferdna joined00:19
← Lord_of_Life left00:21
→ Lord_of_Life_ joined00:21
→ pah joined00:21
Lord_of_Life_ → Lord_of_Life00:22
← dextercd left00:23
← causaui1 left00:24
→ cmbengue joined00:25
→ causaui1 joined00:25
→ BUSY joined00:26
→ DoofusCanadensis joined00:27
→ perrierjouet joined00:27
← hbautista_ left00:30
← vicfred left00:34
→ ttree joined00:37
← causaui1 left00:40
← rgrinberg left00:40
← oriba left00:42
← mhi left00:44
→ mhi joined00:44
→ ThorMojito joined00:45
→ hbautista_ joined00:54
→ Codaraxis_ joined00:57
← Codaraxis_ left00:58
← hbautista_ left00:58
→ hbautista joined00:59
← Codaraxis left01:01
← ThorMojito left01:02
→ thebombzen joined01:05
→ causaui1 joined01:07
← michigan left01:09
← ferdna left01:10
→ pabs3 joined01:11
← causaui1 left01:12
← durham left01:12
→ ferdna joined01:14
→ Xenguy joined01:16
→ ThorMojito joined01:24
← MrC left01:25
← ThorMojito left01:40
→ cbreak_ joined01:40
← cbreak left01:41
→ rgrinberg joined01:51
← cbreak_ left01:52
→ cbreak joined01:55
← kajiryoji left01:57
← eschwartz left01:58
→ kajiryoji joined01:59
← Swahili_ left02:01
→ Swahili joined02:01
← jancoow left02:02
← xkuru left02:04
→ navidr joined02:04
← vdamewood left02:04
→ batrick joined02:05
← ttree left02:10
← causa_sui left02:10
→ eschwartz joined02:12
→ lgc joined02:12
← perrierjouet left02:14
← juliopcrj left02:17
→ jazzy3 joined02:18
← jazzy left02:19
← lgc left02:20
→ lgc joined02:20
→ ttree joined02:23
← ChmEarl left02:25
← average left02:26
→ causaui1 joined02:26
← causaui1 left02:31
→ jancoow joined02:36
← jetchisel left02:37
← jazzy3 left02:39
→ jetchisel joined02:39
← zmt01 left02:42
← emf left02:43
→ jazzy joined02:44
→ emf joined02:45
→ zmt00 joined02:45
← Murr left02:47
→ Murr joined02:47
→ The_Jag joined02:50
← The_Jag_ left02:52
← cmbengue left02:54
→ emf_ joined02:56
← emf left02:58
← hbautista left02:59
→ cmbengue joined02:59
→ RiFo joined03:00
→ causaui1 joined03:01
→ average joined03:05
← causaui1 left03:06
→ perrierjouet joined03:07
→ tWqaq joined03:15
→ Test3662 joined03:16
← Test3662 left03:18
→ cosmic_owl joined03:21
→ mat001 joined03:27
← mat001_ left03:30
→ durham joined03:31
← rossy_ left03:32
← tWqaq left03:35
← sudoforge left03:37
→ sudoforge joined03:38
→ tWqaq joined03:38
← tWqaq left03:39
→ causaui1 joined03:39
← cosmic_owl left03:40
→ tWqaq joined03:41
→ zmt01 joined03:41
← zmt00 left03:43
← causaui1 left03:43
← FinnElija left03:45
← tWqaq left03:47
→ FinnElija joined03:47
→ tWqaq joined03:48
← tWqaq left03:48
→ tWqaq joined03:50
← tWqaq left03:50
→ saroy joined03:52
→ tWqaq joined03:52
← tWqaq left03:53
← sudoforge left03:54
→ tWqaq joined03:55
← tWqaq left03:57
→ tWqaq joined03:58
← tWqaq left03:58
← DoofusCanadensis left03:59
→ tWqaq joined04:01
← tWqaq left04:01
→ tWqaq joined04:02
← tWqaq left04:02
→ tWqaq joined04:04
← bgs left04:09
← mannequin left04:12
→ bgs joined04:14
← zmt01 left04:15
← tWqaq left04:17
→ tWqaq joined04:19
← tWqaq left04:21
→ tWqaq joined04:22
← tWqaq left04:23
→ tWqaq joined04:24
← tWqaq left04:24
← navidr left04:24
→ tWqaq joined04:25
← tWqaq left04:25
→ tWqaq joined04:27
← tWqaq left04:27
→ zmt00 joined04:28
→ tWqaq joined04:29
← tWqaq left04:29
← zmt00 left04:35
→ pah_ joined04:38
← pah left04:39
← ferdna left04:39
← remyabel left04:41
→ remyabel joined04:41
← gast0n left04:46
← Murr left04:47
→ Murr joined04:47
→ pah joined04:48
← pah_ left04:48
← reset left04:49
→ cronos joined04:53
← bloody left04:57
← pah left04:58
→ pah joined04:59
→ enyc joined05:02
← pabs3 left05:04
→ zmt00 joined05:17
__xor → _xor05:18
← alkino left05:23
→ alkino joined05:24
→ AsenMx joined05:25
← igemnace left05:25
→ igemnace joined05:26
← zmt00 left05:26
→ zmt00 joined05:28
→ zmt01 joined05:34
← tmz left05:34
← zmt00 left05:39
→ tmz joined05:40
→ mat001_ joined05:43
→ causaui1 joined05:45
← mat001 left05:46
← tejr left05:47
→ tejr joined05:47
← enyc left05:50
← causaui1 left05:50
← Xaldafax left05:50
← rgrinberg left05:53
← pah left05:54
→ zmt00 joined05:54
← zmt00 left05:55
→ hbautista joined05:56
→ pah joined05:57
← hbautista left05:57
→ hbautista joined05:57
← zmt01 left05:58
← remyabel left06:09
→ GNUmoon joined06:12
→ mallkrampus joined06:18
→ causaui1 joined06:19
← Swahili left06:24
← causaui1 left06:24
→ Swahili joined06:25
← thiago left06:29
→ roadie joined06:38
← pulse left06:40
→ molten joined06:41
→ alkino_ joined06:43
← alkino left06:43
→ bkircher joined06:44
← lavos left06:44
← hbautista left06:44
← molten left06:45
→ mat001 joined06:48
→ otisolsen70 joined06:48
← mat001_ left06:52
← Ilyu left07:04
← unluckyshrubbery left07:04
← eblip left07:05
→ kenanmarasli joined07:07
→ eblip joined07:07
← skapata left07:13
→ mannequin joined07:14
← ttree left07:17
→ lkor joined07:20
→ travisghansen joined07:22
pah → pa07:28
← anddam left07:30
→ MrC joined07:41
→ mat001_ joined07:45
← mat001 left07:48
→ theoceaniscool joined07:52
← rahl left07:56
→ palasso joined07:57
→ rahl joined07:57
→ chemsmith joined07:59
→ Ilyu joined08:05
→ nad joined08:06
→ causaui1 joined08:09
← mat001_ left08:12
→ vladoski joined08:13
← causaui1 left08:14
lkor → lionkor08:15
→ mven joined08:19
→ mven` joined08:23
← mven left08:25
← tejr left08:25
→ tejr joined08:25
→ Komputilo joined08:27
← Trieste_ left08:31
→ john_johnk joined08:32
→ Trieste joined08:36
→ pretty_dumm_guy joined08:36
← jazzy left08:38
→ spare joined08:41
→ molt joined08:43
→ causaui1 joined08:45
← Murr left08:47
→ Murr joined08:47
← causaui1 left08:50
← mschorm left08:54
← AbleBacon left08:56
→ enyc joined09:04
← lionkor left09:06
→ mschorm joined09:07
→ ttree joined09:10
→ lpapp joined09:10
lpapp osse: any fun with head?09:10
→ unluckyshrubbery joined09:13
← pa left09:14
→ drogas joined09:15
← dviola left09:15
osse no09:15
→ pah joined09:15
← spare left09:16
→ raffaele__ joined09:17
lpapp is git diff --name-status main f the best command to check what files were changed, added, deleted, etc, in a branch compared to main?09:18
← roadie left09:19
→ causaui1 joined09:20
← pah left09:21
← otisolsen70 left09:21
lpapp or git diff --stat --color main f?09:21
→ pah joined09:22
→ mei joined09:22
→ YuGiOhJCJ joined09:22
drogas why is the git version on my ubuntu 2.17.1? is that the latest?09:22
thought I saw 2.9 somewhere09:23
wonder why it hasn't been updated09:23
← webmariner left09:23
bookworm 2.9 is older than 2.17, just saying09:24
but Ubuntu lags behind, same as any other "stable" distro09:24
they only backport security fixes, not functionality between different distro versions09:24
← causaui1 left09:24
← wender left09:24
← ttree left09:24
→ otisolsen70 joined09:25
← cmbengue left09:25
drogas has there been major changes since 2.17 that one must have?09:25
bookworm are you missing anything? Then yes, else no. I personally like new features and don't like stable distros09:29
you need to make your own choice09:29
→ computeiro joined09:30
← perrierjouet left09:30
drogas which distro are you on? arch?09:35
bookworm doesn't matter much, but yes. Gentoo has the same benefit, so does fedora (kinda)09:36
← alzgh left09:38
→ TJ- joined09:41
← wolfshappen left09:43
→ wolfshappen_ joined09:43
← john_johnk left09:46
← Shentino left09:48
→ perrierjouet joined09:48
→ Shentino joined09:51
→ dviola joined09:51
→ Lope joined09:52
Lope Is there a way to revert a commit, while keeping the working copy as is?09:53
→ gordonfish- joined09:54
→ causaui1 joined09:54
bookworm reset --soft but that's not really a revert09:55
← gordonfish left09:56
Lope bookworm, well, perhaps revert is the wrong terminology09:57
basically I made a WIP commit like 6 commits back09:57
since then I've basically merged staging into my branch about 5 times.09:57
I want to keep my working copy as is, but somehow uncommit that commit that I did, about 6 commits back.09:57
← causaui1 left09:59
Lope So I was thinking perhaps there is a way I can revert the WIP commit, then take note of my head position (let's call it latest) then checkout the WIP then reset my head to latest.09:59
I'm going to try it.10:00
I've backed up my whole project incl git.10:00
← Swahili left10:04
→ Swahili joined10:04
Lope It seems like I was successful.10:11
So this is what I did.10:11
→ pah_ joined10:11
← pah left10:11
Lope git revert <WIP>; git cherry-pick <WIP>; git undo; git reset;10:12
git undo is from the git-extras debian package.10:13
It uncommits the last commit.10:13
← lpapp left10:13
→ furrymcgee joined10:13
→ epolanski joined10:15
Lope Thanks self. You're awesome.10:16
Thanks, you too!10:16
← pah_ left10:18
→ pah joined10:18
← nad left10:19
→ roadie joined10:23
→ vlado_ joined10:25
← vladoski left10:28
← vlado_ left10:30
→ vladoski joined10:31
← furrymcgee left10:34
pah → pa10:36
← igemnace left10:37
← pa left10:41
→ pah joined10:43
← TJ- left10:47
← Murr left10:47
→ Murr joined10:47
← thblt left10:48
← pah left10:48
→ nad joined10:49
→ shad joined10:50
shad Hi, today i fucked up by commiting creds to a remote branch. This branch hasn't been merged to main, and i've saved locally the files i needed. What's the up-to-date and cleanest method of deleting all traces of that branch and its commit history so that it won't ever appear again in our gitlab ?10:51
→ pah joined10:52
← liefer left10:53
mdk shad: Just change the creds.10:54
shad :<10:55
dviola you could also squash all the commits in that branch to 1 commit, git reset HEAD^ to undo the commit and keep the changes, then git add/commit carefully... but then you lose your history10:56
I second mdk suggestion10:57
shad the branch only has 1 commit now, the one commit i want to nuke10:57
→ liefer joined10:58
dviola shad: in that case, git reset HEAD^ to undo the last commit, remove the unwanted changes, git add files, git commit, git push --force origin branch11:02
but you should be careful with force, make sure nobody else is working on it11:03
you should still change your creds11:03
mannequin yes, lifer, idd, don't expect anything else11:04
← roadie left11:05
→ causaui1 joined11:05
← pah left11:07
shad dviola: no one is working on that branch ; i did git reset, git add, git commit, git push -f ... but it only created a new commit, it didn't remove the previous one11:08
well, it did... weird11:08
→ roadie joined11:08
shad Gitlab mentions only one commit, the "oops" correction one, but the branch log still mentions the faulty commit11:08
mdk Anyway, change the creds, someone could have pulled right away and still have it.11:08
→ furrymcgee joined11:09
mannequin chains of the network11:09
shad This repository is private to our org, there's no risk per se11:09
→ pah joined11:09
← causaui1 left11:10
shad i just want to keep a git history clean, but there's no need to go full operation PURGE on that11:10
← liefer left11:13
→ liefer joined11:14
← faceface left11:21
← liefer left11:28
→ liefer joined11:29
kenanmarasli is it possible to revert a range of commits to a previous state, except changes made to a path?11:31
I guess do a complete revert and checkout the contents from the current commit, and I didn't see an option for 'not-reverting' a pathspec in the manual11:32
→ lavos joined11:39
rawtaz perhaps you can revert it all and then pick parts of the commits you reverted back?11:39
the commits are there even if you revert, see `git reflog` (or just remember their commit IDs)11:40
← molt left11:42
→ treefrob joined11:43
→ causaui1 joined11:46
kenanmarasli rawtaz: yeah that's what I thought11:47
→ cmbengue joined11:50
rawtaz worst case you can always edit a commit, so..11:50
← causaui1 left11:51
← roadie left11:56
kenanmarasli true, ty11:56
dminuoso kenanmarasli: Reverting somehow and checking out that singular file seems like the quickest option11:58
rawtaz dminuoso: what do you use to pick out a single file or similar from a commit?12:00
kenanmarasli rawtaz: git checkout12:02
← nad left12:02
← fercell left12:03
← lavos left12:03
→ lionkor joined12:06
← shad left12:07
rawtaz ok12:14
← Ilyu left12:15
← GNUmoon left12:17
→ constxd joined12:19
→ roadie joined12:22
→ GNUmoon joined12:27
← roadie left12:29
← mei left12:32
← nrg left12:32
→ mei joined12:36
→ mat001 joined12:41
→ nrg joined12:45
→ nad joined12:46
← nad left12:46
→ gh34 joined12:46
← Murr left12:47
→ Murr joined12:47
→ fercell joined12:48
← mei left12:48
← jrofd left12:50
→ shad joined12:54
→ gas51627 joined12:54
← Xenguy left12:57
→ jrofd joined13:03
← nrg left13:03
→ mat001_ joined13:05
← average left13:06
→ causaui1 joined13:06
→ nrg joined13:07
← mat001 left13:08
→ bloody joined13:09
→ betelgeuse joined13:09
← YuGiOhJCJ left13:10
← rahl left13:11
← causaui1 left13:12
← nrg left13:12
→ ThorMojito joined13:15
← zulutango left13:18
→ Ilyu joined13:18
→ zulutango joined13:18
→ nrg joined13:19
← lemonsnicks left13:24
→ lemonsnicks joined13:24
→ AbleBacon joined13:25
← Ilyu left13:27
← fercell left13:28
→ fercell joined13:29
← The_Jag left13:34
→ The_Jag joined13:35
→ reset joined13:38
→ pulse joined13:42
→ mei joined13:46
→ pah_ joined13:47
← pah left13:48
← otisolsen70 left13:49
← mei left13:52
→ mei joined13:52
← mei left14:06
← AsenMx left14:07
→ AsenMx joined14:08
← zulutango left14:08
→ zulutango joined14:09
→ causaui1 joined14:15
wyre I'm a little confused with `git merge` guys, when I'm in master branch and I want to merge changes from another branch into it ... should I run `git merge <some branch>`?14:16
or should I checkout <some branch> and then do `git merge master`?14:16
→ rahl joined14:17
osse wyre: the former14:17
← furrymcgee left14:18
→ mat001 joined14:21
← mat001_ left14:24
→ arcatech joined14:24
→ gast0n joined14:24
← Lope left14:25
wyre osse, so `git merge` is for merging another branch in the curren one where you did `git checkout`, right?14:26
osse wyre: yes14:33
rule of thumb: it is always the current branch that is changed14:33
→ rgrinberg joined14:34
imMute wyre: another way to remember it is that you can merge multiple things at the same time: git merge feature-1 feature-2 # will merge feature-1 and feature-2 into the current branch14:37
the only way that makes sense is if the branch you're merging in to is the implicit one - the branch that's currently checked out14:37
→ skapata joined14:42
← skapata left14:42
→ skapata joined14:42
→ mei joined14:49
→ frobnic joined14:49
← madewokherd left14:50
→ anddam joined14:52
→ junktext joined15:02
← ThorMojito left15:05
→ meator joined15:10
← pretty_dumm_guy left15:11
→ ThorMojito joined15:12
→ thiago joined15:13
← gas51627 left15:14
→ madewokherd joined15:19
← mei left15:20
← ThorMojito left15:22
← liefer left15:25
→ pretty_dumm_guy joined15:27
→ bluesm joined15:28
→ liefer joined15:29
bluesm Are pull requests github's/bitbucket’s concepts or can I discuss them here?15:31
osse Yes.15:32
ikke 0:D15:32
bluesm Yes.15:33
They are and I can discuss them here.15:33
← mallkrampus left15:34
← meator left15:34
bluesm I submitted pull request on bitbucket. Now after review I want to make small adjustment. What I do now. Make new commit on the branch that I asked to merge and then make new pull request or I can do it „inside” of one pull request?15:35
osse If you push a new commit to the branch then the PR will automatically reflect that15:35
bluesm osse: Thank you15:36
← CrtxReavr left15:36
saroy → bytehackr15:38
← bloody left15:38
→ sandipan joined15:38
← bytehackr left15:39
← sandipan left15:39
→ bytehackr joined15:39
→ saroy joined15:39
← saroy left15:39
← bytehackr left15:39
← rgrinberg left15:40
→ saroy joined15:40
→ bloody joined15:40
← liefer left15:44
→ ThorMojito joined15:44
→ liefer joined15:44
→ mallkrampus joined15:47
→ DoofusCanadensis joined15:51
→ ChmEarl joined15:53
← pulse left15:54
→ Null_A joined15:55
← Komputilo left15:55
→ zmt00 joined15:58
← gh34 left16:00
→ gh34 joined16:00
→ lkor joined16:01
← lionkor left16:02
← kenanmarasli left16:07
← GNUmoon left16:08
jancoow So, my git keeps showing changes which are not there, it's the exact same code. However, git diff -b does show the correct changes without the duplicated one16:08
I believe this has something to do with line endings, but I'm unable to solv eit16:08
how can I solve this?16:08
DoofusCanadensis I've seen that happen with a repo created on a case-insensitive file system where the case of the filename changed16:10
jancoow it's not that. There are parts of the code changed16:10
not the whole file16:10
Im on linux now but it is commited on windows16:11
or well, the file was edited in my windows virtual machine on my linux file system16:11
and now I switched to an editor on linux16:11
osse jancoow: what does git show HEAD:path/to/file | file - say ?16:15
→ GNUmoon joined16:18
→ gas51627 joined16:20
→ jazzy2 joined16:21
← ThorMojito left16:25
→ neightchan joined16:28
→ cvmn joined16:28
← natechan left16:29
jazzy2 → jazzy316:29
jazzy3 → jazzy16:29
← GNUmoon left16:31
→ dextercd joined16:31
→ lionkor joined16:33
← lkor left16:34
← chemsmith left16:34
→ chemsmith joined16:35
→ GNUmoon joined16:42
← Murr left16:46
→ Murr joined16:47
→ lkor joined16:47
← lionkor left16:48
→ ThorMojito joined16:48
← theoceaniscool left16:48
→ harpia joined16:49
← pretty_dumm_guy left16:50
→ pretty_dumm_guy joined16:52
constxd Kings16:54
Is there a more concise way to write: git diff HEAD $(git merge-base HEAD master)16:55
→ kenanmarasli joined16:55
constxd ahh16:57
git diff master...HEAD16:57
based16:57
← BlessJah left17:00
→ BlessJah joined17:02
→ Xaldafax joined17:03
pah_ → pa17:08
← pa left17:08
→ pa joined17:08
← ThorMojito left17:10
osse thank mr friberg17:10
← shad left17:13
constxd osse: can you explain that reference?17:13
← durham left17:14
→ durham joined17:14
← harpia left17:29
→ Rashad joined17:30
← vladoski left17:31
← saroy left17:32
→ remyabel joined17:32
→ saroy joined17:36
→ cryptone1tor joined17:39
→ raffaele_ joined17:40
← raffaele__ left17:40
→ ThorMojito joined17:40
← pa left17:40
← cryptonector left17:43
→ pah joined17:43
→ Null_A_ joined17:52
→ Kobaz joined17:52
← pah left17:53
→ ___nick___ joined17:54
← Null_A left17:54
← w0ng left17:55
Kobaz hey so... i have a shared development server multiple people might log into to make commits in one working copy... what's a good way to enforce the names... like .gitconfig would have no name set, and then maybe use an environment variable to 'log in' and set the git commit userinfo?17:56
imMute Kobaz: short answer: don't do that.17:57
Kobaz i know17:57
but, if I wanted to...17:57
DoofusCanadensis give them their own account on the server17:58
Kobaz there's a method to the madness17:58
yeah i was thinking of that, and then su -p to keep the original user info17:58
DoofusCanadensis no17:58
just their own account, let them clone into their work directory17:58
fetch and push commits17:58
imMute yeah, don't use shared working trees...17:58
Kobaz yeah, no17:58
→ pah joined17:58
DoofusCanadensis this has all been figured out already17:59
don't bypass the working model17:59
→ AmR joined17:59
Kobaz we don't work like that, certain things need to be in certain places, like system config files17:59
can't be in local working directories17:59
apache configs, whatever17:59
typically each developer has their own vm, so everything is self-contained17:59
DoofusCanadensis deploy to production, don't edit in place17:59
Kobaz but then the unit testing server... anyone can log into17:59
mackerman Write automation scripts, rather than making the work tree itself the config files.17:59
DoofusCanadensis unit tests should be done on developer machines18:00
integration tests with a CI server18:00
mackerman You need etckeeper level of hacks to keep the file permissions, that git doesn't preserve18:00
Kobaz right, that's level 1 for testing18:00
and then the main unit test machine will test everyone's crap18:01
→ Null_A joined18:01
← Null_A_ left18:01
Kobaz so then i can just do su -p then to set the username18:02
if there's no like env vars for it18:02
i know there's best practices and whatnot, but in this case i have my reasons and i don't mind breaking the rules18:02
→ vicfred joined18:02
Kobaz oh, i can write a wrapper for git commit18:03
etc18:03
that'll work pretty well actually18:03
imMute honestly if you're so insistent on it, just use the env vars18:04
Kobaz okay well that was my question :)18:04
wee GIT_COMMITTER_IDENT18:05
yeah i just was wondering IF there were such things18:05
pah → pa18:07
Kobaz so this is what i ran into18:08
so if i remove [user] from .gitconfig18:08
it sets default committer to root <root@whatever>18:08
I think there's a setting to enforce the [user] stuff to be populated before you can commit?18:09
imMute user.useConfigOnly true18:10
(note that "config" also means the env vars, not just config *files*)18:10
Kobaz k18:11
→ lionkor joined18:12
← lkor left18:13
← darkstardevx left18:14
← unluckyshrubbery left18:19
→ Milos joined18:22
→ Komputilo joined18:27
← saroy left18:28
← lionkor left18:28
← arcatech left18:32
→ unluckyshrubbery joined18:33
→ darkstardevx joined18:35
→ mei joined18:38
← Null_A left18:38
→ Null_A joined18:46
← cvmn left18:46
→ cvmn joined18:46
← DoofusCanadensis left18:57
→ DoofusCanadensis joined18:57
← dsrt^ left18:58
→ sebastorama joined19:04
← sebastorama left19:04
→ Fortran joined19:05
→ goldfish joined19:06
→ saroy joined19:06
Fortran Hello all. I have a question about git-checkout. I think I'm reading the man page correctly, but I can't seem to get something to work.19:07
imMute Fortran: what are you trying to do? what did you expect to happen? what actually happened?19:08
Fortran I'm wondering why `git checkout --detach branch-name` doesn't work for me. The git-checkout man page seems to say it should be possible.19:08
❯ git checkout --detach develop19:08
fatal: '--detach' cannot be used with '-b/-B/--orphan'19:08
← mfiano left19:08
imMute Fortran: do you have checkout alised to something else??19:09
→ mfiano joined19:10
Hash → LordOfThePings19:10
Fortran Nope. I don't think so!19:11
osse it's not possible to alias checkout19:12
what does 'type git' say19:12
→ sebastorama joined19:12
Fortran ❯ type git19:13
git is /Users/mathomp4/bin/git19:13
❯ git --version19:14
git version 2.33.119:14
← sebastorama left19:14
Fortran Note that is a symlink to a homebrew git. It's my way to make sure I don't get Apple/BSD git :)19:14
osse try GIT_TRACE=1 git checkout --detach develop19:15
Fortran Not too exciting:19:15
❯ GIT_TRACE=1 git checkout --detach develop19:15
15:15:16.037277 git.c:455 trace: built-in: git checkout --detach develop19:15
fatal: '--detach' cannot be used with '-b/-B/--orphan'19:15
→ sebastorama joined19:15
osse at least I know your timezone19:16
Fortran :)19:16
osse does develop exist?19:17
← saroy left19:17
Fortran oh yes.19:17
❯ git checkout develop19:17
Branch 'develop' set up to track remote branch 'develop' from 'origin'.19:17
Switched to a new branch 'develop'19:17
osse now it does... it didn't before19:17
Fortran Ohhhh. Grah. Okay.19:18
← Shentino left19:18
osse my guess: 'git checkout nonexistent' uses -b under the hood, which is incompatible with --detach19:18
Fortran I always forget about that.19:18
❯ git checkout --detach origin/develop19:18
HEAD is now at 43c39a6 Merge pull request #1134 from GEOS-ESM/feature/tclune/#530-nf90-string-support19:18
osse therefore the error19:18
→ webmariner joined19:19
← rkta left19:19
Fortran I guess I'm so used to checkout finding the origin when it's not local. Bad me. Okay. This might clean up some scripting I'm doing. Just need to append `origin/`19:19
→ rkta joined19:19
osse --detach is not needed with origin/develop by the way19:20
it only has an effect for branches19:20
→ Shentino joined19:20
→ SnowCode joined19:23
Fortran Yeah. I just wanted to prove that to myself. I'm trying to fix up a tool that calls git underneath and I always want branches to initially be in detached-head state. For now, it might just be simplest to do `git checkout deadbeef` and then `git checkout --detach`. It's a no-op on tags and hashes if deadbeef is one, and does what I want on branches.19:23
SnowCode Hello, this is a pretty dumb question from me, but I'm trying to clean a repo. I've cleaned a big part locally, but I don't know how to push it to my remote.19:23
Fortran Thanks, osse for the help :)19:24
osse Fortran: pro-tip: git checkout deadbeef^{commit}19:24
SnowCode I've cleaned it, it's 400MB on my local but it's still 700MB on my remote19:24
← Fortran left19:25
ikke SnowCode: You cannot push removal of history19:25
SnowCode uh ? Really?19:25
How can I clean my repo then?19:26
ikke Do you have direct access to the remote rpeository?19:26
SnowCode I am the owner of the repository yes19:26
→ juliopcrj joined19:26
ikke are you able to run git gc in the remote repository?19:26
SnowCode How do I know that?19:27
→ nehsou^ joined19:27
ikke do you have ssh access, or is the repository hosted?19:27
SnowCode I've run that locally but I don't know how to run it on my repo19:27
The repository is on codeberg19:27
ikke ok, then it's not something you can do19:27
SnowCode Oh F. That really sucks. Why is it like that though?19:27
I guess the only thing I can do is removing the repo and creating a new one from the clean version.19:28
← lemonsnicks left19:28
ikke if you made sure no branches refer to the old history anymore, it will cleaned up eventually19:28
→ lemonsnicks joined19:28
ikke Is there a reason you are concerned about this?19:29
SnowCode Thanks I guess I'll do that. But I don't understand why it's not possible to do that19:29
the reason why I want to do that is because it always takes ages to clone19:29
← mei left19:29
osse that problem is fixed once you push up the new history19:29
ikke that probably means something is still referring to it19:29
osse or that19:30
SnowCode osse:What do you mean?19:30
ikke:What is reffering to what?19:30
ikke git does not send objects when you clone that are not references19:30
SnowCode (btw I used bfg to clean the repo)19:30
osse SnowCode: I mean that when you clone, the remote site does some calculations to send you want you need. IF the remote repo is huge for some unrelated reason that won't affect clones19:30
ikke SnowCode: did you force push all branches?19:31
SnowCode Yes, there is actually only one branch19:31
→ theoceaniscool joined19:33
osse git ls-remote origin19:35
SnowCode osse:What do I have to do with that?19:36
ikke execute19:36
osse tell me what it says19:36
ikke and report19:36
SnowCode 5ac55f0693b07371d7d15ac4c3a6f023699ef056 HEAD19:36
5ac55f0693b07371d7d15ac4c3a6f023699ef056 refs/heads/main19:36
osse that's all? Ok, good.19:37
ikke git rev-parse refs/heads/main19:37
SnowCode 5ac55f0693b07371d7d15ac4c3a6f023699ef05619:37
ikke ok, also expected19:37
→ ttree joined19:38
SnowCode Why did you ask me this?19:38
ikke SnowCode: our experience tought us to verify everything19:39
SnowCode You wanted to verify I had only one branch?19:39
ikke and no tags19:39
SnowCode oh ok19:39
osse If you do a separate clone, is that also bigger than expected? Or is it approx as big as the one you have locally now?19:40
SnowCode Is there a way I can now the size of a clone without cloning (to spare time and space on my device)19:41
?19:41
osse Not that I know of19:41
SnowCode OK19:41
osse I can clone it if you want19:41
SnowCode No imma do it19:41
oh,it seems the download have the right size. I'm dumb19:42
Well, thanks a lot for the help19:42
→ hrinsk joined19:43
osse then codeberg probably still reports the old (and likely current size)19:43
but as mentioned it'll get cleaned, it's not relevant for clones, etc etc.19:43
SnowCode oh ok, If codeberg keeps everything, even stuff that are removed it must contain a ton of junk19:45
ikke git has garbage collection which runs every so often19:46
← jrofd left19:50
ikke So it will get cleaned up eventually19:50
SnowCode Oh OK19:51
→ pah joined19:51
← pa left19:52
← cvmn left19:52
← Shentino left19:53
→ Shentino joined19:53
← Shentino left19:54
→ Shentino joined19:54
→ tang^ joined20:00
← DoofusCanadensis left20:01
→ jrofd joined20:02
← pah left20:02
→ pah_ joined20:02
← ___nick___ left20:05
← unluckyshrubbery left20:05
→ unluckyshrubbery joined20:06
→ ___nick___ joined20:07
← ___nick___ left20:07
→ ___nick___ joined20:08
→ pulse joined20:09
← gas51627 left20:10
← jrofd left20:11
← hrinsk left20:16
→ wootehfoot joined20:16
← Rashad left20:20
← mfiano left20:20
← sebastorama left20:23
→ jess joined20:25
← tang^ left20:26
→ DoofusCanadensis joined20:27
→ hololeap_ joined20:31
→ nobody_ joined20:31
← lgc left20:31
← hololeap left20:32
→ sebastorama joined20:33
← sebastorama left20:33
→ sebastorama joined20:34
← constxd left20:37
← computeiro left20:38
→ ss4 joined20:39
← Null_A left20:40
→ Null_A joined20:41
← wootehfoot left20:42
← luke-jr left20:45
→ n8chan joined20:46
← Murr left20:46
→ luke-jr joined20:46
→ Murr joined20:47
berndj i need to grab an unfortunately binary file out of a bare repository; is git show deadbeef >/usr/local/bin/foo a safe way to do it? my concern here is line endings and that kind of nonsense20:47
← neightchan left20:48
→ ZacSharp joined20:50
← ZacSharp left20:51
→ ZacSharp joined20:51
← sebastorama left20:54
→ Betal joined20:54
← Komputilo left20:54
→ sebastorama joined20:58
→ TJ- joined20:58
← DoofusCanadensis left21:00
osse berndj: it will work21:02
ikke piping is binary safe21:02
berndj thanks. it happened to seem to work, i just wasn't sure if it *definitely* worked21:03
← madewokherd left21:04
← ___nick___ left21:04
← raghavgururajan left21:05
← GNUmoon left21:06
← unmanbearpig left21:07
→ Erisa6 joined21:11
→ raghavgururajan joined21:12
← nobody_ left21:13
← Erisa left21:14
Erisa6 → Erisa21:14
← TJ- left21:14
→ jstein joined21:14
→ unmanbearpig joined21:15
→ hrinsk joined21:16
← ss4 left21:21
← hrinsk left21:23
← epolanski left21:25
→ llh joined21:27
← gh34 left21:33
→ w0ng joined21:34
→ madewokherd joined21:41
← mallkrampus left21:46
← jstein left21:54
← mannequin left21:56
← pretty_dumm_guy left22:00
→ pretty_dumm_guy joined22:01
→ mallkrampus joined22:03
← kenanmarasli left22:06
← sebastorama left22:06
← durham left22:08
← AmR left22:08
→ durham joined22:09
→ GNUmoon joined22:09
→ DoofusCanadensis joined22:11
→ durham_ joined22:13
← durham left22:13
→ hbautista joined22:14
← goldfish left22:20
→ m0viefreak joined22:22
← jetchisel left22:24
→ rgrinberg joined22:27
← ThorMojito left22:29
→ ZacSharp12 joined22:30
→ kaichiuchu joined22:31
→ vdamewood joined22:34
← ZacSharp left22:34
→ alphasierra joined22:38
ZacSharp12 → ZacSharp22:41
→ causa_sui joined22:42
← alphasierra left22:44
→ jetchisel joined22:46
← Murr left22:46
→ Murr joined22:47
← juliopcrj left22:50
← junktext left22:50
→ harpia joined22:55
← SnowCode left22:57
→ retro_ joined22:59
← retroid_ left22:59
← palasso left23:03
← pizdets_ left23:03
← harpia left23:03
→ harpia joined23:03
→ pizdets joined23:03
← Swahili left23:05
← alkino_ left23:05
→ Xenguy joined23:06
← loki_val left23:07
→ crabbedhaloablut joined23:07
→ alkino joined23:08
← dextercd left23:08
→ jrofd joined23:09
← i7c left23:09
→ i7c joined23:09
twb berndj: git show deadbee:porn.exe23:17
berndj: if you just ask for a commit, it will show a diff23:17
berndj twb, yeah unfortunately the binary i had to pick out was one among several in the commit23:18
← vicfred left23:18
twb that's why you specify the binary name also (porn.exe)23:18
→ Swahili joined23:19
berndj oh i see, no i think you've fallen prey to an ambiguity in my question. my "deadbeef" was a blob id, not a commit id23:19
twb ah23:19
carry on then23:20
berndj or whatchamacallit; the hex string next to the filename in whatchanged output23:20
← mschorm left23:21
→ masber joined23:22
→ ferdna joined23:22
← vdamewood left23:24
← rgrinberg left23:24
→ igemnace joined23:30
→ mschorm joined23:33
→ ThorMojito joined23:34
→ hbautista_ joined23:35
← hbautista left23:38
→ Raguile joined23:39
← DoofusCanadensis left23:39
← masber left23:46
← eblip left23:49
→ molt joined23:51
← ThorMojito left23:55
→ eblip joined23:55

Logs Search ←Prev date Next date→ Channels Documentation