IRCloggy #git 2022-04-29

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-04-29

→ duxsco joined00:03
→ DarkMat joined00:05
← pflanze left00:06
← DarkMat left00:06
→ pflanze joined00:07
← wakeup left00:08
→ john joined00:09
→ mrME1 joined00:09
← mrMe left00:10
→ mrME2 joined00:12
← Sulky left00:13
← Sasazuka left00:14
← mrME1 left00:15
← mrME2 left00:18
→ DarkMat joined00:18
→ mrME2 joined00:18
← vicfred left00:19
→ Jong joined00:19
← pretty_dumm_guy left00:20
← duxsco left00:23
← DarkMat left00:24
← skapata left00:24
← mrME2 left00:24
→ mrME2 joined00:26
← Jong left00:28
← funhouse left00:36
→ skapata joined00:37
→ Sasazuka joined00:37
→ mrMe joined00:38
← fling left00:39
← mrME2 left00:39
← clime left00:40
← cdown left00:40
→ mrME1 joined00:40
→ fling joined00:41
→ mrME2 joined00:42
← mrMe left00:42
→ roadie joined00:43
→ mrMe joined00:44
← mrME1 left00:44
→ duxsco joined00:45
← mrME2 left00:46
← roadie left00:48
→ clime joined00:52
→ BtbN joined00:54
→ roadie joined00:59
← mrMe left01:02
→ littlebobeep joined01:03
← duxsco left01:06
→ duxco joined01:06
→ Tabmow joined01:07
duxco → duxsco01:09
← roadie left01:11
← Gaboradon left01:12
imMute lpapp: there's no way to completely avoid conflicts when merging two histories together01:12
→ hololeap joined01:16
← littlebobeep left01:19
→ tyson2 joined01:20
← duxsco left01:20
→ littlebobeep joined01:22
→ whatsupdoc joined01:23
→ roadie joined01:25
← analoq left01:26
→ analoq joined01:27
← pulse left01:27
← hololeap left01:32
→ hololeap joined01:34
← roadie left01:37
→ coffeejunk8 joined01:38
← lechner left01:41
→ lechner joined01:42
← fling left01:43
→ sa0 joined01:43
→ fling joined01:45
← bertvvvs left01:45
← Gustavo6046 left01:45
→ Gustavo6046 joined01:47
← Tabmow left01:47
→ Tabmow joined01:48
Knowsin → robertparkerx01:53
→ wdkrnls joined01:55
← hololeap left01:56
→ roadie joined02:03
→ Tabstar joined02:07
← Tabmow left02:07
Tabstar → Tabmow02:09
→ thiago joined02:10
← srinidhi left02:11
← Tabmow left02:12
→ Tabmow joined02:12
→ akimbo533430 joined02:15
← cliluw left02:15
← roadie left02:15
← sa0 left02:16
← akimbo53343 left02:16
→ finn_elija joined02:19
← FinnElija left02:19
finn_elija → FinnElija02:19
← Gustavo6046 left02:20
← mat001_ left02:22
→ mat001_ joined02:28
→ cliluw joined02:29
→ hbautista__ joined02:37
→ funhouse joined02:38
→ mrMe joined02:44
→ Gustavo6046 joined02:47
← howdoi left02:48
← littlebobeep left02:49
← Gustavo6046 left02:49
→ littlebo1eep joined02:49
→ Gustavo6046 joined02:49
← Gustavo6046 left02:49
→ Gustavo6046 joined02:49
→ meejah joined02:52
← Techcable left02:57
→ Techcable joined02:58
→ Techcable_ joined02:59
→ ick joined03:01
← gast0n left03:02
→ mrME1 joined03:07
→ sudoforge joined03:07
← mrMe left03:08
← nyah left03:09
→ mrME2 joined03:16
← mrME1 left03:16
→ mrMe joined03:18
← tkazi left03:18
← mat001_ left03:19
→ mat001_ joined03:20
→ tkazi joined03:21
← mrME2 left03:21
→ jimklimov joined03:24
← mrMe left03:24
→ mrMe joined03:25
← zebrag left03:25
→ roadie joined03:29
← mrMe left03:33
→ mrMe joined03:34
← Murr left03:34
→ Murr joined03:35
← tyson2 left03:36
← Visne left03:38
→ Visne joined03:39
← roadie left03:42
← skapata left03:46
→ stats4647 joined03:46
← Gustavo6046 left03:47
← Techcable left03:50
← Techcable_ left03:50
← mrMe left03:52
→ geosmile joined03:56
← bloody left03:57
→ saroy joined03:59
← littlebo1eep left04:00
→ Gustavo6046 joined04:02
← Gustavo6046 left04:03
→ Gustavo6046 joined04:03
← Gustavo6046 left04:06
→ Gustavo6046 joined04:06
← bkircher left04:07
← Gustavo6046 left04:08
← fling left04:08
→ Gustavo6046 joined04:08
→ bkircher joined04:09
→ sa0 joined04:15
← cliluw left04:22
→ cliluw joined04:22
lpapp imMute: it is not about merging two histories though04:24
→ BinarySavior joined04:24
← Visne left04:25
← tureba left04:25
→ littlebobeep joined04:25
← dzho left04:26
→ tureba joined04:26
→ dzho joined04:26
→ Visne joined04:26
→ P1RATEZ joined04:37
← Gustavo6046 left04:38
← madewokherd left04:41
→ madewokherd joined04:41
→ zumba_addict joined04:43
← stats4647 left04:44
→ mrMe joined04:44
→ roadie joined04:45
← sa0 left04:45
→ Gustavo6046 joined04:46
→ stats4647 joined04:47
← mannequin left04:48
← bkircher left04:49
→ bkircher joined04:50
← stats4647 left04:51
← roadie left04:59
→ roadie joined05:00
→ mrME1 joined05:00
→ madewokherd` joined05:01
→ mrME2 joined05:02
← mrMe left05:03
← madewokherd left05:04
← mrME1 left05:05
← Visne left05:06
→ vicfred joined05:07
→ Visne joined05:08
→ bluesm joined05:09
→ mrMe joined05:12
← mrME2 left05:13
← travisghansen1 left05:15
← mrMe left05:15
→ mrMe joined05:16
→ stats4647 joined05:17
→ Techcable joined05:17
← mrMe left05:22
→ mrMe joined05:23
← stats4647 left05:23
→ mrME1 joined05:25
→ mrME2 joined05:27
← jimklimov left05:27
← mrMe left05:28
← bket left05:28
← igemnace left05:29
← mrME1 left05:30
→ bket joined05:31
→ travisghansen1 joined05:31
← mrME2 left05:33
← hbautista__ left05:34
→ mrME2 joined05:34
→ mrMe joined05:36
← littlebobeep left05:36
→ mrME1 joined05:38
→ mexen joined05:38
→ littlebobeep joined05:38
← mrME2 left05:39
→ igemnace joined05:39
→ mrME2 joined05:40
← mrMe left05:40
← mrME1 left05:43
← igemnace left05:45
← cliluw left05:46
→ igemnace joined05:46
→ cliluw joined05:46
← igemnace left05:48
→ mrMe joined05:48
→ dansan joined05:48
← mrME2 left05:48
→ igemnace joined05:49
← very_sneaky left05:49
→ very_sneaky joined05:50
← roadie left05:52
→ roadie joined05:53
← mrMe left05:57
← cliluw left05:59
← littlebobeep left05:59
← great_taste left05:59
→ cliluw joined05:59
→ srinidhi joined05:59
→ DibbTubberOne joined06:03
← DibbTubberOne left06:03
→ DibbTubberOne joined06:03
← cbreak left06:06
→ jimklimov joined06:07
← ChmEarl left06:11
← jazzy left06:12
→ cbreak joined06:12
← thiago left06:13
← P1RATEZ left06:17
→ mrMe joined06:23
→ carl- joined06:27
← bkircher left06:28
→ bkircher joined06:28
osse lpapp: the "again" thing is what my suggested specifically addresses06:29
*suggestion06:29
← Thanatermesis left06:33
← bkircher left06:35
→ bkircher joined06:35
→ Jong joined06:35
→ Ajax1461 joined06:37
lpapp osse: gotcha, I was just looking for solutions now :)06:37
← Ajax146 left06:39
Ajax1461 → Ajax14606:39
→ winter2 joined06:40
← winter left06:41
winter2 → winter06:41
→ rsx joined06:45
→ vicky joined06:49
→ littlebobeep joined06:51
osse sure06:52
afaik there are none06:52
vicky There are two repos A and B. Each has a branch named test. If we rewrite git history of test branch in repo A. Can I force push that branch from repo A to another repo?06:52
← DibbTubberOne left06:53
vicky so that the history will same in both repos06:56
→ palasso joined07:00
→ jnors joined07:01
osse yes07:04
← whatsupdoc left07:05
vicky thanks07:05
→ bluesmonk joined07:08
→ rfuentess joined07:08
← jimklimov left07:10
← ick left07:11
nazarewk[m] how would i go about doing equivalent of `git reset --hard` with specific paths?07:13
osse nazarewk[m]: as in, remove changes to files?07:14
nazarewk[m] yes07:14
→ bindu_ joined07:14
osse git checkout HEAD -- file(s)07:14
nazarewk[m] this will both unstage and restore original files on disk, right?07:14
→ Masklin joined07:15
osse yes07:15
← bindu left07:17
→ feriman joined07:17
→ gooble_gobble_2 joined07:17
bindu_ → bindu07:17
← jnors left07:17
← roadie left07:18
← bluesm left07:19
← gooble_gobble_1 left07:19
← LiENUS left07:21
← igemnace left07:21
→ LiENUS joined07:22
← Vonter left07:22
→ MajorBiscuit joined07:24
← Gustavo6046 left07:24
← mrMe left07:25
→ igemnace joined07:29
→ john_johnk joined07:30
→ kenanmarasli joined07:30
← Murr left07:34
→ EvilDMP joined07:34
→ Murr joined07:34
← sudoforge left07:39
→ csm3105 joined07:41
→ dvanloon83 joined07:42
← dvanloon8 left07:42
dvanloon83 → dvanloon807:42
→ roadie joined07:45
← littlebobeep left07:46
← Visne left07:46
→ TheCatBehemoth joined07:47
→ Visne joined07:47
→ iomari891 joined07:51
← roadie left07:53
→ roadie joined07:57
← rsx left07:57
→ jazzy joined08:00
← roadie left08:02
← EvilDMP left08:03
→ Ajax1463 joined08:04
← Ajax146 left08:07
Ajax1463 → Ajax14608:07
→ zeenk joined08:07
→ duxsco joined08:10
→ ick joined08:13
→ DarkMat joined08:14
→ hans_ joined08:16
→ roadie joined08:17
→ hootch joined08:17
→ EvilDMP joined08:21
← oprypin left08:27
→ oprypin joined08:27
← Masklin left08:31
→ dionysus69 joined08:35
← arch-angel left08:37
→ arch_angel joined08:39
← arch_angel left08:39
→ a1eaiactaest joined08:39
→ sa0 joined08:44
→ Masklin joined08:45
← igemnace left08:45
→ masber joined08:46
masber hi, I am working using a shared account in machine, I clone my repo locally and forgot to do `git config --local user.name ...` to set the commit author to my name, because of that, the git commit I pushed to remote/origin has the shared account name as author. How can I change this?08:48
I would like to change the branch/commit author in origin to my name08:48
bookworm masber: rewrite the commit, then force push08:54
as usual, !rewrite applies08:54
gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum08:54
← Masklin left08:55
→ Masklin joined08:56
→ cdown joined08:56
ikke they asked the same question in gitlab08:56
#gitlab08:56
and we answered them there as well08:56
← duxsco left08:56
← DarkMat left08:59
→ cdown_ joined08:59
← Masklin left09:00
→ igemnace joined09:02
← cdown left09:02
cdown_ → cdown09:02
← lpapp left09:03
← FinnElija left09:09
→ duxsco joined09:10
→ tulpa_ joined09:11
→ otisolsen70 joined09:12
→ DarkMat joined09:13
→ FinnElija joined09:13
← Betal left09:16
→ Masklin joined09:18
→ stats4647 joined09:25
← MajorBiscuit left09:27
← Masklin left09:27
← stats4647 left09:30
→ wakeup joined09:32
← masber left09:34
← cdown left09:37
← enkeyz left09:40
→ MajorBiscuit joined09:40
→ Swahili joined09:43
→ DarkMat2022 joined09:44
← DarkMat2022 left09:46
← DarkMat left09:47
← sa0 left09:55
→ sa0 joined09:56
← feriman left09:57
→ feriman joined09:59
← dvanloon8 left10:00
→ jimklimov joined10:01
→ jimklimov1 joined10:02
→ dvanloon8 joined10:02
← jimklimov left10:06
→ drogas joined10:06
→ pretty_dumm_guy joined10:09
← wakeup left10:22
→ coot joined10:23
← wonko-the-sane left10:23
→ wonko-the-sane joined10:23
← jazzy left10:24
← MajorBiscuit left10:27
→ MajorBiscuit joined10:28
→ wakeup joined10:35
← drogas left10:36
← ick left10:37
← MajorBiscuit left10:38
→ ano joined10:39
→ skapata joined10:39
← skapata left10:39
→ skapata joined10:39
→ MajorBiscuit joined10:40
→ drogas joined10:40
← Lord_of_Life left10:42
→ Lord_of_Life joined10:43
→ skapate joined10:43
← skapate left10:43
→ skapate joined10:43
← skapate left10:44
← hans_ left10:45
→ skapate joined10:47
← skapate left10:47
→ skapate joined10:47
← skapata left10:47
← geosmile left10:48
← wakeup left10:48
← vishal left10:50
← otisolsen70 left10:51
→ vishal joined10:52
→ arch_angel joined10:54
arch_angel → arch-angel10:54
← Ajax146 left10:58
→ Ajax1463 joined10:59
← TheCatBehemoth left11:01
→ DibbTubberOne joined11:01
← peirik left11:04
← zumba_addict left11:04
← ano left11:04
→ ano joined11:05
← tulpa_ left11:07
← MajorBiscuit left11:09
→ Csm319_ joined11:10
→ vanessa joined11:12
← csm3105 left11:13
→ vezon joined11:15
→ ick joined11:21
→ MajorBiscuit joined11:25
← coot left11:28
→ nyah joined11:28
← funhouse left11:37
→ littlebobeep joined11:38
← iomari891 left11:38
← ick left11:39
→ ick joined11:42
→ otisolsen70 joined11:47
← ikwyl6 left11:51
← saroy left11:54
← littlebobeep left11:56
← skapate left11:56
← vezon left11:59
→ tyson2 joined11:59
→ sandipan joined12:02
← john left12:03
← DibbTubberOne left12:03
→ Ajax14638 joined12:04
→ pulse joined12:06
← Ajax1463 left12:06
Ajax14638 → Ajax146312:06
→ bertvvvs joined12:08
→ xkuru joined12:08
willcl_ark I think `gh` tool is doing something funny to my global config; when I checkout a PR which has two remotes (origin and upstream), it adds `[remote "upstream"]\n\tgh-resolved = base` to my global config, which means that `git pull` (and other) commands in _every_ other repo which don't have an `upstream` branch configured print error messages. Also PRs checked out with `gh pr checkout xx` get added to the global config as branches too. Is there12:09
any way to configure `gh` to use a local, per-repo config file for this stuff?12:09
hummm just realised, is `gh` offtopic here? Sorry if it is12:09
bremner somewhat offtopic. But maybe somebody knows.12:10
→ iomari891 joined12:11
→ cm315 joined12:12
← Csm319_ left12:14
← sandipan left12:16
→ Csm319_ joined12:16
← Csm319_ left12:16
← Xenguy left12:19
← cm315 left12:19
→ TheCatBehemoth joined12:25
← Ram-Z left12:26
→ mannequin joined12:27
← TheCatBehemoth left12:27
→ TheCatBehemoth joined12:28
← zeenk left12:29
← iomari891 left12:30
→ wakeup joined12:31
→ kaiseisei joined12:32
→ dimi1947 joined12:35
→ ized joined12:41
→ agrosant joined12:42
← duxsco left12:43
← ized left12:44
bkhl_ → Guest342512:44
→ ized joined12:45
→ saroy joined12:45
← Swahili left12:46
→ Swahili joined12:46
→ Ram-Z joined12:48
← bertvvvs left12:49
→ bloody joined12:51
→ iomari891 joined12:52
← pulse left12:55
→ nova joined12:57
← saroy left12:59
→ saroy joined12:59
nova I did git diff {sha} HEAD -- foo/ in vim with :Git diff... This ran the diff, pulled stdout into a buffer, and folded each diff into one visual line. I made a macro to yank the folded region, :tabnew, :1d, :setf diff, :1tabn to jump back to first tab. Now I have each of the 30 or so diffs in a tab. It is okay, but can anyone think of a way to get a 2-file diff between two branhes instead of only13:00
inline diffs? Also, I just did this quickly without thinking. Am I just doing stupid stuff? Better way? It feels janky13:00
→ peirik joined13:02
osse nova: what do you mean by a 2-file diff between two branches?13:03
nova: maybe you want git difftool13:05
or maybe you want (shameless self plug) this: https://github.com/Osse/vdwrap13:05
there is work in progress to make something similar built into the difftool functionality13:05
← wakeup left13:06
→ onizu joined13:07
→ axisys joined13:09
nova instead of copying the 20 GiB repository as a separate folder, checking out a previous commit in the copy, and then doing vim foo/* +tab\ sball +"tabdo exe 'vsp' '../RepositoryClone/'..expand('%:t') | windo diffthis" ..... you know?13:10
axisys is there a way to find out when and how and who created a branch? I have two branches main and main-2.0 and it is problematic.. trying to find out more details13:10
osse nova: no, I don't know. I can't tell what you want13:10
but it reaaally sounds like git difftool -t vimdiff13:11
nova what that vim shenanigans would do if I were to run it is, take each file in foo/*, open them all in tabs, take each file's counterpart in the cloned repo that is under the other branch in a vertical split, then do a diff on the two files13:11
because I would have Repo1/ and Repo2/ and I want to basically do a diff of each file in Repo1/foo/ and Repo2/Foo/ but without duplicating Repo1 to Repo213:12
instead I just want to do a diff between HEAD and {sha-bla-bla} in Repo1 with a 2-file diff between each file13:12
osse use the script I linked13:12
it does that13:12
nova I am on windows13:13
life sucks (TM)13:13
osse Use it anyway13:13
nova yes, master13:13
osse I use it on window13:13
s13:14
nova I mean main. We don't use master anymore13:14
osse Or you can see what that script does and do the same13:14
Maybe Fugitive has a way of doing it that I dopn't know about. Ask #vim about that13:16
Someone here took my vdwrap script and rewrite it to be posix sh, in which case it'll work out of the box on windows13:16
nova axisys: git show of course shows who made a commit. nothing tracks who created a branch. the remote repo could perhaps know who pushed a new branch to it, but I am not sure where those data are13:18
bremner outside git13:19
some hosting systems track pushes.13:19
← kaiseisei left13:26
nova osse: thanks btw. Sorry I am just going to use the annoying inline diffs cuz I am in a tiny bit of a time crunch, but it looks cool, and I will maybe incorporate into workflow in future13:27
→ kaiseisei joined13:27
osse nova: the magic sauce is difftool --dir-diff that prepares two temp dirs with the differing files.13:28
it works out of the box with some GUI difftools, e.g. bcompare, p4merge. so I'd do that instead13:28
nova oh, that's not so bad, then. cool beans13:28
osse but not with vimdiff, which my script works around.13:29
← kenanmarasli left13:31
← kaiseisei left13:32
→ wakeup joined13:33
wakeup is there a way to determinate if I am currently doing a rebase?13:33
without affecting the rebase, if it's being done13:33
I know I can do git rebase --abort or git rebase --continue, but this can affect the rebase13:33
selckin think status tells you13:34
→ bertvvvs joined13:35
← YuGiOhJCJ left13:38
wakeup is it possible to change the commit message without changing the history?13:41
bookworm no13:42
← a1eaiactaest left13:44
wakeup what about git notes?13:45
→ gurkenglas joined13:45
wakeup maybe git is not as powerful as I thought then13:45
bookworm yes13:46
← vanessa left13:46
→ sudoforge joined13:47
anddam why are info about submodules both in .gitmodules and in .git/config?13:47
bookworm git is a graph of connected nodes, what you were asking is akin to breaking the chain and spinning a new one... not sure what else you'd expect. It's all hashed in the end, flip a single bit of the protected fields and the hash changes, meaning it's not the same histoy anymore13:47
→ linux_dream joined13:48
linux_dream hi people I'm having a hard time to put my local repository in bitbucket. I followed https://confluence.atlassian.com/bitbucketserver/importing-code-from-an-existing-project-776640909.html to no avail13:48
wakeup I mean, it's ok to change the hashes, I just don't want to change the type when the commits were made13:49
linux_dream I get a message saying that hint: Updates were rejected because the tip of your current branch is behind13:49
bookworm linux_dream: create empty repo, push code. What do you need help with?13:49
linux_dream is there a way I could force to upload my repo there? it's supposedly an empty repo on bitbucket (just a gitignore file)13:49
wakeup *the time13:49
not the type13:49
linux_dream bookworm: that's what I've done bookworm13:49
bookworm did you let bitbucket create files? Say gitignore / readme?13:49
linux_dream yes bookworm13:50
that's the problem I guess13:50
bookworm if so do you want to keep them?13:50
linux_dream sure, why not13:50
bookworm it makes stuff more complicated13:50
linux_dream I tried git pull too13:50
ok then, let's destroy them13:50
bookworm you need to either merge the unrelated histories or pick one side13:50
choose your preferred option13:51
linux_dream I'll forget about that gitignore file13:51
I'll pick 1 side13:51
bookworm git push -f then13:51
linux_dream thanks!13:51
that worked bookworm ... thank you very much13:52
bookworm no worries13:52
← linux_dream left13:53
→ thiago joined14:19
→ kaiseisei joined14:24
← wonko-the-sane left14:36
→ anaveragehuman joined14:38
robertparkerx → Knowsin14:40
Knowsin → robertparkerx14:42
→ AnapodoPsalidi joined14:43
← thebombzen left14:44
← AnapodoPsalidaki left14:45
→ madewokherd joined14:45
→ funhouse joined14:48
← madewokherd` left14:48
← kaiseisei left14:54
← roadie left14:55
← anaveragehuman left14:55
→ roadie joined14:59
← roadie left15:03
← ized left15:04
← wakeup left15:07
→ rgrinberg joined15:09
→ roadie joined15:11
→ anaveragehuman joined15:11
← saroy left15:13
→ gast0n joined15:16
→ stats4647 joined15:21
anddam warning: remote.origin.pushurl has multiple values15:23
should I manually edit git/config or is there a config command to sort this?15:24
→ pulse joined15:24
anddam (this was intentional, now I dropped the will to have odd configuration and have to tame a git with several submodule)15:24
→ coot joined15:25
ikke git config --unset <key> <value-pattern>15:26
→ vitali64 joined15:28
→ ChmEarl joined15:28
→ hans_ joined15:29
← x88x88x left15:30
→ junktext joined15:31
→ bodom joined15:33
anddam thx15:33
I got further questions15:33
← madewokherd left15:33
bodom Hi there! Is there a setting to change the default merge message from "merge branch stable into HEAD" to "merge branch stable into origin/branch_name"?15:33
→ humanBird joined15:34
← Murr left15:34
→ Murr joined15:34
srinidhi Hi! I'm back with more "git worktree" questions. I've been struggling to get newer branches created on the remote "origin" to show up on my bare work-tree.15:35
running "git fetch", does not bring in those newly created branches15:35
← rgrinberg left15:35
← BrianBlaze left15:36
srinidhi whenever I run "git worktree add fix-something issue-XYZ-fix-something", I get "fatal: invalid reference: issue-XYZ-fix-something"15:36
what am I doing wrong?15:36
when I run "git worktree --guess-remote issue-XYZ-fix-something" it creates a worktree and a branch with a completely different reflog - usually from master15:37
→ BrianBlaze joined15:37
→ gas51627 joined15:44
→ zer0bitz joined15:44
→ rgrinberg joined15:45
← ick left15:45
← Strom left15:47
→ Strom joined15:49
→ Thanatermesis joined15:53
→ lpapp joined15:54
→ k8yun joined15:54
lpapp hi, how can I revert a submodule change from a commit? I do not even know how that got in there to be honest.15:54
the typical git restore -s HEAD~1 ./foo did not work15:54
→ madewokherd joined15:55
→ thebombzen joined15:56
nova → novasenco15:57
← hootch left15:58
← vicfred left15:58
anddam oh Principle of Locality, thy name is git15:59
lpapp: dealing with submodules myself15:59
→ littlebobeep joined16:02
→ Ajax14637 joined16:03
← arch-angel left16:05
← Ajax1463 left16:06
Ajax14637 → Ajax146316:06
← littlebobeep left16:11
→ great_taste joined16:15
→ littlebobeep joined16:15
← tyson2 left16:16
← vicky left16:18
← stats4647 left16:22
← bertvvvs left16:23
→ zeenk joined16:25
← bluesmonk left16:25
← Visne left16:26
→ Visne_ joined16:26
Visne_ → Visne16:27
→ Narrat joined16:32
→ kenanmarasli joined16:32
← drogas left16:36
← dionysus69 left16:38
→ dionysus69 joined16:38
→ duxsco joined16:40
→ Dreadnaught joined16:41
→ ___nick___ joined16:43
← ___nick___ left16:43
← Kulrak left16:44
← roadie left16:44
→ bertvvvs joined16:44
← rfuentess left16:45
→ ___nick___ joined16:45
→ haymawk9 joined16:48
→ roadie joined16:49
← haymawk left16:49
haymawk9 → haymawk16:49
← littlebobeep left16:53
→ CycoCid joined16:56
← Dreadnaught left16:58
→ hxztnxt joined17:00
hxztnxt From git book:17:00
This can often be useful to basically trick Git into thinking that a branch is already merged when doing a merge later on. For example, say you branched off a release branch and have done some work on it that you will want to merge back into your master branch at some point. In the meantime some bugfix on master needs to be backported into your release branch. You can merge the bugfix branch into the release branch and also merge -s17:00
ours the same branch into your master branch (even though the fix is already there) so when you later merge the release branch again, there are no conflicts from the bugfix.17:00
I don't get what conflicts it is refering to17:00
and how that conflict can be avoided by "tricking" git that the bugfix branch has been merged into master17:01
can somebody explain?17:01
→ junktext_ joined17:02
← junktext left17:03
← carl- left17:07
← humanBird left17:10
← BUSY left17:12
← Visne left17:17
← coot left17:18
→ Visne joined17:18
→ tyson2 joined17:20
← emanuele6 left17:23
← great_taste left17:25
→ littlebobeep joined17:26
hxztnxt :(17:31
← funhouse left17:32
← rgrinberg left17:33
chexum_ → chexum17:34
→ hbautista__ joined17:36
→ littlebo1eep joined17:36
← littlebobeep left17:37
← lpapp left17:38
→ BUSY joined17:39
osse hxztnxt: When you merge a branch the changes in that branch since the common ancestor is incorporated, right?17:41
hxztnxt: You can merge the same branch again, and the same will happen. But this time the common ancestor is the commit that was the tip of the branch last time it was merged.17:42
hxztnxt: merge -s records a merge with a commit and such, but discards entirety the changes in the branch that is merged in.17:43
→ Vonter joined17:44
osse hxztnxt: That way, if you merge it again only the changes after that are considered, and the initial commits are "forgotten" so to speak17:44
bertvvvs → MaryJane17:46
← mexen left17:47
→ lpapp joined17:47
lpapp hi, how can I drop submodule changes from my commit and only preserve changes in the tree?17:47
← k8yun left17:47
← jim left17:48
← vdamewood left17:48
← littlebo1eep left17:49
→ jim joined17:51
hxztnxt osse: i see17:53
→ rgrinberg joined17:54
← roadie left17:59
← MajorBiscuit left18:00
← iomari891 left18:01
lpapp osse: do you know how I can revert some accidental change in a commit to a submodule?18:03
← Celelibi left18:03
→ Gustavo6046 joined18:04
osse lpapp: The easiest would be to look at the diff of the commit, find what commit of the submodule it was before, change to that in the submodule and commit the result18:05
lpapp I tried that, but it did not work18:06
I guess I have to do some --work-dir or some hackery18:06
for a nested git repo18:06
otherwise it would say non-existent commit18:06
since, presumably, it looked for that commit in the main repo18:06
osse You can just cd into it18:07
lpapp that is what I did18:07
which did not work ..18:07
think I got it, thanks18:09
← xkuru left18:09
→ Celelibi joined18:11
→ Rashad joined18:12
MaryJane → bertvvvs18:12
→ iomari891 joined18:13
← dionysus69 left18:15
→ dionysus69 joined18:16
→ littlebobeep joined18:16
← zeenk left18:16
← lpapp left18:16
→ xkuru joined18:16
← ano left18:16
← doppo left18:16
→ doppo joined18:19
→ littlebo1eep joined18:22
→ whatsupdoc joined18:23
← littlebobeep left18:26
← dimi1947 left18:29
→ ano joined18:32
← iomari891 left18:36
→ littlebo2eep joined18:37
← littlebo1eep left18:40
← Rashad left18:43
← hans_ left18:45
← hxztnxt left18:49
← tyson2 left18:54
→ littlebo1eep joined18:54
← mannequin left18:55
← littlebo2eep left18:56
← rgrinberg left18:58
→ rgrinberg joined18:59
→ littlebo3eep joined19:00
← littlebo1eep left19:00
srinidhi https://morgan.cugerone.com/blog/workarounds-to-git-worktree-using-bare-repository-and-cannot-fetch-remote-branches/ <- apparently, it is a known limitation19:02
and voila!! I now see all the remote branches!19:04
→ iomari891 joined19:04
→ jazzy joined19:04
← Sasazuka left19:04
← Swahili left19:06
→ Swahili joined19:06
→ wakeup joined19:12
← EvilDMP left19:16
→ Rashad joined19:17
← iomari891 left19:18
→ humanface joined19:21
→ enkeyz joined19:21
→ Sasazuka joined19:21
← Sasazuka left19:22
→ EvilDMP joined19:32
← john_johnk left19:33
→ john_johnk joined19:33
← Murr left19:34
→ Murr joined19:34
← rgrinberg left19:35
→ teut joined19:39
→ _sa0sin_ joined19:39
→ Sasazuka joined19:40
← Rashad left19:41
← sa0 left19:41
← Sasazuka left19:41
→ funhouse joined19:58
→ Sasazuka joined19:59
← Sasazuka left20:00
← feriman left20:01
→ littlebobeep joined20:04
← duxsco left20:04
← ___nick___ left20:04
→ ick joined20:05
→ duxsco joined20:05
← duxsco left20:06
← vitali64 left20:06
→ duxsco joined20:06
← littlebo3eep left20:07
← enkeyz left20:10
→ enkeyz joined20:12
→ Sasazuka joined20:16
← littlebobeep left20:17
← Sasazuka left20:17
← Visne left20:18
→ Visne joined20:18
→ littlebobeep joined20:18
→ stats4647 joined20:20
→ Rashad joined20:20
← stats4647 left20:24
← littlebobeep left20:27
→ rgrinberg joined20:27
← TheCatBehemoth left20:31
→ TheCatBehemoth joined20:31
→ littlebobeep joined20:31
haymawk list customize20:32
sorry, wrong channel :/20:33
→ YuGiOhJCJ joined20:34
← Vonter left20:34
→ Sasazuka joined20:34
← Sasazuka left20:35
→ zebrag joined20:36
← rgrinberg left20:37
j416 but, congratulations20:41
→ coot joined20:44
→ tyson2 joined20:47
← littlebobeep left20:51
→ great_taste joined20:52
← wakeup left20:53
→ odoood joined20:53
→ Sasazuka joined20:54
← Sasazuka left20:55
← odoood left20:55
← bertvvvs left20:55
← anaveragehuman left20:56
novasenco osse: thanks for the help. I actually had to come back to the issue and haven't set up your fancy fancy yet (I will this weekend). I thought a quick update might be nice. I ended up doing :args foo/* (set vim args list to all files in foo/) :tab all (open each arg in new tab) :tabdo Gdiffsplit {sha} (in each tab, open 2-file diff between current file in HEAD and {sha}). It seems to work pretty20:57
well, but it is so unbelievably slow, that I will certainly be investing in your script, so thanks again20:57
→ jimklimov joined20:58
← mthall left20:59
← kenanmarasli left21:00
← t0mm13b_ left21:01
→ t0mm13b joined21:01
← jimklimov1 left21:02
→ littlebobeep joined21:03
← t0mm13b left21:06
← Visne left21:06
→ Visne joined21:07
→ mthall joined21:07
← littlebobeep left21:09
→ t0mm13b joined21:10
← Rashad left21:11
→ Sasazuka joined21:12
novasenco → \e[32mGreen21:12
← srinidhi left21:12
← Sasazuka left21:13
← jimklimov left21:13
← madewokherd left21:17
→ Rashad joined21:18
→ jimklimov joined21:19
← R2robot left21:20
→ anaveragehuman joined21:22
← ick left21:27
→ Guest58 joined21:28
→ Sasazuka joined21:32
Guest58 Good afternoon! I have "worker" instances on AWS, windows unfortunately, that require21:32
me to sysprep a base instance before imaging it. This process removes21:32
saved git credentials. I want to use a scheduled task on startup to21:32
pull a repo to ensure the servers are always using the most current21:32
code without having to reimage them for every change. How can I21:32
store/use credentials, either standard or SSH, neither of which works21:32
now, so they persist?21:32
← Sasazuka left21:33
← Murr left21:33
→ Murr joined21:34
← dionysus69 left21:35
→ dionysus69 joined21:35
← Narrat left21:43
← shokohsc left21:44
→ madewokherd joined21:44
→ Sasazuka joined21:51
← Sasazuka left21:52
→ littlebobeep joined21:55
← otisolsen70 left21:57
← mthall left21:57
→ mthall joined21:58
← littlebobeep left21:58
→ littlebobeep joined22:00
cbreak Guest58: use an ssh private key or similar.22:01
← coot left22:02
← bongobrown left22:02
→ bongobrown joined22:03
→ Jck_true joined22:05
→ Sasazuka joined22:09
→ mehwork joined22:10
← Sasazuka left22:10
→ R2robot joined22:11
→ sa0 joined22:13
← littlebobeep left22:13
Guest58 SSH seems to have the same problem unless I'm doing it wrong.22:14
mehwork what should i do if there's I want to use code from branch "A" in my branch "B" for local testing, but branch "B" cannot be merged first or with my branch?22:15
← _sa0sin_ left22:15
mehwork er branch "A" cannot be merged first or with my branch "B" i meant22:16
→ m_ joined22:19
epicout what do you mean by using branch "a" in branch "b" ?22:19
← mat001 left22:22
mehwork epicout: use the code in branch "a" from branch "b". All i can think is i'd have to create a merge commit from a to b but then i'd have to get rid of the merge before merging b to master22:24
probably need to rebase "a" into and out of "b" ?22:25
← mat001_ left22:25
mehwork to temporarily use A's changes in B22:25
← duxsco left22:25
cbreak Guest58: you'll have to have something to prove to your server that you are in fact the user you claim to be22:25
I recommend you use ssh keys for that.22:25
store them in your system22:26
or on some hardware token like a yubikey22:26
← reset left22:26
→ fulano joined22:27
fulano anyone knows how to list all git repo using public-inbox-httpd?22:28
→ Sasazuka joined22:28
mackerman mehwork: Create branch B2 from B, merge A into B2, test, delete B222:29
← humanface left22:29
← m_ left22:29
← Sasazuka left22:30
mehwork mackerman: that could work, thanks22:30
mackerman Branches are inexpensive in git, that won't take long to do.22:31
← pmcnabb left22:32
← ibra9 left22:32
→ junktext__ joined22:33
→ pmcnabb joined22:33
← igemnace left22:34
← junktext_ left22:35
← dionysus69 left22:35
→ dionysus69 joined22:36
← RAMIII left22:37
Guest58 cbreak I set up SSH but sysprep seems to wipe something. Microsoft says that certs are removed in this process so I suspect that there is some link there.22:38
cbreak so... fix sysprep to not delete your privates? :/22:39
no idea how to do windows things22:39
maybe store it somewhere else22:39
← cliluw left22:39
Guest58 yeah I wish I had another choice, but this application is windows only22:40
fulano nvm22:40
cbreak on unix systems, ssh keys are usually stored in your user's home directory, inside .ssh22:40
Guest58 as it should be22:40
cbreak you can do the same22:40
and if windows deletes your home directory, you might have bigger problems than git22:40
Guest58 it's there, but there is some link in git to find those creds that gets wiped22:41
← fulano left22:41
Guest58 only happens after sysprep. No issues otherwise22:41
→ noperator[m] joined22:44
mackerman I would hope sysprep deletes ssh keys, that's sensitive information22:44
→ littlebobeep joined22:45
cbreak mackerman: so? the point of storing ssh keys is to HAVE that sensitive information22:45
noperator[m] When doing a shallow clone, is the entire history downloaded, or just enough to get a snapshot of the head?22:46
cbreak noperator[m]: the source is supposed to create a pack file only containing the data needed for the shallow part of history you request22:47
I don't know if it's required to send the minimum only or if it can send more22:47
→ Sasazuka joined22:47
← Sasazuka left22:48
noperator[m] Cool, so it's at least possible that it will make an attempt to send less than the entire history22:49
← wdkrnls left22:49
← palasso left22:50
cbreak it should. I read that github complained about that, since it's a lot of work to prepare such pack files22:50
← littlebobeep left22:51
noperator[m] That was my thought too. Probably a lot of extra work for the server22:51
→ humanBird joined22:54
cbreak https://github.com/orgs/Homebrew/discussions/286222:54
← TheCatBehemoth left22:58
cbreak in particular https://github.com/CocoaPods/CocoaPods/issues/4989#issuecomment-193772935 seems interesting22:58
← humanBird left23:00
→ littlebobeep joined23:02
→ kilobyte_ch joined23:03
← dansan left23:05
→ dansan joined23:06
→ Sasazuka joined23:06
← Sasazuka left23:07
← sa0 left23:09
→ sa0 joined23:11
← sa0 left23:16
→ humanBird joined23:18
← tangy left23:20
← thiago left23:21
→ Sasazuka joined23:25
← Sasazuka left23:26
→ feta joined23:27
← EvilDMP left23:28
→ skapata joined23:29
← skapata left23:29
→ skapata joined23:29
→ EvilDMP joined23:29
← littlebobeep left23:32
← teut left23:32
← Guest58 left23:34
→ ccregor joined23:35
← junktext__ left23:38
← onizu left23:40
← gas51627 left23:40
→ rama joined23:42
→ lgc joined23:42
→ Sasazuka joined23:43
← Sasazuka left23:44
← dionysus69 left23:45
→ dionysus69 joined23:45
← lgc left23:45
→ chorduser joined23:55
← Visne left23:55
→ lord| joined23:56
lord| how do you force git to create an incomplete merge even when there aren't any merge conflicts? I want to tack on important changes to a merge but I can't figure out how23:57
→ Visne joined23:57
→ stewie925 joined23:59
← gurkenglas left23:59

Logs Search ←Prev date Next date→ Channels Documentation