IRCloggy #git 2023-02-09

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.

2023-02-09

→ roadie joined00:02
← hectopascal left00:02
← kkawg left00:06
← Hi-Angel left00:06
trafficjam I really need to plan this stuff out better beforehand...00:06
I think i'll just cut the changes from foo, checkout to master and then bar, and paste them in (hangs head in shame)00:07
← TheCatBehemoth left00:10
acidbong > can you clone00:10
adelfino: the pc isn't available at the moment, so i tried out with the ranger repo (which is smaller)00:10
did a --depth=10 clone, hard-reset last several commits, committed to a side branch and then `git pull --depth 1` from master00:10
the result is that the side branch is just detached from master00:10
adelfino trafficjam: it's alright, just take a good look on what you are pasting00:11
acidbong: that's fine00:11
You can rebase on top of master00:11
acidbong the patches I'm using are also in development, so if they're updated or new ones are added, I'm pulling their repo and reapply manually00:13
→ kkawg joined00:13
acidbong bit complicated, but i just wanna keep em in sync00:13
← roadie left00:14
← farzat1 left00:15
← chexum_ left00:15
adelfino A sync up a day keeps the conflict shitstorm away00:16
← falafel left00:16
→ chexum joined00:16
→ farzat1 joined00:17
→ thebombzen joined00:24
→ roadie joined00:25
← LW left00:26
← xheimlich left00:26
← nyah left00:26
→ zulutango joined00:30
← Supavisah left00:32
← Xenguy left00:32
← omethe left00:34
← Muzer left00:35
← The_Blode left00:35
← umbramalison left00:36
→ umbramalison joined00:36
← roadie left00:39
→ junebug joined00:40
← rama_ left00:41
→ rama_ joined00:42
← kkawg left00:46
← rama_ left00:47
→ Muzer joined00:47
← kostkon left00:49
← keypusher left00:49
→ jacobk joined00:54
→ kostkon joined00:55
→ peirik_ joined00:57
→ roadie joined00:58
→ keypusher joined00:58
→ Xenguy joined00:58
→ stef204 joined00:58
← roadie left01:03
← kostkon left01:05
trafficjam what does it mean if i can see a file in my editor, but it's not included when I push to github (and seemingly doesn't exist in the filesystem)?01:06
← RiFo left01:07
trafficjam (say the file is called foo.txt) but if I `touch foo.txt` and then open it in vim, it shows that contents without issue01:07
also can't see any rules in .gitignore that would ignore it01:08
← keypusher left01:11
→ keypusher joined01:11
→ falafel joined01:11
← gvg left01:12
→ gast0n joined01:12
→ kostkon joined01:13
trafficjam guess it's being ignored somewhere else, all good01:15
← trafficjam left01:15
cabazon I've been using bare vim without any plugins to resolve merge conflicts. I think it's time to advance to better tool. For my normal workflow, I usually use Vscode and I'm usually on Debian 10. What tools/methods would you recommend for merge conflicts?01:18
→ omethe joined01:18
cabazon Also, I've seen how some visual editors can cherry pick individual changes from 1 commit which is something I never knew how to do.01:19
→ gvg joined01:19
← feriman left01:22
← ferdna left01:22
← junebug left01:27
← peirik_ left01:31
← reprazent left01:33
→ reprazent joined01:33
→ junebug joined01:35
← gsi left01:36
→ gsi joined01:37
← lucasta_ left01:38
← falafel left01:39
→ jaredce joined01:41
→ gizmore|2 joined01:41
→ lucasta joined01:43
← gizmore left01:44
→ thiago joined01:45
← jaredce left01:46
→ BigShip5 joined01:48
→ skapata joined01:49
← BigShip left01:50
BigShip5 → BigShip01:50
← NeatNit left01:51
→ NeatNit joined01:53
← causasui left01:56
→ roadie joined02:03
← lucasta left02:08
← xandris left02:15
→ xandris joined02:16
→ lucasta joined02:18
← roadie left02:19
→ amosbird joined02:21
← ___nick___ left02:22
← lucasta left02:23
← Lord_of_Life left02:23
← vancz left02:23
→ Lord_of_Life joined02:23
→ ___nick___ joined02:24
← ___nick___ left02:25
← harv left02:26
→ harv joined02:26
→ ___nick___ joined02:26
← mgedmin left02:30
→ mgedmin joined02:32
← Nintendo left02:33
→ lucasta joined02:33
→ vancz joined02:38
→ kgz joined02:38
← austin987 left02:38
← gsi left02:39
→ gsi joined02:41
← YuGiOhJCJ left02:49
← lucasta left02:49
→ chexum_ joined02:51
← chexum left02:51
← moldorcoder7 left02:53
→ YuGiOhJCJ joined02:54
→ lucasta joined03:00
← gxt left03:00
→ gxt joined03:00
← adelfino left03:01
→ peirik_ joined03:02
← mnathani left03:03
→ mnathani joined03:03
→ codaraxis___ joined03:05
→ tchan1 joined03:06
→ R2robot_ joined03:08
→ jkl1337 joined03:08
→ Milos_ joined03:08
→ Xenguy_ joined03:08
→ harv_ joined03:09
→ terrorjack2 joined03:09
→ Bardon_ joined03:09
→ Novi_ joined03:09
← tchan1 left03:09
→ DynamiteDan_ joined03:10
→ tchan1 joined03:10
→ bket_ joined03:10
← tchan left03:10
tchan1 → tchan03:10
→ g2anj_ joined03:11
→ constxo joined03:11
→ nevyn_ joined03:15
← peirik_ left03:15
← harv left03:15
← Lord_of_Life left03:15
← amosbird left03:15
← NeatNit left03:15
← reprazent left03:15
← omethe left03:15
← Xenguy left03:15
← Muzer left03:15
← thebombzen left03:15
← g2anj left03:15
← Ranhir left03:15
← Intel8086 left03:15
← dsrt^ left03:15
← codaraxis__ left03:15
← reset left03:15
← Milos left03:15
← megox left03:15
← agowa338 left03:15
← drogas left03:15
← fstd left03:15
← Bardon left03:15
← GoGi left03:15
← nevyn left03:15
← jkl left03:15
← Saloframes left03:15
← bket left03:15
← constxd left03:15
← terrorjack left03:15
← Abrax left03:15
← germ left03:15
← R2robot left03:15
← luckman212 left03:15
← jinsun left03:15
← Novi left03:15
← remedan left03:15
← JanC left03:15
← andypandy left03:15
← DynamiteDan left03:15
← mohit left03:15
← Koeniz left03:15
← nivag left03:15
← A_Dragon left03:15
← Inline left03:15
← EdFletcher left03:15
← drew left03:15
← deltab left03:15
← lantech19446 left03:15
← ProperNoun left03:15
← superice left03:15
terrorjack2 → terrorjack03:15
harv_ → harv03:15
DynamiteDan_ → DynamiteDan03:15
← gast0n left03:16
→ dsrt^ joined03:17
← moha left03:17
→ omethe joined03:17
→ EdFletcher joined03:17
← Arokh left03:18
→ chandash joined03:18
→ Arokh joined03:18
← Misotauros left03:19
← omethe left03:19
→ omethe joined03:20
← omethe left03:22
→ omethe joined03:23
← Oblomov left03:24
→ Muzer joined03:25
→ drew` joined03:27
→ Lord_of_Life joined03:27
→ amosbird joined03:27
→ NeatNit joined03:27
→ reprazent joined03:27
→ thebombzen joined03:27
→ Ranhir joined03:27
→ Intel8086 joined03:27
→ reset joined03:27
→ megox joined03:27
→ agowa338 joined03:27
→ fstd joined03:27
→ GoGi joined03:27
→ Saloframes joined03:27
→ Abrax joined03:27
→ germ joined03:27
→ luckman212 joined03:27
→ jinsun joined03:27
→ remedan joined03:27
→ JanC joined03:27
→ andypandy joined03:27
→ mohit joined03:27
→ Koeniz joined03:27
→ nivag joined03:27
→ A_Dragon joined03:27
→ Inline joined03:27
→ deltab joined03:27
→ lantech19446 joined03:27
→ ProperNoun joined03:27
→ superice joined03:27
← Inline left03:28
← mohit left03:28
← GoGi left03:28
← Saloframes left03:28
← ProperNoun left03:28
← Lord_of_Life left03:28
→ GoGi joined03:28
→ mohit joined03:28
→ ProperNoun joined03:28
→ Inline joined03:28
→ Saloframes joined03:28
← zeroes left03:29
→ zeroes joined03:29
← crabbedhaloablut left03:30
→ Lord_of_Life joined03:31
→ crabbedhaloablut joined03:33
← FinnElija left03:33
→ finn_elija joined03:33
finn_elija → FinnElija03:33
← farzat1 left03:36
← lucasta left03:37
Milos_ → Milos03:39
← terrorjack left03:42
→ terrorjack joined03:43
→ bywaterloo joined03:43
→ Misotauros joined03:46
← nattiestnate left03:49
→ peirik_ joined03:56
← peirik_ left04:01
← gsi left04:01
→ gsi joined04:01
← EdFletcher left04:02
← gxt left04:05
→ gxt joined04:06
→ EdFletcher joined04:07
→ vqueiroz joined04:08
← EdFletcher left04:13
→ lucasta joined04:16
← Pixi left04:17
← zeroes left04:17
→ han-solo joined04:17
→ zeroes joined04:18
← cbreak left04:21
→ EdFletcher joined04:21
← han-solo left04:23
→ han-solo joined04:23
→ cbreak joined04:25
← gryffus left04:26
← skapata left04:34
← XV9 left04:36
→ XV8 joined04:37
← YuGiOhJCJ left04:39
← zulutango left04:40
→ zulutango joined04:42
← omethe left04:45
→ Kulrak joined04:46
→ omethe joined04:46
→ The_Blode joined04:48
← lucasta left04:50
→ peirik_ joined04:58
← R2robot_ left05:00
→ lucasta joined05:00
← junebug left05:00
→ junebug joined05:01
← peirik_ left05:03
→ peirik_ joined05:04
← peirik_ left05:09
← V-T60 left05:21
→ R2robot joined05:21
Intel8086 git branch --set-upstream origin main05:21
fatal: the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead.05:21
help please05:21
→ priority_queue joined05:24
← BUSY left05:24
priority_queue Hullo!05:25
I had a question about fixup! commits.05:26
← chandash left05:26
← bywaterloo left05:26
← kostkon left05:27
R2robot !hi05:27
gitinfo [!welcome] Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see https://gitirc.eu/ - Take backups (type !backup to learn how) before taking advice.05:27
priority_queue !backup05:28
gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.io/GitBestPractices/#backups05:28
priority_queue I want to implement a small feature into git, that in case of an interactive rebase, git should not try to fixup a skipped commit. (As part of my GSoC micro project).05:31
← gxt left05:33
→ gxt joined05:36
priority_queue How exactly does a skipped commit look like if I try to detect it through the command line?05:36
→ BUSY joined05:37
← koo5 left05:37
Intel8086 git push origin --delete master05:39
To https://github.com/myusername/baccarat.git05:39
! [remote rejected] master (refusing to delete the current branch: refs/heads/master)05:39
error: failed to push some refs to 'https://github.com/myusername/baccarat.git'05:39
→ koo5__ joined05:41
← jjakob left05:41
→ kostkon joined05:41
→ matt[m]1234 joined05:43
→ Jong joined05:43
← Jong left05:49
→ Jong joined05:51
← sa0 left05:54
grawity Intel8086: visit github's repository settings website and select "main" as the new default branch05:56
← mingdao left05:56
→ jjakob joined05:56
← stef204 left05:57
Intel8086 I don't want to use master branch05:57
← priority_queue left05:57
Intel8086 as it is a bad name05:57
for abranch05:57
slavery reference05:58
ikke like grawity said, you need to change the default branch in your repository05:58
← maret left05:59
Intel8086 ok done06:00
← lucasta left06:04
← jrm left06:08
← dskull left06:08
← chexum_ left06:10
← gildasio left06:10
→ chexum joined06:11
← ___nick___ left06:13
← constxo left06:13
→ ___nick___ joined06:14
→ peirik_ joined06:14
→ constxo joined06:15
→ Hi-Angel joined06:16
← kostkon left06:18
← peirik_ left06:19
→ maret joined06:21
← thiago left06:23
→ kostkon joined06:24
← onizu left06:25
← maret left06:35
→ jrm joined06:35
→ dskull joined06:35
← junebug left06:36
← cbreak left06:40
→ cbreak joined06:42
→ igemnace joined06:49
→ peirik_ joined06:49
→ skapata joined06:52
→ mingdao joined06:53
← peirik_ left06:54
← XV8 left06:54
→ XV8 joined06:56
→ otisolsen70 joined07:07
← kostkon left07:08
← leftyfb left07:08
→ leftyfb joined07:08
← otisolsen70 left07:08
→ otisolsen70 joined07:10
← skapata left07:10
← Jong left07:10
→ coot joined07:13
→ kostkon joined07:16
← Millicent left07:18
← constxo left07:22
← otisolsen70 left07:23
→ iomari891 joined07:23
→ constxo joined07:24
→ Jong joined07:27
← constxo left07:29
→ clime joined07:29
→ derfflinger joined07:30
→ constxo joined07:30
→ priority_queu joined07:32
← priority_queu left07:33
← Betal left07:33
← Jong left07:33
→ Guest1 joined07:39
→ roadie joined07:40
→ derfflinger_ joined07:42
→ derfflinger__ joined07:43
← wacko left07:44
← derfflinger left07:45
→ Millicent joined07:45
← derfflinger_ left07:46
← Guest1 left07:47
→ Tw joined07:47
Tw → Guest56307:48
→ wacko joined07:48
← wacko left07:48
→ wacko joined07:48
← kostkon left07:51
← riposte left07:58
→ kostkon joined07:59
← ackyshake left08:01
← stenno left08:01
← dharrigan left08:04
← realies left08:05
→ rosco joined08:05
→ realies joined08:06
→ raxor2k joined08:07
matt[m]1234 → socinep08:07
→ LW joined08:07
→ dharrigan joined08:07
raxor2k Lets say you are supposed to work on your own "dev-branch", do you alot of changes, and before you push, you suddenly see that: "oo shit im on the main branch!!!", what do you do?08:07
← socinep left08:08
raxor2k I personally just take local backup, and pull the dev-branch, and paste the files in there and then commit08:08
selckin git checkout -b dev-branch08:08
→ socinep joined08:08
← unluckyshrubbery left08:09
→ menace joined08:09
← menace left08:10
→ menace joined08:10
menace → Deknos08:10
← Kangie left08:13
→ trafficjam joined08:14
osse git stash; git checkout dev-branch; git stash pop08:21
→ peirik_ joined08:24
← mohit left08:26
→ mohit joined08:26
← peirik_ left08:29
← sefidel left08:33
→ sefidel joined08:33
→ MajorBiscuit joined08:35
→ Spawns_Carpeting joined08:36
→ Oblomov joined08:37
Spawns_Carpeting hello. I am curious about the 64bit offset section in packfile indexes (version 2). normally you find your way around the index by finding the position of the sha1 via binary search, and then using that position to calculation the actual byte position of the crc and whatever else! i am not totally sure if the 64bit offset section works the same way or not08:39
← FinnElija left08:40
Spawns_Carpeting this has a cool picture https://shafiul.github.io/gitbook/7_the_packfile.html08:40
→ FinnElija joined08:42
→ theoceaniscool joined08:43
← Guest563 left08:43
Spawns_Carpeting to be a little more clear, you do a binary search on the sha1 section, and if say, the one you are searching for is the Nth sha1, you know that the corresponding crc or packfile offset is the Nth entry in those sections as well, and you can calculate the actual position in the byte stream using that N08:43
→ Holz joined08:44
← The_Blode left08:48
← MajorBiscuit left08:49
→ MajorBiscuit joined08:50
← Inline left08:52
→ mobidrop joined08:52
→ peirik_ joined08:57
→ delay joined08:57
→ feriman joined09:01
← peirik_ left09:03
→ RiFo joined09:03
← derfflinger__ left09:05
← warmana left09:05
→ jaredce joined09:06
→ derfflinger__ joined09:06
→ warmana joined09:06
→ derfflinger_ joined09:11
← raxor2k left09:11
→ circle joined09:12
← FinnElija left09:12
→ stenno joined09:13
→ riposte joined09:15
← derfflinger__ left09:15
→ derfflinger__ joined09:15
← derfflinger_ left09:16
← delay left09:16
→ FinnElija joined09:16
→ delay joined09:16
← roadie left09:17
→ hectopascal joined09:18
← delay left09:18
→ delay joined09:20
→ DrowningElysium joined09:26
→ zeenk joined09:27
← Masklin left09:28
→ Masklin joined09:29
→ agowa joined09:29
← circle left09:29
→ peirik_ joined09:30
← agowa338 left09:32
→ derfflinger_ joined09:33
→ farzat1 joined09:33
→ derfflinger joined09:35
← derfflinger__ left09:36
→ drogas joined09:38
← derfflinger_ left09:39
→ nyah joined09:42
← delay left09:42
→ delay joined09:42
← warmana left09:43
→ Aule joined09:44
← Aule left09:44
→ Aule joined09:44
← delay left09:46
→ delay joined09:46
→ derfflinger_ joined09:47
→ lxsameer joined09:49
→ derfflinger__ joined09:50
← delay left09:50
→ Jong joined09:50
← derfflinger left09:50
→ warmana joined09:51
← derfflinger_ left09:53
← FinnElija left09:57
→ FinnElija joined09:58
→ unluckyshrubbery joined10:00
→ f__ joined10:03
f__ → f_10:06
→ zer0bitz joined10:08
→ delay joined10:11
← Furai left10:14
← delay left10:16
→ Furai joined10:17
→ dionysus69 joined10:22
← tirnanog left10:22
← kostkon left10:27
← trafficjam left10:27
← travisghansen left10:28
→ travisghansen joined10:28
jkl1337 → jkl10:29
→ dinkus joined10:29
← peirik_ left10:33
← snappy left10:33
→ kostkon joined10:37
Spawns_Carpeting If anyone does have any info about this 64bit section in the packfile index make sure to ping me! Thanks10:44
→ EvgenyK_ joined10:45
→ peirik_ joined10:45
← JanC left10:46
→ JanC joined10:47
← EvgenyK left10:48
← farzat1 left10:54
→ duxsco joined10:54
→ delay joined10:57
← delay left10:58
← dinkus left11:04
→ grub-reinstall joined11:04
→ farzat1 joined11:07
→ bgs joined11:08
← peirik_ left11:10
osse Spawns_Carpeting: I tried to figure it out, but couldn't11:11
But maybe this comment helps you: https://github.com/git/git/blob/master/packfile.h#L110-L11311:11
I didn't for me, so don't expect enlightenment :p11:11
There's always the mailing list11:12
→ peirik_ joined11:14
osse Spawns_Carpeting: now I found this: https://github.com/git/git/blob/master/Documentation/gitformat-pack.txt#L290-L29311:14
→ delay joined11:18
← derfflinger__ left11:22
→ dinkus joined11:25
← delay left11:29
→ delay joined11:31
← grub-reinstall left11:31
→ grub-reinstall joined11:31
→ bywaterloo joined11:32
← delay left11:33
← duxsco left11:33
← peirik_ left11:33
→ delay joined11:33
← bywaterloo left11:36
← apoorv569[m] left11:36
← cyprussocialite[ left11:37
← colemickens left11:37
← kadoban left11:37
← hussam left11:37
← Industrial[m] left11:37
← kadoban[m] left11:37
← ForeverNoob[m] left11:37
← MHickford[m]12 left11:37
← nexilva[m] left11:37
← bluepenquin1 left11:37
← tiziodcaio left11:37
← socinep left11:37
← _Null[m] left11:37
← cpackham[m] left11:37
← MHickford[m]1 left11:37
← epony left11:38
→ epony joined11:38
← grub-reinstall left11:39
→ grub-reinstall joined11:39
→ colemickens joined11:41
← delay left11:55
→ delay joined11:56
→ heftig joined12:00
→ Fernando-Basso joined12:00
→ CarlFK joined12:00
→ Celmor[m] joined12:00
→ ForeverNoob[m] joined12:00
→ DamienCassou joined12:00
→ jmcantrell joined12:00
→ jcgruenhage joined12:00
→ ronny joined12:00
→ graham joined12:00
→ azadzadeh[m] joined12:00
→ psydroid joined12:00
→ nazarewk[m] joined12:00
→ T_UNIX[m] joined12:00
→ lasloum[m] joined12:00
→ morguldir joined12:00
→ tiziodcaio joined12:00
→ matthewcroughan- joined12:00
→ defolos joined12:00
→ kadoban joined12:00
→ bluepenquin joined12:00
→ cyprussocialite[ joined12:00
→ Industrial[m] joined12:00
→ nexilva[m] joined12:00
→ ckie[m] joined12:00
→ hussam joined12:00
→ zebrag[m] joined12:00
→ vitali64[m] joined12:00
→ cpackham[m] joined12:00
→ apoorv569[m] joined12:00
→ madewokherd[m] joined12:00
→ MHickford[m]1 joined12:00
→ MHickford[m]12 joined12:00
→ socinep joined12:00
→ kadoban[m] joined12:00
→ _Null[m] joined12:00
→ gryffus joined12:02
← delay left12:03
→ delay joined12:04
→ derfflinger__ joined12:06
← delay left12:08
→ delay joined12:08
← rosco left12:09
→ xheimlich joined12:10
← colemickens left12:14
← cyprussocialite[ left12:14
← Fernando-Basso left12:14
← jcgruenhage left12:14
← CarlFK left12:14
← kadoban left12:14
← vitali64[m] left12:14
← ronny left12:14
← hussam left12:14
← bluepenquin left12:14
← nazarewk[m] left12:14
← ckie[m] left12:14
← defolos left12:14
← Industrial[m] left12:14
← lasloum[m] left12:14
← graham left12:14
← cpackham[m] left12:14
← matthewcroughan- left12:14
← zebrag[m] left12:14
← kadoban[m] left12:14
← socinep left12:14
← azadzadeh[m] left12:14
← ForeverNoob[m] left12:14
← psydroid left12:14
← Celmor[m] left12:14
← nexilva[m] left12:14
← _Null[m] left12:14
← MHickford[m]12 left12:14
← jmcantrell left12:15
← tiziodcaio left12:15
← heftig left12:15
← MHickford[m]1 left12:15
← DamienCassou left12:15
← morguldir left12:15
← T_UNIX[m] left12:15
← madewokherd[m] left12:15
← apoorv569[m] left12:15
→ assedaka joined12:18
→ mncheck joined12:18
assedaka hi - is there a way to see what exact steps and logic git took in a merge?12:19
like actual algo debug12:20
not just evidence in console and log12:20
← c0dehu1k left12:20
← grub-reinstall left12:23
→ c0dehu1k joined12:23
→ grub-reinstall joined12:23
→ colemickens joined12:23
→ DamienCassou joined12:24
→ Fernando-Basso joined12:24
→ kaisyu joined12:25
→ hussam joined12:25
→ bluepenquin joined12:25
→ defolos joined12:25
← dinkus left12:28
→ dinkus joined12:28
← Deknos left12:29
jast assedaka: maybe GIT_MERGE_VERBOSITY (environment variable) will help? or GIT_TRACE12:30
assedaka am on windows and GIT_MERGE_VERBOSITY=5 didn't give more12:31
also tried via config: merge.verbosity=512:35
← skered left12:36
← delay left12:40
→ skered joined12:40
← cbreak left12:42
jast I did see `trace2_...` calls in the code but I'm not sure what is used to make those visible for end users12:42
and I think that's actually mostly for profiling12:42
assedaka jast: tnx. i managed to make some progress with GIT_TRACE but it is still not enough info.12:43
jast which parts of the merge process are you interested in in particular?12:43
→ rosco joined12:43
assedaka I have a file with deleted line commited on branch A much later then this line was added on branch B. am expecting a merge of A into B to delete this line but it doesn't.12:44
So want to understand why GIT decides file in B should still have the line12:45
→ cbreak joined12:45
jast is the commit in which the line was added part of the history of both branches?12:45
i.e. shared history12:45
← han-solo left12:46
assedaka how do i check that :) ?12:46
jast if you don't have too many branches, `git branch --contains <commit>` is an easy way12:47
assedaka trying..12:47
→ han-solo joined12:48
jast a more general way is to check if `git rev-list <branch>..<commit>` has any output for either of the two branches. if it comes up empty both times, the commit is part of the history of both branches12:49
→ _Null[m] joined12:50
→ MHickford[m]12 joined12:50
→ srinidhi joined12:51
assedaka i see the line was added in both branches in 2 different commits :( and no shared history for neither :(12:52
aded inA in commit a , added in B in commit b12:52
→ cpackham[m] joined12:53
jast yeah, in that case git can't be sure that you mean for the "other" version of the line to disappear, too12:53
imme-emosol Can the behaviour of git commit --fixup=<commit> be changed through a setting? (I would like it to use the commit-hash instead of the subject.)12:53
→ kadoban[m] joined12:54
imme-emosol which should be recognized by git rebase --autosquash as well, according to the docs.12:54
assedaka jast: so back to my initial ask: is there a way to see the actual operation where git examined the relevant commit that contains line deletion and decided not to apply it?12:55
jast imme-emosol: no, sorry12:56
→ MHickford[m]1 joined12:57
imme-emosol okay, so writing my own function is probably easiest solution?12:57
→ sudoforge joined12:57
imme-emosol thanks.12:57
jast imme-emosol: however you could freestyle it: git commit -m 'fixup! <commit>'12:57
← grub-reinstall left12:57
jast which isn't that much more typing even12:57
→ grub-reinstall_ joined12:57
→ vitali64[m] joined12:58
→ cyprussocialite[ joined12:58
→ CarlFK joined12:58
← grub-reinstall_ left12:58
→ jmcantrell joined12:58
jast assedaka: no, and that's not exactly how it works. merges have two steps: step one is to generate three trees (snapshots of repo contents) for the base version, the local version and the remote version. step one does file-level merging on these files.12:58
→ azadzadeh[m] joined12:59
jast the overall merge operation doesn't look at the commits individually12:59
→ jcgruenhage joined12:59
→ nexilva[m] joined12:59
→ nazarewk[m] joined12:59
→ moldorcoder7 joined12:59
→ Celmor[m] joined12:59
→ socinep joined12:59
→ ckie[m] joined12:59
jast merge strategies mostly differs in terms of how the "base" version is constructed and which versions of the files are used for it13:00
so, after merge has constructed the trees, they look like this:13:00
→ zebrag[m] joined13:00
jast base (common history of both branches): does not have the line13:00
A: does not have the line13:00
B: does have the line13:00
→ lasloum[m] joined13:00
jast as far as git is concerned, that's a change on one side only, so it uses the version from B13:00
→ Guest82 joined13:01
→ ronny joined13:03
← andypandy left13:03
jast now if you first do a merge from A-but-before-the-line-is-deleted, then a merge of the rest of A, *probably* the line will be deleted in the second merge13:04
assedaka tnx. is this moving the merge-base or so?13:05
→ kadoban joined13:06
→ madewokherd[m] joined13:06
→ grub-reinstall joined13:06
→ andypandy joined13:06
→ matthewcroughan- joined13:07
→ Industrial[m] joined13:08
→ irrgit__ joined13:09
assedaka jast: is the timestamp of commit is not a factor in merge and diff decision?13:09
→ alfredb joined13:10
jast assedaka: no13:12
to your latter question13:12
← irrgit_ left13:12
jast and yes to your first question - after you've merged part of A, the merge base "moves up" because git doesn't care to merge anything twice13:13
→ delay joined13:14
assedaka jast: much tnx! have a good day!13:14
← delay left13:14
← jaredce left13:14
jast you too!13:15
→ delay joined13:15
→ jaredce joined13:16
← Guest82 left13:17
→ Guest82 joined13:18
← assedaka left13:18
→ ForeverNoob[m] joined13:19
→ graham joined13:19
← delay left13:19
→ morguldir joined13:20
→ T_UNIX[m] joined13:21
← jaredce left13:21
→ apoorv569[m] joined13:21
→ psydroid joined13:21
→ jaredce joined13:22
→ tiziodcaio joined13:22
→ delay joined13:22
→ heftig joined13:22
→ gildasio joined13:24
← delay left13:26
← jaredce left13:26
→ jaredce joined13:27
← jaredce left13:32
→ jaredce joined13:33
← hamburgler left13:35
← jaredce left13:38
→ jaredce joined13:39
→ lucasta joined13:39
← feriman left13:40
← grub-reinstall left13:41
→ feriman joined13:42
→ grub-reinstall joined13:44
← jaredce left13:44
→ jaredce joined13:45
→ delay joined13:47
→ bywaterloo joined13:49
← jaredce left13:49
→ TasKuro joined13:50
→ jaredce joined13:50
→ gast0n joined13:51
→ assedaka joined13:54
← assedaka left13:54
← grub-reinstall left13:55
← jaredce left13:56
← delay left13:56
→ jaredce joined13:56
→ delay joined13:56
← delay left13:56
→ grub-reinstall joined13:57
← gxt left13:58
← bywaterloo left13:58
→ gxt joined13:59
← TasKuro left14:00
← jaredce left14:01
← grub-reinstall left14:01
← rosco left14:01
→ jaredce joined14:02
→ otisolsen70 joined14:02
→ rosco joined14:03
→ grub-reinstall joined14:06
← jaredce left14:07
→ jaredce joined14:08
← grub-reinstall left14:09
→ bywaterloo joined14:10
→ grub-reinstall joined14:10
← grub-reinstall left14:10
← sudoforge left14:10
→ grub-reinstall joined14:11
← grub-reinstall left14:11
→ cdown joined14:12
→ grub-reinstall joined14:12
← grub-reinstall left14:12
→ grub-reinstall joined14:14
← grub-reinstall left14:14
→ otisolsen70_ joined14:14
← kostkon left14:15
← otisolsen70 left14:15
otisolsen70_ → otisolsen7014:15
← derfflinger__ left14:16
→ grub-reinstall joined14:16
← Xenguy_ left14:16
→ derfflinger__ joined14:16
← grub-reinstall left14:16
→ kostkon joined14:18
→ kurbus joined14:19
← dionysus69 left14:20
← dinkus left14:21
→ ludovicchabant joined14:21
→ dionysus69 joined14:22
→ jwpapi joined14:22
→ derfj joined14:22
← agowa left14:22
→ jdek joined14:22
← derfflinger__ left14:24
→ cdown_ joined14:25
← warmana left14:25
→ dinkus joined14:27
← cdown left14:27
cdown_ → cdown14:27
→ warmana joined14:28
← warmana left14:29
← Artea left14:29
→ delay joined14:29
→ warmana joined14:31
→ Artea joined14:32
← kaisyu left14:34
← c0dehu1k left14:39
→ lgc joined14:42
← lgc left14:43
→ derfflinger__ joined14:47
← rosco left14:51
→ jaykelly joined14:54
← derfflinger__ left14:56
→ saohh joined14:56
→ c0dehu1k joined14:56
← jaykelly left14:58
→ jaykelly joined14:58
← shokohsc6 left14:59
← delay left15:00
→ shokohsc6 joined15:00
→ derfflinger__ joined15:01
← JanC left15:02
← c0dehu1k left15:02
→ JanC joined15:02
→ gas51627 joined15:05
← mobidrop left15:06
← derfflinger__ left15:08
← f451 left15:08
← otisolsen70 left15:08
→ derfflinger__ joined15:09
← derfflinger__ left15:15
→ roadie joined15:16
→ rosco joined15:19
→ gh34 joined15:23
← lucasta left15:23
→ lpapp joined15:23
lpapp hi, is there a git config to always clone with submodules?15:23
← bgs left15:23
← juergh left15:24
→ VaniaPy joined15:25
VaniaPy Hello ,is there a way to detect the default branch of a remote repo?15:25
i found this command so far but it points to the current HEAD15:25
git ls-remote --symref testrepo HEAD | awk -F'[/\t]' 'NR == 1 {print $3}'15:25
→ miraH joined15:26
→ lucasta joined15:26
selckin lpapp: git config --global submodule.recurse true15:27
→ skapata joined15:28
selckin VaniaPy: isn't head the default?15:28
← skapata left15:29
→ skapata joined15:30
← Guest82 left15:31
← constxo left15:31
← saohh left15:31
← Dotz0cat left15:32
→ axisys joined15:33
VaniaPy selckin it can be changed15:33
the HEAD15:33
→ constxo joined15:33
selckin that changes the default branch?15:34
dinkus Can I make the reflog show only when branches were switched?15:35
→ Dotz0cat joined15:36
← constxo left15:38
← lucasta left15:38
← daru left15:39
→ constxo joined15:39
fury_ I have a deployment script that checks out a single branch of my repo. I need to change the branch temporarily, without modifying the deployment script. I cannot change to the branch, because that local repo knows nothing about it. how can I tell git to fetch all the branches so that it can check another one out? git fetch and git fetch --all have no effect.15:41
git pull origin/otherbranch leaves me in a weird inconsistent state15:41
→ Guest13 joined15:44
→ thiago joined15:44
selckin how do you check out a single branch?15:44
→ c0dehu1k joined15:45
selckin custom refs/* type options i guess? else git fetch would work, so have to change the config15:45
fury_ I honestly don't know how it does it. all I know is that while my repo has many branches, this only has one checked out, and I need a different one. git fetch --unshallow has no effect either.15:47
→ daru joined15:47
← Guest13 left15:47
selckin in .git/config, under remote -> fetch, it probably lists a single branch instead of like +refs/heads/*:refs/remotes/origin/* ?15:47
→ delay joined15:48
fury_ ah yes, that did it, thanks!15:49
← llh left15:49
← Aule left15:49
fury_ surprising that I have to modify a config15:49
→ lucasta joined15:49
selckin you can find the magical git remote cmd to set it, but i don't know by hearth15:50
git clone has more fancy options now that'll let you clone a single branch leaving that one default15:50
and then git fetch will pull em all15:50
← delay left15:53
→ sa0 joined15:55
← lucasta left15:56
→ brezanac joined15:58
→ pconst167 joined16:00
→ llh joined16:01
← pconst167 left16:04
← brezanac left16:07
← rosco left16:10
→ brezanac joined16:11
→ lucasta joined16:11
→ so-offishul joined16:14
so-offishul → so-offish16:15
← kurbus left16:15
→ Xeroine_ joined16:16
← kostkon left16:16
→ Betal joined16:18
→ delay joined16:19
→ garrettprimm joined16:19
→ kostkon joined16:22
→ junebug joined16:22
← codaraxis___ left16:23
← junebug left16:24
→ junebug joined16:25
← VaniaPy left16:25
← brezanac left16:26
← kostkon left16:27
← warmana left16:30
→ kurbus joined16:30
→ kostkon joined16:32
→ sqrl joined16:32
→ warmana joined16:33
→ wootehfoot joined16:34
→ rosco joined16:34
→ rhelper joined16:36
← delay left16:37
→ delay joined16:37
← lucasta left16:40
← Coop left16:40
← dionysus69 left16:41
← llh left16:44
← gxt left16:44
→ gxt joined16:45
→ llh joined16:48
← so-offish left16:49
→ so-offish joined16:49
→ lucasta joined16:50
← so-offish left16:51
→ so-offish joined16:51
← so-offish left16:52
→ so-offish joined16:53
← so-offish left16:55
→ so-offish joined16:55
← so-offish left16:56
→ so-offish joined16:57
← so-offish left16:59
← jaredce left16:59
→ so-offish joined16:59
← lucasta left17:00
← so-offish left17:03
→ so-offish joined17:04
← so-offish left17:05
→ so-offish joined17:05
← so-offish left17:05
→ so-offish joined17:05
← kurbus left17:05
→ TasKuro joined17:09
→ lucasta joined17:10
← feriman left17:12
→ sudoforge joined17:13
→ rama joined17:16
← DrowningElysium left17:16
← jacobk left17:19
→ Coop joined17:21
→ codaraxis___ joined17:22
→ goldfish joined17:23
← Guest78 left17:25
← goldfish left17:25
→ Guest75 joined17:27
→ kurbus joined17:30
← lucasta left17:33
→ lucasta joined17:34
→ grub-reinstall joined17:37
← rosco left17:39
← kurbus left17:41
← lucasta left17:41
→ rosco joined17:41
← warmana left17:42
← han-solo left17:44
→ kurbus joined17:48
← rosco left17:49
← lxsameer left17:50
← GNUmoon left17:51
→ lolok joined17:52
→ lucasta joined17:54
→ duxsco joined17:54
← delay left17:56
← junebug left17:57
← skapata left17:58
→ delay joined18:02
← jaykelly left18:03
→ jaykelly joined18:03
← delay left18:03
→ geri joined18:06
← kurbus left18:09
→ kurbus joined18:10
→ mexen joined18:12
drew` → drew18:12
← drew left18:13
→ drew joined18:13
← Guest75 left18:13
← swistak left18:19
→ lucasta_ joined18:19
→ junebug joined18:19
xheimlich → fine_very_well18:20
→ skapata joined18:20
← lucasta left18:21
← junebug left18:21
← geri left18:21
← SuperLag left18:23
→ rosco joined18:23
← zeenk left18:24
→ delay joined18:24
→ davicito joined18:26
→ lucasta joined18:27
← kurbus left18:30
→ swistak joined18:30
→ pconst joined18:30
← lucasta left18:32
← duxsco left18:32
→ duxsco joined18:33
→ f451 joined18:33
→ gildasio1 joined18:35
← gildasio left18:35
← iomari891 left18:36
→ SuperLag joined18:36
← robo left18:38
← MajorBiscuit left18:38
→ robo joined18:38
← z3bra left18:38
→ MajorBiscuit joined18:40
→ nuala joined18:40
← TasKuro left18:42
→ TasKuro joined18:43
→ TasKuro63 joined18:44
← lacrymology left18:45
← lucasta_ left18:46
→ jacobk joined18:46
← MajorBiscuit left18:47
← TasKuro left18:47
← duxsco left18:48
→ TasKuro636 joined18:49
← crabbedhaloablut left18:49
→ crabbedhaloablut joined18:50
← Novi_ left18:50
← TasKuro63 left18:52
→ Novi joined18:53
→ feriman joined18:56
← delay left18:59
← dinkus left18:59
← rama left19:01
← TasKuro636 left19:05
← skapata left19:10
→ skapata joined19:11
d1rewolf I have a commit in a repository which appears to be empty...no files changed. However, I know from experience that permission changes can cause what appears to be an empty commit. what's the appropriate way to find out what git thinks changed? "git diff <commit rev> <parent rev>" returns empty output19:11
← BlessJah left19:17
→ BlessJah joined19:19
← jaykelly left19:19
ikke git diff should show permission changes as well19:19
→ whatsupdoc joined19:19
ikke try git rev-parse <commit>~^{tree} <commit>^{tree}19:20
← fine_very_well left19:23
→ jaykelly joined19:24
→ delay joined19:28
→ rama joined19:30
← Jong left19:30
sqrl it's possible to have completely empty commits, useful with --fixup=amend & reword19:30
← jaykelly left19:30
d1rewolf sqrl: ah...didn't realize that. thanks.19:31
← delay left19:33
→ masber joined19:35
→ Jong joined19:35
← grub-reinstall left19:38
← rosco left19:38
← Novi left19:40
← f_ left19:40
→ delay joined19:41
→ Novi joined19:43
← delay left19:46
→ delay joined19:49
→ irrgit_ joined19:49
→ grub-reinstall joined19:50
← stenno left19:51
← Furai left19:51
← irrgit__ left19:52
← delay left19:53
→ delay joined19:54
→ momomo joined19:54
← grub-reinstall left19:55
← delay left19:58
← miraH left20:06
→ TasKuro joined20:07
→ Guest39 joined20:07
→ donofrio_ joined20:10
→ hans_ joined20:11
← pconst left20:13
← donofrio left20:14
← weko left20:14
← zer0bitz left20:16
← jacobk left20:17
← ghost43 left20:19
→ weko joined20:19
→ ghost43 joined20:20
→ zer0bitz joined20:25
← wootehfoot left20:25
→ zen_coder joined20:27
← Jong left20:29
← weko left20:31
← TasKuro left20:31
→ TasKuro joined20:31
→ Furai joined20:34
→ donofrio joined20:36
← masber left20:37
← FFY00_ left20:37
→ FFY00_ joined20:38
← TasKuro left20:38
← donofrio_ left20:38
← donofrio left20:41
→ weko joined20:42
→ jacobk joined20:43
→ weko_ joined20:46
← mexen left20:47
→ alexherbo2 joined20:47
← weko left20:48
← jacobk left20:50
← moldorcoder7 left20:52
→ lucasta joined20:53
→ moldorcoder7 joined20:53
← omethe left20:55
← moldorcoder7 left20:58
← weko_ left21:00
← sudoforge left21:02
← alexherbo2 left21:02
→ moldorcoder7 joined21:03
← moldorcoder7 left21:09
→ moldorcoder7 joined21:09
← lucasta left21:09
→ delay joined21:12
→ YuGiOhJCJ joined21:12
→ cousteau joined21:14
← srinidhi left21:14
← ___nick___ left21:15
← Saloframes left21:16
← Intel8086 left21:17
← thiago left21:19
→ ___nick___ joined21:19
← c0dehu1k left21:20
→ weko joined21:20
→ c0dehu1k joined21:20
→ so-offishul joined21:21
→ omethe joined21:24
← so-offish left21:24
← gast0n left21:24
← igemnace left21:25
→ m0viefreak joined21:30
→ jaykelly joined21:31
MiguelX4139 → MiguelX41321:31
← weko left21:31
← MiguelX413 left21:31
→ MiguelX413 joined21:32
→ z3bra joined21:35
← delay left21:38
→ delay joined21:39
→ multi_io joined21:42
→ lucasta joined21:44
← delay left21:54
→ thiago joined21:56
← multi_io left21:58
→ multi_io joined21:59
→ bewees joined22:01
→ giu- joined22:03
bewees After I applied a stash and then switched the branch I noticed that the files from the stash get applied to the branch I switched to. This is an intended feature of stashes I guess, and if I wanted to discard the stash from the working directory I would have to do `git checkout .`?22:04
"With path specifier only (git checkout .) it writes content from index. That is, it undoes unstaged local modification." So I think `git checkout .` should be what I want?22:07
Only confusing that by checking out different branches the stash carries on22:07
← z3bra left22:10
→ weko joined22:11
← rama left22:15
→ so-offish1 joined22:15
osse bewees: !float22:16
gitinfo bewees: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout existing_branch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.22:16
osse it has nothing to do with the stash itself, actually22:16
← so-offishul left22:18
← BrianBlaze left22:18
← roadie left22:19
→ BrianBlaze joined22:20
→ lxsameer joined22:21
→ roadie joined22:21
bewees osse, Ah, I see. I thought when you have unstaged changes and checkout to another branch git would prevent you from changing the branch. Thanks make sense now! I can use `git checkout .` nevertheless when I want to remove any unstaged changes from my working directory22:25
← roadie left22:25
→ w4 joined22:26
→ delay joined22:26
← w4 left22:30
→ w4 joined22:31
← m0viefreak left22:32
← delay left22:32
→ m0viefreak joined22:33
← feriman left22:38
bewees Important part is "files you changed differ between branches", because even if you different files `git-checkout` will let you switch the branch, unless there is an unstaged changed file and the file on the other branch is different commit-wise22:40
+have22:41
→ hamburgler joined22:42
← YuGiOhJCJ left22:42
→ dionysus69 joined22:44
→ trafficjam joined22:45
→ roadie joined22:45
→ Kangie joined22:46
← roadie left22:50
→ odoood joined22:51
← gh34 left22:58
← bewees left23:00
→ delay joined23:01
Spawns_Carpeting osse: hey that actually does help23:04
thank you23:04
i think the offsets with the high bit set are themselves the index into the 64bit section23:06
so you just use that value as the offset directly I think, maybe with the high bit masked off23:06
← megox left23:07
← LW left23:10
← thebombzen left23:10
→ rama joined23:11
→ Jong joined23:11
← theoceaniscool left23:12
← w4 left23:14
→ w4 joined23:15
← Jong left23:18
← m0viefreak left23:20
← rhelper left23:20
← w4 left23:22
← Misotauros left23:23
← giu- left23:26
← sa0 left23:26
→ Xenguy joined23:27
→ ackyshake joined23:28
→ w4 joined23:30
→ Misotauros joined23:34
ario i've been kinda wondering about this, not sure if it's possible23:35
is it possible to 'cherry-pick' a specific commit from one branch into another without rewriting metadata (hash, author, etc). Keeping their commit exactly the same?23:36
I see that cherry-pick does rewrite metadata and that may confuse diffs at time if the cherry-picking author is different and hash changes23:37
ljharb ario: the hash depends on the parent commit, so, no23:39
ario: you can certainly keep all the rest tho23:39
→ ferdna joined23:39
← epony left23:39
ario ljharb: i've noticed if i cherry-pick say a commit by ljharb into my branch, then it will mark me as a co-author23:40
I don't want this23:40
since all i did was cherry-pick23:40
ljharb ario: perhaps you're referring to you being committer on github?23:41
ario yeah, i see this on github23:41
ljharb ario: that's a github thing; unless they push the cherry-picked commit your name will show up next to it and you can't do anything about it23:41
ario: but that doesn't make you a co-author23:42
→ keypushe- joined23:42
ario weird23:42
← keypusher left23:43
← FFY00_ left23:43
→ FFY00 joined23:43
ario ljharb: it's weird since if i do a three dot diff "..." between the branches, the cherry-picked commit will show in github since the hash and author are different23:45
keypushe- → keypusher23:45
ario in the commit entry23:45
feels like a bug23:46
but also feel like i'm doing something wrong23:46
← lxsameer left23:47
ljharb ario: i think that's just the way it works23:48
← zen_coder left23:51
Oblomov yeah if you want a system that doesn't do that you'll need a different revision control system23:53
like pijul23:54
← xeelad left23:57
→ xeelad joined23:58
→ _over joined23:58
← gas51627 left23:59

Logs Search ←Prev date Next date→ Channels Documentation