IRCloggy #git 2022-09-27

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.

2022-09-27

→ luke-jr joined00:02
← Sasazuka left00:04
→ Sasazuka joined00:05
→ Visne joined00:05
→ sudoforge joined00:05
→ nate3 joined00:08
→ arch_angel joined00:09
← nate3 left00:16
← luke-jr left00:18
→ luke-jr joined00:20
← zebrag left00:21
→ very_sneaky joined00:21
← Stooge left00:25
→ roadie joined00:26
→ lukedashjr joined00:28
→ hoochmonger joined00:30
← luke-jr left00:30
lukedashjr → luke-jr00:31
← roadie left00:31
← Sasazuka left00:36
← crabbedhaloablut left00:38
→ loki_val joined00:38
← xx left00:42
→ Sasazuka joined00:42
← Sasazuka left00:44
← luke-jr left00:49
→ lukedashjr joined00:49
lukedashjr → luke-jr00:50
← luke-jr left00:51
→ luke-jr joined00:57
← luke-jr left01:00
→ gsi_ joined01:03
→ luke-jr joined01:04
→ cation joined01:05
← luke-jr left01:05
→ luke-jr joined01:08
← Visne left01:08
→ Visne joined01:11
← dsrt^ left01:15
← Murr left01:16
→ Murr joined01:16
→ off^ joined01:19
→ lukedashjr joined01:19
← luke-jr left01:22
lukedashjr → luke-jr01:22
← cdown left01:23
← junebug left01:30
→ roadie joined01:32
← pulse left01:39
→ jinsun__ joined01:39
jinsun__ → jinsun01:39
→ Lunatrius` joined01:39
→ natechan joined01:39
← natechan left01:40
← thiago left01:41
← clime left01:41
→ natechan joined01:41
← hoochmonger left01:43
Lunatrius` → Lunatrius01:43
→ neightchan joined01:43
← natechan left01:43
→ hoochmonger joined01:43
→ relight joined01:43
← sudoforge left01:44
→ Leonarbro joined01:45
← roadie left01:46
← Novi left01:46
→ Novi joined01:48
← umbramalison left01:49
← relight left01:49
→ umbramalison joined01:50
→ relight joined01:50
→ SleePy joined01:54
← SleePy left01:54
→ clime joined01:55
→ SleePy joined01:56
→ xkoncek joined01:56
→ lucasta joined02:02
→ sudoforge joined02:09
→ niterrors joined02:09
→ zmt00 joined02:10
→ roadie joined02:10
← n1ght3rr0r5 left02:12
→ Jenna16bit joined02:13
← Jenna16bit left02:13
→ Jenna16bit joined02:13
← luke-jr left02:13
← ferdna left02:15
→ TonyStone joined02:15
← roadie left02:15
→ luke-jr joined02:16
← niterrors left02:17
← off^ left02:20
→ niterrors joined02:21
← FinnElija left02:21
→ finn_elija joined02:21
finn_elija → FinnElija02:21
→ off^ joined02:22
← Visne left02:26
→ nate3 joined02:27
→ Visne joined02:29
→ n1terr0rs joined02:32
→ roadie joined02:33
← niterrors left02:34
← luke-jr left02:44
→ lukedashjr joined02:44
→ thiago joined02:45
lukedashjr → luke-jr02:46
← roadie left02:47
← chexum left02:47
→ chexum joined02:48
→ hbautista joined02:51
← clime left02:53
← bloody left02:59
← TonyStone left03:00
→ roadie joined03:00
← Novi left03:00
→ Novi joined03:03
← roadie left03:05
→ TonyStone joined03:10
→ roadie joined03:17
← roadie left03:22
← tyson2 left03:22
← sudoforge left03:31
← lucasta left03:36
→ srinidhi joined03:39
→ bket joined03:42
← nate3 left03:43
→ igemnace joined03:48
→ dimi1947 joined03:48
dimi1947 I am tryint to use git fetch with the depth option:git fetch origin --depth=5 the response though is this remote: Total 0 (delta 0), reused 0 (delta 0), pack-reused 003:54
does this mean that no commits were donwloaded? if that is the case how is that possible?03:54
→ n1t3rr0r5 joined03:56
→ ProperNoun joined03:58
← n1terr0rs left04:00
→ loulou joined04:07
← loulou left04:07
→ loulou joined04:07
→ Xenguy joined04:09
← Betal left04:13
→ lukedashjr joined04:17
← luke-jr left04:18
lukedashjr → luke-jr04:18
→ roadie joined04:36
← srinidhi left04:39
→ srinidhi joined04:56
→ n1ghterr0rs joined05:01
← n1t3rr0r5 left05:04
→ madewokherd` joined05:07
← madewokherd left05:10
→ nate3 joined05:10
← n1ghterr0rs left05:11
→ n1ghterr0rs joined05:12
← nate3 left05:15
← Murr left05:15
→ Murr joined05:16
← thiago left05:20
→ RiFo joined05:20
→ coot joined05:22
→ maret joined05:29
← arch_angel left05:29
← maret left05:33
← agarr left05:34
→ agarr joined05:34
← Xaldafax left05:35
← epony left05:46
← nighterrors left05:47
← srinidhi left06:05
← jazzy left06:07
→ kyshoc joined06:07
→ srinidhi joined06:08
← loulou left06:08
← n1ghterr0rs left06:12
→ loulou joined06:13
← loulou left06:13
→ loulou joined06:13
→ Sazhen86 joined06:13
← loulou left06:19
→ zeenk joined06:19
→ csm3105 joined06:27
→ gas51627 joined06:29
→ otisolsen70 joined06:30
← otisolsen70 left06:31
→ otisolsen70 joined06:32
→ rfuentess joined06:44
→ m5zs7k joined06:44
← loki_val left06:50
→ crabbedhaloablut joined06:51
← dimi1947 left06:55
cbreak do you already have the history?07:05
→ shanmukh joined07:05
← shanmukh left07:06
→ theoceaniscool joined07:10
→ Ram-Z joined07:12
→ epony joined07:12
→ dionysus69 joined07:15
→ lagash joined07:22
→ jiffe joined07:23
→ nate3 joined07:29
→ Telmud joined07:32
← nate3 left07:34
→ dermoth joined07:36
→ zan joined07:36
← dionysus69 left07:37
→ Stooge joined07:37
→ dionysus69 joined07:38
← srinidhi left07:42
→ iomari891 joined07:54
← dionysus69 left07:56
→ khronosschoty joined07:57
→ TomyWork joined08:01
← skapata left08:02
→ dionysus69 joined08:03
→ Guest3 joined08:05
→ memoryleak joined08:07
← Masklin left08:07
→ feriman joined08:13
→ Ajax1469 joined08:19
→ tulpa_ joined08:19
← very_sneaky left08:20
← dionysus69 left08:20
Ajax1469 → Ajax14608:20
→ terminaldweller joined08:22
→ very_sneaky joined08:32
→ dionysus69 joined08:32
← dionysus69 left08:40
→ xx joined08:40
→ MajorBiscuit joined08:41
→ onizu joined08:43
→ Masklin joined08:45
→ Guest215 joined08:45
← Guest215 left08:46
← Sazhen86 left08:50
← opal left08:57
← YuGiOhJCJ left08:57
← Mikaela left08:57
→ DibbTubberOne joined08:57
→ YuGiOhJCJ joined08:57
→ Mikaela joined08:57
→ opal joined08:57
→ arch_angel joined09:02
← opal left09:09
→ opal joined09:10
← Guest3 left09:15
→ rsx joined09:18
→ hexadecagram joined09:19
→ tulpa__ joined09:22
← tulpa_ left09:23
← feriman left09:24
→ feriman joined09:25
← hexadecagram left09:28
→ theobjectivedad joined09:31
→ clime joined09:38
← hamburgler left09:41
← YuGiOhJCJ left09:44
← Telmud left09:45
→ Murr- joined09:49
← Murr left09:51
Murr- → Murr09:51
→ DrowningElysium joined09:53
vdamewood → vinleod09:54
→ rosco joined09:54
vinleod → vdamewood09:58
← opal left10:04
← rosco left10:05
→ King_julian joined10:07
→ opal joined10:10
← DibbTubberOne left10:11
→ moldorcoder7 joined10:12
→ hexadecagram joined10:13
→ sa0 joined10:15
← vishal left10:20
→ vishal joined10:24
→ fling joined10:27
← sa0 left10:32
→ _sa0sin_ joined10:32
→ cdown joined10:41
→ pulse joined10:42
← kevr left10:54
→ kevr joined10:56
jdarnley Is there a config option that makes `git commit --amend` not open an editor by default?10:58
gsi_ well there is -m to provide the message in the invocation, which eliminates the need for an editor11:00
→ tyson2 joined11:00
jdarnley There is also --no-edit but I usually forget that11:01
gsi_ can't tell whether it combines well with --amend, you may experiment with -c and setting the editor spec11:01
that's why somebody invented aliases :)11:01
← vicecea left11:01
jdarnley Which is why I ask. Can I make --no-edit the default for --amend?11:01
Can I alias --amend to --amend --no-eidt?11:02
→ vicecea joined11:02
osse no11:02
gsi_ probably not, but then is closing an editor so bad? guess it's worth to check11:02
osse but you can alias git amend to git commit --amend --no-edit11:02
it's nice11:02
git config --global alias.amend 'commit --amend --no-edit'11:03
gsi_ chances are that the amending results in a commit that needs or benefits from a different message11:03
jdarnley What?! Not in my experience11:03
osse I use that alias so much that I use it even when I want to actually change the message, and then use my 'git reword' alias :P11:03
jdarnley osse: thanks and I guess I can append --edit when I need to and git which use whatever comes last?11:03
geirha git commit -m "Don't forget to squash me"11:03
osse jdarnley: not 100 % sure but I assume so11:04
jdarnley geirha: --squash for that or --fixup11:04
osse gri11:04
jdarnley Alias for ammend it is11:05
wait... I don't need to worry about adding --edit because I'll probably use commit then.11:07
Well lets see how well I remember to use the new command11:07
geirha the hard part is remembering if it was two Ms or one11:10
jdarnley oh whoops11:10
I will spell my alias correctly11:10
lol11:10
← littlebuddy left11:16
gsi_ configure a 'ci' alias, make it resolve to 'commit -v' (I wish this would be the default anyway)11:16
the only "problem" with aliases is that you won't find them on machines that you haven't configured yet, but such is life11:17
← Ram-Z left11:18
gsi_ oh there is commit.verbose, reading and re-reading the builtin help is useful :)11:20
→ Ram-Z joined11:21
→ vitali64 joined11:22
→ manin891 joined11:22
← Jong left11:24
← coot left11:24
→ _vanessa_ joined11:28
_vanessa_ → vaness11:28
← vitali64 left11:29
→ nate3 joined11:30
vaness → vanessa11:34
← nate3 left11:35
osse it's nice because it also works when rewording commits in rebase -i11:42
→ Murr- joined11:43
→ coot joined11:45
← Murr left11:45
Murr- → Murr11:45
gsi_ nice one, I kept missing that, had to 'git diff --staged' or 'git diff --staged HEAD~1' from within the editor (abbreviated, of course)11:46
→ maret joined11:57
→ dimi1947 joined11:59
← coot left12:03
← jinsl left12:06
→ jinsl joined12:06
→ liefer joined12:08
→ dionysus69 joined12:13
→ dob1 joined12:15
← tulpa__ left12:16
← off^ left12:18
← FinnElija left12:19
→ FinnElija joined12:21
← King_julian left12:25
← fling left12:31
← FinnElija left12:31
→ FinnElija joined12:31
→ fling joined12:32
→ ac0 joined12:32
→ coot joined12:35
→ bambanxx joined12:36
→ lemonsni- joined12:37
→ rama joined12:39
← rama left12:40
→ mexen joined12:40
→ rama joined12:40
→ lucasta joined12:44
→ magic_ninja joined12:46
← crabbedhaloablut left12:57
→ crabbedhaloablut joined12:58
→ gryffus joined12:58
← feriman left13:00
→ menace joined13:04
← epony left13:04
← menace left13:04
→ menace joined13:04
menace → Deknos13:04
→ epony joined13:06
← makara left13:08
→ makara joined13:08
← makara1 left13:08
→ gumnos joined13:08
→ makara1 joined13:09
← tyson2 left13:10
← Novi left13:12
→ Novi joined13:13
← dionysus69 left13:14
→ enoq joined13:15
← Murr left13:15
← maret left13:15
→ Murr joined13:16
← Xenguy left13:18
→ furrymcgee joined13:18
jdarnley WTF?! Why did that delete all my files? Have I misunderstood `git add --intent-to-add`?13:19
osse More info needed.13:19
jdarnley All I wanted was it to add the new file to the index13:19
leah2 git add --intent-to-add adds an empty file. but yours should still be in the directory13:20
jdarnley `git apply --intent-to-add temp.diff` then `git status` shows "deleted: EVERYTHING"13:20
← Deknos left13:20
jdarnley I guess it isn't a shortcut for what I wanted to do13:21
leah2 without additional flags that doesnt even do that...?13:21
oh "--index is not specified"13:22
osse jdarnley: a plain 'git reset' fixes that.13:22
jdarnley Yeah I know13:23
osse but that's really bad UX13:23
leah2 what even is that good for oO13:23
jdarnley let me see if adding --index does what I expected but also adds everything else in the patch13:23
leah2 if you want to tweak a patch, it may be easier to git apply it and amend13:24
jdarnley "does not match index" you don't say!13:24
No I just wanted my new files to get added to the index automatically13:24
→ mw_ joined13:25
→ dionysus69 joined13:25
→ dsrt^ joined13:30
← agarr left13:30
← chexum left13:32
→ chexum joined13:33
← rama left13:35
→ rama joined13:35
← hbautista left13:35
→ maret joined13:36
→ sa0 joined13:36
gsi_ not sure what you see, but 'git add -N ...' works here as expected13:36
have never used it with 'git apply', but the builtin --help discusses a few constraints (--index, explicit or implicit)13:37
→ davidsong joined13:38
← bambanxx left13:38
gsi_ if that doesn't help, then try to show commands and their output which reproduces the issue, I cannot "get" the above rant13:39
← _sa0sin_ left13:39
→ Xaldafax joined13:40
← Visne left13:44
← rama left13:44
→ rama joined13:44
→ Visne joined13:47
→ gast0n joined13:48
→ nyah joined13:48
← chexum left13:50
→ chexum joined13:50
→ thiago joined13:56
← Piraty left14:00
← lucasta left14:09
→ kenanmarasli joined14:09
→ atrigent joined14:09
→ lucasta joined14:13
→ madewokherd joined14:14
← madewokherd` left14:17
← atrigent left14:20
← coot left14:21
← dimi1947 left14:23
→ atrigent joined14:27
→ k1773_ joined14:29
← k1773_ left14:29
→ k1773_ joined14:29
← Mikaela left14:30
→ Mikaela joined14:31
→ vitali64 joined14:36
→ fstd_ joined14:39
← fling left14:42
→ fling joined14:42
→ k1773__ joined14:44
← k1773__ left14:44
→ k1773__ joined14:44
→ lgc joined14:46
← lgc left14:46
← k1773_ left14:47
→ sudoforge joined14:54
← relight left14:54
← dionysus69 left15:00
→ jazzy joined15:00
→ zumba_addict joined15:05
→ dionysus69 joined15:05
→ Sulky joined15:06
→ feriman joined15:07
→ euouae joined15:08
euouae Hello, I'm using git to search for the first commit that a function appears in the repo15:08
git log -S <function> --reverse | head -n115:09
→ Sulky_ joined15:09
euouae but I'm getting "warning: exhaustive rename detection was skipped due to too many files.15:09
warning: you may want to set your diff.renameLimit variable to at least 4548 and retry the command."15:09
→ madewokherd` joined15:09
→ tyson2 joined15:09
← dsrt^ left15:10
← maret left15:12
selckin so do that15:12
→ squirrel joined15:12
← Sulky left15:12
← madewokherd left15:12
→ gh34 joined15:12
→ maret joined15:13
← maret left15:14
← scubanarc left15:16
← madewokherd` left15:17
euouae selckin: do you know what is happening?15:17
gsi_ see git config --help and search for "renamelimit" there?15:18
euouae thank you, it's not clear why this happens but I will modify the setting as suggested.15:19
← lucasta left15:19
→ lucasta joined15:20
← crabbedhaloablut left15:23
← opal left15:23
→ opal joined15:24
→ crabbedhaloablut joined15:25
← rama left15:30
→ hans_ joined15:30
→ tulpa_ joined15:31
← opal left15:31
→ hxztnxt joined15:31
→ opal joined15:31
→ nate3 joined15:32
→ rama joined15:32
← rama left15:33
→ rama joined15:33
→ maret joined15:34
← gryffus left15:35
← mexen left15:36
← nate3 left15:37
← tyson2 left15:37
← dionysus69 left15:38
→ mexen joined15:39
drew is there a way to pull remote updates for one specific branch into a local branch without pulling all other tags?15:40
← csm3105 left15:42
euouae tags in other branches?15:42
← chexum left15:43
→ chexum joined15:43
drew http://0x0.st/o4sm.txt15:43
yeah like if I do just `git pull` I'll pull a bunch of branches from gerrit, whereas I would just like to pull all updates for just one remote branch into just one local branch15:44
→ madewokherd joined15:44
← zumba_addict left15:44
gsi_ well the remote's name would be "origin" would it not?15:44
mackerman git fetch <remote> <refspec>15:45
drew yeah, origin15:45
i get mixed up with all the refs15:45
→ lukedashjr joined15:46
← luke-jr left15:47
lukedashjr → luke-jr15:47
mackerman git fetch origin refs/heads/<branch>:refs/remotes/origin/<branch>15:48
drew ok, so `git fetch origin bs-8450` did it, and then I want to reset my local bs-8450 to origin/bs-845015:49
mackerman Getting one branch only, which for you is now under "remotes" as a ref.15:49
drew right?15:49
mackerman Did you want to merge, or did you want to reset ?15:50
drew ah, that would have been more straightforward mackerman15:50
← jetchisel left15:50
drew I think merge would just ff, so either is fine, but resetting would be more of what I want, as all my local changes is just cruft15:50
→ m0viefreak joined15:50
mackerman Probably did the same thing because of the default refspec, I was just more specific about it.15:50
← Mikaela left15:51
→ Mikaela joined15:52
→ jetchisel joined15:52
← manin891 left15:52
mackerman Did you care about working tree? If not, reset --hard may be acceptable15:54
← enoq left15:58
← jetchisel left15:58
→ gryffus joined15:59
← euouae left16:01
→ lukedashjr joined16:02
← luke-jr left16:03
← MajorBiscuit left16:04
lukedashjr → luke-jr16:04
← Sulky_ left16:05
← lucasta left16:05
→ nighterrors joined16:16
→ gvg joined16:18
→ deego joined16:21
← umbramalison left16:21
deego I'm a git newbie. I have a humongous directory with 800GB that I sync to a self-managed server (git init --bare). git status shows they are all synced. Yet, the remote is only 10GB as reported by ncdu. Any suggestions on how to debug this?16:22
(and there are no uncommited changes. I did run git prune)16:23
← rfuentess left16:24
← luke-jr left16:24
gsi_ which part of your directory is 800GiB in size? the work tree (the checked out stuff), or the .git/ subdir (the meta data)?16:25
→ sgt_chuckles joined16:25
gsi_ might well be that the 800GiB file content compresses to 10GiB repo on the server16:25
deego .git is only 7G16:26
→ coot joined16:26
deego oh, git compresses things? i didn't even know16:26
ikke git uses gzip and delta compression16:26
gsi_ it does, after a while, or upon request16:26
deego nice!16:26
gsi_ oh, right, I keep forgetting :) deflate immediately, and delta compression later when packing?16:27
somehow remembered that un-packed content is uncompressed, but am mistaken there16:27
ikke loose objects are still gzip compressed16:28
→ scubanarc joined16:28
← chexum left16:29
→ chexum joined16:29
mackerman 80x compression of one tree is suspiciously good.16:31
Count the number of files and comapre between say git ls-tree and a non-git find command.16:31
→ luke-jr joined16:32
mackerman Or there's just not a lot of unique information in the files.16:32
ikke Yeah, it would require a lot of redudant data to get that much compression16:33
← rama left16:33
← gryffus left16:34
mackerman Also review any gitignore16:34
→ rama joined16:34
← scubanarc left16:34
→ gryffus joined16:34
← luke-jr left16:35
→ luke-jr joined16:36
→ irrgit joined16:39
→ forgotmynick joined16:39
→ umbramalison joined16:39
← coot left16:40
← rama left16:40
← DrowningElysium left16:43
→ scubanarc joined16:43
→ user_ joined16:48
← scubanarc left16:52
→ terminalpusher joined16:54
→ rama joined16:56
→ Guest3 joined16:57
→ toralf joined17:00
← rama left17:01
→ lucasta joined17:02
← luke-jr left17:03
← vicecea left17:05
→ vicecea joined17:05
→ luke-jr joined17:06
← atrigent left17:08
→ jetchisel joined17:13
← vdamewood left17:15
→ Sasazuka joined17:16
← sgt_chuckles left17:16
→ rama joined17:17
← rama left17:19
→ rama joined17:19
← zeenk left17:20
← squirrel left17:22
→ nvmd joined17:23
→ atrigent joined17:24
← Mikaela left17:25
→ Mikaela joined17:25
← Visne left17:27
← atrigent left17:30
→ coot joined17:30
→ Visne joined17:30
deego mackerman: thanks17:33
← irrgit left17:34
→ skapata joined17:34
→ bambanxx joined17:35
→ LuxuryMode joined17:36
← hxztnxt left17:41
→ austin__ joined17:41
← bambanxx left17:43
CrtxReavr How do I re-commit, ie. update just a commit message?17:43
dav1d CrtxReavr, if it is the last commit you want to change `git commit --amend`, other wise you might be able to do it with `git rebase -i ...`17:44
if your git history you want to rewrite contains merges, it becomes messy17:44
EdFletcher you definitely can with `rebase -i`: you use the "reword" directive17:44
dav1d EdFletcher, good luck if you have merge commits17:45
ikke CrtxReavr: if it's the latest commit, the easiest is to use git commit --amend17:46
CrtxReavr Yeah --amend should do the trick.17:46
EdFletcher dav1d: hahaha truth, hence why you should stick with one workflow or the other (I'm wholly in the rebase camp myself, which is why i always default to that method)17:47
ikke EdFletcher: I do both :P17:47
rebase + no-ff merge17:47
→ nightstrike joined17:52
← rama left17:54
→ Jong joined17:57
← lucasta left17:59
→ rama joined17:59
← hans_ left18:00
→ scubanarc joined18:01
← rama left18:03
→ rama joined18:03
→ Narrat joined18:03
→ lucasta joined18:06
→ Betal joined18:07
← terminalpusher left18:08
→ bambanxx joined18:09
← nvmd left18:10
→ nvmd joined18:11
← Stooge left18:15
→ atrigent joined18:19
→ battos joined18:22
← liefer left18:24
← bambanxx left18:26
→ thuna` joined18:30
← jetchisel left18:30
thuna` What does git send-email do compared to attaching the patches to an email? How would I go about doing it manually?18:32
ikke It formats all the e-mails, and delivers them to an MTA18:33
kurahaupo ikke: no-ff merge or ff-only merge? (I specifically have an alias "git ff")18:33
ikke no-ff merge18:33
→ tyson2 joined18:33
thuna` ikke: Format how?18:33
ikke thuna`: format as in compose18:34
kurahaupo ikke: So only merge when you *can't* fast-forward?18:34
ikke kurahaupo: rebase, and force a merge commit18:34
thuna` ikke: I don't understand what "compose" entails, can you elaborate?18:34
→ KnoP joined18:34
ikke thuna`: Instead of you manually typing the e-mails, it creates one e-mail per commit, with (by default) the patch inline in the e-mail18:35
bremner thuna`: you can inspect the mails by using "git format patch"18:35
← KnoP left18:35
ikke oh right, git send-email does not create the actual e-mails18:36
that's what format-patch does18:36
bremner thuna`: upstreams (like me) much prefer mail from git-format-patch, because they can be applied by "git am" without fussing with each message18:36
no matter how nice your messages look if you do it manually, something will break.18:36
osse AKSHSKSUALLY send-email can take commits as argument and do the formatting as well as the sending18:38
→ dnh joined18:39
osse (I guess it delegates to format-patch under the hood)18:39
← austin__ left18:39
bremner osse: yes, it does18:39
← very_sneaky left18:40
bremner osse: my point was if you want to see what the mails are, format-patch allows you to preview or (not recommended) reverse engineer18:40
thuna` bremner: Is the .patch file directly what send-email sends?18:40
bremner yes18:41
well. I _think_ so.18:41
I'd have to double check there is no further processing18:41
← arch_angel left18:41
← rsx left18:43
← vitali64 left18:43
gsi_ there's a simple way to find out: test it locally, send the mail to yourself18:45
this is recommended practice anyway before you send stuff to others without knowing whether it works18:45
bremner thuna`: yeah, send-email adds To, and potentially Cc18:45
gsi_ and full ACK to "don't try to do it manually", because if you are not familiar with format-patch you _will_ miss essential information18:46
bremner otherwise it is byte identical, modulo headers added by MTAs. Or arbitrary crap done by corporate mail munging servers18:46
gsi_ those who (routinely) receive commits by email know this, that's why they recommend that submitters use the tools18:46
→ Lord_of_Life_ joined18:54
← Lord_of_Life left18:56
← maret left18:56
Lord_of_Life_ → Lord_of_Life18:57
→ maret joined18:57
← hoochmonger left18:57
← FinnElija left19:00
→ FinnElija joined19:01
← lemonsni- left19:01
← momomo left19:01
→ momomo_ joined19:01
← battos left19:05
← iomari891 left19:12
→ ikwyl6 joined19:12
← Murr left19:15
→ Murr joined19:16
← momomo_ left19:22
→ causasui joined19:23
→ momomo joined19:23
→ odoood joined19:27
← xx left19:27
← odoood left19:27
→ odoood joined19:29
← Coop left19:31
→ nate3 joined19:33
← Sasazuka left19:35
→ puff joined19:37
← nate3 left19:39
→ dsrt^ joined19:40
← roadie left19:40
→ roadie joined19:40
← odoood left19:41
← igemnace left19:42
→ funhouse joined19:45
← roadie left19:45
← Guest3 left19:48
← TomyWork left19:49
→ roadie joined19:52
→ very_sneaky joined19:52
← tyson2 left19:55
→ tyson2` joined19:55
→ Coop joined19:56
← Mikaela left19:57
→ Stooge joined19:57
← atrigent left20:00
← tyson2` left20:04
→ Aminda joined20:05
← forgotmynick left20:06
← jinsun left20:08
← Aminda left20:08
→ Aminda joined20:08
→ Millicent joined20:12
→ ferdna joined20:13
→ Sasazuka joined20:20
→ jinsun joined20:20
→ geosmile joined20:25
→ YuGiOhJCJ joined20:26
→ nate3 joined20:30
→ ario_ joined20:39
ario_ What's a good way to resolve merge conflicts on 20+ files20:39
→ ackyshake joined20:39
ikke use a good mergetool20:39
ario_ I do git merge to then individually fix them20:39
but it's weird, the merge removes some stuff20:39
← coot left20:40
ario_ Is that the right approach?20:40
Perform the git merge -> git tells you have merge conflict -> fix each file20:40
→ pretty_dumm_guy joined20:43
← rama left20:43
gsi_ what do you mean "the merge removes some stuff"?20:46
part of the diff gets applied automatically, as a user you only see the conflicts and have to resolve them20:47
← thuna` left20:47
gsi_ or do you perceive that git "drops" content that should be there? without the commit removing it? that'd be unexpected20:47
after you resolve conflicts and 'git add' the content that you want, 'git diff --staged' should look plausible to you, does it?20:48
cbreak and in addition to that, after the merge is completed, your code should compile, and your unit tests should still pass20:49
and you shouldn't have any conflict markers in the code anymore :)20:49
→ rama joined20:50
→ relight joined20:52
→ arch_angel joined20:53
← madewokherd left20:54
← Sasazuka left21:02
← LuKaRo_ left21:04
→ Sasazuka joined21:05
→ hamburgler joined21:06
← otisolsen70 left21:10
← dnh left21:13
→ DonRichie joined21:16
← gh34 left21:17
← kenanmarasli left21:17
← crabbedhaloablut left21:24
← Narrat left21:25
← roadie left21:26
← rama left21:31
jsatk Anyone know what would cause `git log --show-signature` to not show any signatures but on Github it shows the "Verified" badge on the commit?21:32
→ rama joined21:32
cbreak jsatk: maybe the commit isn't signed, but there's a signed annotated tag for it?21:32
→ kurahaupo_ joined21:33
← nate3 left21:33
jsatk I'm seeing this consistently for all commits of mine in this repo. This is for my work's Github Enterprise instance as well.21:34
← kurahaupo left21:34
← rama left21:34
→ rama joined21:34
← rama left21:39
→ agarr joined21:44
← lucasta left21:47
← agarr left21:47
→ tyson2 joined21:48
→ atrigent joined21:49
cbreak wonder if the commit is actually signed21:50
have you looked at the commit object with git cat-file -p commithash?21:51
→ roadie joined21:51
→ Shentino joined21:52
→ crabbedhaloablut joined21:52
→ Sazhen86 joined21:55
← roadie left21:56
← ac0 left21:56
← fling left21:56
→ kurahaupo joined21:57
→ karabaja4 joined21:57
gsi_ does 'gpg --verify' work locally? git log --help suggests that this is used internally21:57
← kurahaupo_ left21:59
→ xx joined22:01
← Sasazuka left22:04
← tulpa_ left22:04
jsatk Hm. How do I do that. Running `gpg --verify` just hangs. It expects a file I believe.22:05
← LuxuryMode left22:06
→ zebrag joined22:08
← causasui left22:13
→ Sasazuka joined22:15
← xx left22:16
← chexum left22:20
→ chexum joined22:21
→ roadie joined22:22
→ PenguinMan98 joined22:26
→ bool_ joined22:27
PenguinMan98 Trying to clone a repo. It's in a project managed by my company, that I do have access to; and is set up for ssh cloning. I use ssh-keygen to generate a keypair on my ubuntu VM, and set it in my github account. I configure the SSO to allow the key to be used on my company project.22:29
When I try to clone though, I get an error 'Host key verification failed'22:29
I've taken all the steps I could find on stack overflow, with no effect22:29
ideas?22:30
← nvmd left22:30
mackerman "host key" means your ssh does not know the server, in this case GitHub22:31
Test ssh interactively and see if ssh prompts you22:31
ssh -T [email@hidden.address] # https://docs.github.com/en/authentication/connecting-to-github-with-ssh/testing-your-ssh-connection22:31
→ tulpa_ joined22:32
PenguinMan98 It prompted me22:33
← roadie left22:33
← m0viefreak left22:33
eamanu my 50cents your company is not filtering the keys? I don't if that is possible22:33
mackerman That GitHub doc links to their keys, so you can verify22:34
PenguinMan98 OK, having accepted the key and forged the connection, I returned to the clone. Now it says 'Permission denied (publickey)22:35
mackerman Now your private key is incorrect22:35
PenguinMan98 I created two and registered both with github22:36
And on my system with ssh-add22:37
mackerman https://docs.github.com/en/authentication/troubleshooting-ssh/error-permission-denied-publickey shows how to check ssh-add -l output versus GitHub keys22:39
→ Xenguy joined22:40
← moldorcoder7 left22:43
← tulpa_ left22:46
→ Noisytoot_ joined22:47
← Noisytoot left22:47
PenguinMan98 Thanks! It was the sudo22:49
chowned the folder and dropped the sudo22:49
← Sazhen86 left22:49
PenguinMan98 Now it cloned22:49
← arch_angel left22:54
← opal left22:59
→ GNUmoon joined22:59
→ roadie joined23:00
← GNUmoon left23:02
→ gasbag joined23:02
→ GNUmoon joined23:03
← gasbag left23:04
→ opal joined23:04
→ jim87 joined23:05
← theoceaniscool left23:05
← Noisytoot_ left23:07
→ Noisytoot joined23:11
← roadie left23:12
← GNUmoon left23:13
→ GNUmoon joined23:14
← YuGiOhJCJ left23:16
← peirik_ left23:18
→ jancoow7 joined23:19
→ vdamewood joined23:19
→ YuGiOhJCJ joined23:20
jancoow7 → jancoow23:21
← jancoow left23:21
→ jancoow joined23:22
← tachoknight left23:25
→ bgs joined23:34
→ jjakob joined23:35
← lord| left23:35
→ lord| joined23:36
← nyah left23:37
→ xx joined23:38
→ roadie joined23:38
→ pieguy128 joined23:40
← GNUmoon left23:42
→ GNUmoon joined23:43
→ peirik_ joined23:44
← GNUmoon left23:47
→ GNUmoon2 joined23:47
← GNUmoon2 left23:48
→ funhouse_ joined23:48
→ GNUmoon2 joined23:49
← jancoow left23:49
→ LuKaRo joined23:49
← GNUmoon2 left23:50
← clime left23:50
→ GNUmoon2 joined23:51
← roadie left23:51
← funhouse left23:52
→ arescorpio joined23:52
← GNUmoon2 left23:52
→ GNUmoon2 joined23:53
→ madewokherd joined23:53
→ fling joined23:55
→ mud joined23:56
← zebrag left23:57
← gas51627 left23:58
← gast0n left23:58

Logs Search ←Prev date Next date→ Channels Documentation