IRCloggy #git 2022-07-11

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

← BrianBlaze left00:01
→ BrianBlaze joined00:02
← Soni left00:04
← bob518 left00:09
→ X-Scale` joined00:12
← X-Scale left00:12
X-Scale` → X-Scale00:13
← dnh left00:15
→ hiroot joined00:17
→ gast0n joined00:23
← gurkenglas left00:27
→ ThorMojito joined00:30
← kenanmarasli left00:36
← pretty_dumm_guy left00:38
← jumpcutking left00:43
← LuKaRo left00:50
→ LuKaRo_ joined00:52
→ X-Scale` joined01:09
← X-Scale left01:10
X-Scale` → X-Scale01:10
← ThorMojito left01:12
← bin101 left01:15
→ jaggz joined01:15
→ bin101 joined01:15
jaggz I'm in my branch, kinda far behind master now -- don't want to rebase at the moment01:15
how do I see where my branch was last forked/rebased so I can do a diff to just see my branch's changes?01:16
s#forked/##01:16
→ kaiseisei joined01:24
mackerman jaggz: git diff master...01:30
Three dots in git diff means find a common ancestor, as in git merge-base01:30
→ Soni joined01:32
← keypusher left01:33
jaggz oh wow.. thanks :)01:35
→ ferdna joined01:35
← hiroot left01:37
→ hiroot joined01:38
← dsrt^ left01:55
← maroloccio left01:55
→ maroloccio joined01:56
→ rgrinberg joined01:56
← maroloccio left01:58
→ ThorMojito joined02:01
← umbramalison left02:02
→ umbramalison joined02:03
← lemonsni- left02:03
← konrados left02:05
→ dsrt^ joined02:06
→ opow joined02:07
← opow left02:07
TheDcoder nicolas17: Thank you for helping me out the other day, I was able to read the file content via the blob object :)02:17
nicolas17 oh good :)02:18
→ opow joined02:19
→ lemonsnicks joined02:20
→ Wh0 joined02:24
← opow left02:25
→ opow joined02:25
← jonosterman left02:26
← tyson2 left02:30
→ V__ joined02:31
← vdamewood left02:34
← Wh0 left02:34
→ Wh0 joined02:35
← thiago left02:37
← V__ left02:37
← mw_ left02:41
← terrorjack left02:43
→ terrorjack joined02:44
→ mw_ joined02:45
← FinnElija left02:45
→ finn_elija joined02:45
finn_elija → FinnElija02:45
← nivag left02:48
← opow left02:48
→ thiago joined02:48
← toluene left02:53
→ toluene joined02:54
← ThorMojito left03:01
→ cvmn joined03:03
← Wh0 left03:16
← pulse left03:20
← ferdna left03:27
← nicolas17 left03:29
→ solirc joined03:34
solirc → sol__03:35
← dsrt^ left03:40
→ junebug joined03:41
→ dsrt^ joined03:48
← bloody left03:48
← hbautista left03:48
← germ left03:53
→ germ joined04:00
→ Peng joined04:00
← junebug left04:02
→ junebug joined04:02
← junebug left04:06
← sudoforge left04:07
← magic_ninja left04:07
→ magic_ninja joined04:11
→ junebug joined04:15
← Xenguy left04:18
← magic_ninja left04:22
→ magic_ninja joined04:23
← R2robot left04:25
← magic_ninja left04:33
← toluene left04:33
→ magic_ninja joined04:34
→ toluene joined04:34
← ChmEarl left04:41
→ ChmEarl joined04:41
← dsrt^ left04:47
← rgrinberg left04:50
→ dsrt^ joined04:51
→ madewokherd joined04:55
← madewokherd` left04:57
→ dig_ joined05:04
← bookworm left05:05
← dig_ left05:05
→ bookworm joined05:05
← thiago left05:06
← gast0n left05:06
← pyeverything left05:06
← cvmn left05:08
← dsrt^ left05:11
→ mitrokov joined05:16
← Betal left05:22
← junebug left05:28
→ hqdruxn08_ joined05:39
← hqdruxn08 left05:42
→ mic4ael joined05:43
← V___ left05:48
→ bloody joined05:52
→ arch_angel joined05:52
← lcn left06:00
→ lcn joined06:00
jaggz okay ttyl y'all!06:04
tx06:04
← jaggz left06:04
→ igemnace joined06:06
← Leonarbro left06:08
← Chaser left06:08
← supernovah left06:08
← Anarchic left06:08
← wagle left06:08
← leah2 left06:08
← Visor left06:08
← hinderaker left06:08
← MiguelX413 left06:08
← indy left06:08
← Kobaz left06:08
← tharkun left06:08
← Quack left06:08
← fcser left06:08
← eq_w left06:08
← nickel715 left06:08
← duoi left06:08
← kyshoc left06:08
← HumanG33k left06:08
← d1b_ left06:08
← mahler left06:08
← dmvrtx left06:08
→ GyrosGeier joined06:08
→ Chipzz joined06:08
→ tharkun joined06:08
→ matthewcroughan joined06:08
→ supernovah joined06:08
→ fcser joined06:08
→ bond joined06:08
→ mika joined06:08
→ wagle joined06:08
→ d1b joined06:08
→ duoi joined06:08
→ dmvrtx joined06:08
→ Quack joined06:08
→ kyshoc joined06:08
← d1b left06:08
→ d1b joined06:08
→ Kobaz joined06:08
→ nickel715 joined06:08
→ JumpinBanana joined06:08
→ Anarchic joined06:08
← duoi left06:08
→ duoi joined06:08
→ leah2 joined06:08
→ hinderaker joined06:08
→ eq_w joined06:09
→ flying_sausages joined06:09
← kyshoc left06:09
→ kyshoc joined06:09
→ indy joined06:09
→ Leonarbro joined06:09
← hinderaker left06:09
→ hinderaker joined06:09
→ Thaodan joined06:09
→ haskl joined06:09
→ phryk joined06:09
→ Aleksejs joined06:09
→ Visor joined06:09
→ Chaser joined06:10
→ HumanG33k joined06:10
← flying_sausages left06:10
→ flying_sausages joined06:10
→ Gamah joined06:10
→ hasley joined06:11
← Benett left06:12
← Wolf480pl left06:12
← wyre left06:12
← gajus left06:12
← yourfate left06:12
← wolf left06:12
← scottevtuch[m] left06:12
← eqw left06:12
← alfredb left06:12
← bgs left06:12
← roboirc left06:12
← s1b1 left06:12
← tinybronca[m] left06:12
← DreamweaverN left06:12
← NiKaN left06:12
← circuitbone left06:12
← bluekoopa left06:12
→ alfredb joined06:12
→ ninjin joined06:12
→ wolf joined06:12
→ MrMagic joined06:12
→ Dreamwea- joined06:12
→ GoGi joined06:12
→ robo- joined06:12
→ fury_ joined06:12
→ x88x88x joined06:12
→ alex88 joined06:12
→ rahl joined06:12
← GoGi left06:12
→ GoGi joined06:12
→ ykrons joined06:12
→ avu joined06:12
→ ThiefMasterrr joined06:12
→ Ionic joined06:12
→ bgs joined06:12
→ yourfate joined06:12
→ daurnimator joined06:12
→ NiKaN joined06:12
→ circuitbone joined06:12
→ parsnip0 joined06:12
→ ljharb joined06:12
← avu left06:12
→ avu joined06:12
→ mrtnt joined06:13
← ljharb left06:13
→ ljharb joined06:13
← parsnip0 left06:13
→ parsnip0 joined06:13
→ gajus joined06:13
→ sharpertool joined06:13
→ sa joined06:13
ThiefMasterrr → ThiefMaster06:13
→ n-st joined06:13
→ noord joined06:13
→ Benett joined06:13
→ quesker joined06:13
→ remedan joined06:13
→ tinybronca[m] joined06:13
→ wyre joined06:13
→ Wolf480pl joined06:13
→ ueberall joined06:13
→ jor joined06:13
→ burakcank joined06:13
→ NightMonkey joined06:13
→ R2robot joined06:13
→ hololeap joined06:14
→ rkta joined06:14
→ scottevtuch[m] joined06:15
→ sybariten joined06:17
→ eqw joined06:17
→ s1b1 joined06:18
← toralf left06:19
→ toralf joined06:20
← daurnimator left06:21
→ daurnimator joined06:22
← wyre left06:30
→ wyre joined06:31
→ Rashad joined06:33
← bloody left06:37
→ CM_ joined06:41
→ EvilDMP joined06:45
← jazzy left06:47
← thebombzen left06:50
→ acebrianjuan joined06:50
← great_taste left06:53
← CM_ left06:58
→ thebombzen joined07:02
→ gurkenglas joined07:05
← chiselfuse left07:06
→ chiselfuse joined07:07
← howdoi left07:07
← thebombzen left07:07
→ thebombzen joined07:09
← thebombzen left07:10
→ V___ joined07:12
→ feriman joined07:12
→ mbalmer joined07:18
robo- → roboirc07:19
momomo Is there a way to git checkout a branch and NOT having to commit shit ? like git checkout branch --soft07:21
without having to do 10 commands /07:21
?07:21
→ onizu joined07:22
bookworm yes, stash07:22
momomo awkward07:22
bookworm why?07:22
momomo i have to issue three commands for that ?07:23
git stash .. git checkout ... git unstash07:23
bookworm also git add -u && git commit -m 'wip' isn't exactly 10 steps either07:23
momomo i don't want it in the commit07:23
bookworm what do you want to use checkout for?07:23
momomo just get to another branch and retain my changes in the other branch basically ..07:24
intellij do this by default07:24
bookworm you can happily create a new branch in a dirty repo07:24
the only thing checkout won't let you do is change the worktree, as in switch07:24
momomo git stash .. git checkout .. git unstash is likely the way07:24
bookworm git stash pop*07:25
← Rashad left07:26
momomo I once wrote this :07:26
# This will stash everything, but let the added ones remain07:26
# stash@{1}07:26
git stash --keep-index07:26
but unsure what it means now07:26
comment is not helping me07:26
can you clarify ?07:26
bookworm the manpage can clarify it for you, but essentially it won't mess with the index07:27
checkout won't let you switch then though iirc07:27
ah, it will07:29
→ Rashad joined07:30
→ dionysus69 joined07:30
→ konrados joined07:31
← leah2 left07:32
→ leah2 joined07:32
← Jong left07:33
← Murr left07:34
→ Murr joined07:34
→ osse joined07:36
momomo is there a way to git apply stash and get it to merge automatically ? or merge and accept whatever is in the stash ?07:38
→ pretty_dumm_guy joined07:41
bookworm the merge happens automatically by default, you'll get the usual merge conflicts07:43
→ Jong joined07:44
← skapata left07:44
← gurkenglas left07:45
← konrados left07:48
momomo I don't want to deal with teh merge conflict07:53
The stashed one is teh lastly edited one07:54
If you git stash save "name"07:54
how do you git stash drop "name" ?07:54
bookworm I'm not following... drop removes the stash without applying it, you are aware yes?07:55
stash is really just a quick and dirty "get le to a clean state, I need to work on something else for a moment" command07:56
momomo yes07:56
bookworm if you need to get more fancy, use commits and branches07:56
momomo commits and branches .. not a really productive environment ... should i keep changes of tiny pieces in 20 branches and keep track of them or drag them along with me wherever I go?07:57
bookworm in your case you did work on the wrong parent, so just commit and rebase on the branch you actually want it to be on07:57
momomo I am working on a way to stash checkout and unstash07:57
→ loulou_ joined07:57
← loulou_ left07:57
→ loulou_ joined07:57
bookworm stash pop*07:57
momomo only issue is that if I commit something personal to a branch I do not intend to eventually push those commits too i am also going to have to revert shit07:58
stash pop is only for the last07:58
bookworm reverting won't remove it from the history07:58
momomo you ssee07:58
differnt messssssss07:58
bookworm stash apply* then ;)07:58
in any case, you can use stash but you seem to be fighting git a bit rather than use it for what it's built to do07:59
→ Anticom joined08:04
→ keypusher joined08:06
→ jmabr joined08:10
← duoi left08:12
momomo it is the hell and curse of branch based development08:13
utter crap08:13
→ austin987 joined08:15
momomo I can apperantly do this after:08:15
git checkout --theirs lite-recs-page-provider-user.conf08:15
However, I would like to have been able to supply that to stash pop08:15
→ wakeup joined08:15
momomo seems there is possibly this:08:16
git checkout --theirs .08:16
← wakeup left08:17
momomo is thee are way to git stash and not loose the stuff tha was stashed? like git stash retain08:17
← daurnimator left08:18
momomo i can do git stash and then git apply stash@{0} ... but that is tgwo commands08:18
bookworm why are you stashing things you still want to keep? That's not what stash is for08:19
← hoochmonger left08:24
← kevr left08:26
← fling left08:26
→ kevr joined08:26
→ Ajax1469 joined08:26
→ fling joined08:27
Nei commit it to a branch instead08:27
← Ajax146 left08:28
Ajax1469 → Ajax14608:28
→ daurnimator joined08:35
→ coot joined08:35
→ mncheck joined08:45
← daurnimator left08:46
→ daurnimator joined08:47
→ jim87 joined08:49
→ drogas joined08:56
→ jim87_ joined08:58
→ ThorMojito joined08:59
← jim87 left09:01
→ Seng joined09:08
→ MajorBiscuit joined09:16
← Jong left09:16
→ kenanmarasli joined09:18
← hiroot left09:20
→ hiroot joined09:20
→ thebombzen joined09:21
← ackyshake left09:27
← V___ left09:33
→ zeev joined09:43
← moldorcoder7_ left09:43
zeev Hi, deleting submodule deletes it in the whole git repository or is it possible to delete it only in specific branches and leave in others?09:44
← ThorMojito left09:49
← zeev left10:03
→ Murr- joined10:03
← Murr left10:05
Murr- → Murr10:05
← pretty_dumm_guy left10:07
→ pretty_dumm_guy joined10:08
← dionysus69 left10:08
→ dnh joined10:09
→ dionysus69 joined10:21
→ Liblx joined10:22
→ mncheckm joined10:23
← arch_angel left10:26
→ zeev joined10:34
zeev Hi, deleting submodule deletes it in the whole git repository or is it possible to delete it only in specific branches and leave in others?10:35
ikke zeev: it would delete it in the branch you are on, but if you merge that branch into others, it will apply to that branch as well10:35
→ john_johnk joined10:35
bremner I don't use submodules if I can help it, but I think all submodule changes are branch local10:36
(other than e.g. fetching the repo into remote branches)10:36
← vishal left10:36
→ vishal joined10:39
← dnh left10:39
← mncheckm left10:39
zeev thank you!10:40
→ enoq joined10:40
→ ThorMojito joined10:40
← ThorMojito left10:40
← kaiseisei left10:42
→ csm3105 joined10:51
← csm3105 left10:52
→ csm3105 joined10:59
→ cdown_ joined11:00
→ zulutango joined11:02
← feriman left11:02
← cdown left11:03
cdown_ → cdown11:03
→ dnh joined11:05
← mitrokov left11:07
← john_johnk left11:09
← donsequitur left11:09
→ srinidhi joined11:12
← zeev left11:14
← loulou_ left11:17
→ gildasio joined11:20
→ roadie joined11:34
← Anarchic left11:34
→ Anarchic joined11:35
← coot left12:00
→ john_johnk joined12:01
→ Ajax1464 joined12:04
← Ajax146 left12:06
Ajax1464 → Ajax14612:06
← fling left12:08
→ fling joined12:09
→ Murr- joined12:13
→ lejocelyn joined12:13
→ dsrt^ joined12:13
← Murr left12:15
Murr- → Murr12:15
← fling left12:16
→ fling joined12:16
← defjam left12:18
← csm3105 left12:20
→ csm3105 joined12:20
→ defjam joined12:24
← mingdao left12:30
→ bloody joined12:31
→ opow joined12:34
← MajorBiscuit left12:34
← dsrt^ left12:35
→ mingdao joined12:37
→ MajorBiscuit joined12:38
→ coot joined12:41
→ arch_angel joined12:42
→ pulse joined12:46
← foul_owl left12:46
← kevr left12:49
→ kevr joined12:49
→ squirrel joined12:50
→ gh34 joined12:54
→ dsrt^ joined12:58
← mingdao left12:58
→ foul_owl joined13:01
← Anticom left13:01
→ mingdao joined13:02
→ G30RD13 joined13:05
← opow left13:07
→ opow joined13:14
relipse I don't understand why I'm getting a merge conflict13:16
i rebased and pushed13:16
but same thing13:16
i even forced pushed on myremote/develop branch13:16
squirrel suppose i made a PR on GitHub but it took me a long time and the main branch progressed a bit. the PR can't be automatically merged. now i could rebase but this would mean that some of my commits may become broken, and i don't want to test and review them. and the maintainers don't want to do the work of merging. are there any options besides my merging main into feature?13:16
← csm3105 left13:19
selckin combine all your commits into 113:19
sebag does someone know what are the refs/pull/334/merge heads, compared to refs/pull/334/head??13:20
→ tuskkk____ joined13:21
squirrel i have very nice commits, i'm absolutely not squashing them13:21
selckin they are worthless if you don't want to fix them up13:23
sebag squirrel: couldn't you rebase main into feature?13:23
squirrel i could merge main into feature, but i'm not sure what “rebase main into feature” means13:24
selckin: they ain't broken, they simply can't be automatically merged13:25
→ tyson2 joined13:25
← G30RD13 left13:26
selckin squirrel: then you have all the options13:26
← igemnace left13:26
squirrel such as..?13:26
sebag squirrel: you'd make the branch up to date like if fast-forward and commit your new commits last13:27
selckin squirrel: you listed all the options pick one13:27
squirrel sebag: sorry i'm not sure what that means13:28
selckin: i only listed one option and my question was if there are any other options, but yeah, i can pick one of one13:29
selckin squirrel: you listed 213:29
squirrel i don't think i did?13:29
→ Tobbi_1 joined13:30
selckin you can merge or rebase it, upstream deosn't want to merge, so you can do it or rebase, or get squash13:30
← Tobbi_ left13:31
Tobbi_1 → Tobbi_13:31
← opow left13:31
← Murr left13:34
→ Murr joined13:34
squirrel i wonder if this would work.. 1) merge main into feature 2) merge feature into main 3) squash the last two merges into one13:35
selckin 1 and 2 are the same thing13:36
if you do 1 then 2 can be just fast-forward without a commit, it'll be a merge if you ask for it, or if they have been toher commits on main since 113:39
hasley → mahler13:43
→ hamburgler joined13:46
→ derpydoo joined13:46
squirrel ah of course it can be just fast-forwarded! i suppose i'll get “merge main into feature” on main. but yeah it's the same thing. thanks! not sure why i didn't think it could be simply fast-forwarded13:51
→ vdamewood joined13:53
→ ThorMojito joined13:53
→ donsequitur joined13:54
→ hstct joined13:58
→ opow joined13:58
→ vinleod joined13:58
← vdamewood left14:02
→ skapata joined14:02
← skapata left14:02
→ skapata joined14:02
← Saloframes left14:02
foo I want to remove two feature branches from a dev branch. Is there a way to do this *without* a rebase? eg. I don't want to mess with commit IDs.14:03
Rewriting history is ok14:03
→ tas-sos joined14:03
→ theoceaniscool joined14:03
→ Saloframes joined14:04
→ AnrDaemon joined14:04
selckin !revert_merge14:05
gitinfo [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you can use 'git revert' but there are gotchas to be aware of. Please read: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt14:05
← gildasio left14:06
selckin why no rebase if rewriting is ok14:07
foo selckin: if I'm understanding stuff here (and I may not be), a rebase would rewrite git commit IDs. Rewriting won't?14:07
selckin rewriting history means changing commits ids14:08
foo selckin: ahhh, ok14:08
selckin: so it sounds like there is not a way to undo a merge of 2 branches into our dev without rewriting the commit IDs, if I'm following?14:09
→ gildasio joined14:09
selckin well you can only add more commits that undo the changes from those branches, everything else is rewriting14:09
foo selckin: Can I do a reverse git cherry-pick?14:10
🤣14:10
... with a branch14:10
selckin so it is ok to rewrite or not14:10
← dionysus69 left14:11
foo selckin: my concern: we have commit IDs tied to our notes on various tasks... if we rewrite those, we lose that. We can just manually remove the code, not too big of a deal but I was curious how git could help here14:11
vinleod → vdamewood14:11
← dsrt^ left14:12
← roadie left14:12
→ moldorcoder7 joined14:12
← bindu left14:13
→ bindu joined14:13
sebag does someone know what are the refs/pull/334/merge heads, compared to refs/pull/334/head?? on github?14:14
→ junebug joined14:15
selckin sebag: https://stackoverflow.com/a/63595981/18202514:16
→ celewin joined14:16
→ dsrt^ joined14:18
← lejocelyn left14:22
← gildasio left14:24
→ gildasio joined14:26
→ carl--- joined14:27
→ rgrinberg joined14:28
← s1b1 left14:29
→ s1b1 joined14:33
← carl--- left14:35
→ thiago joined14:35
→ roadie joined14:38
→ unluckyshrubbery joined14:39
← dsrt^ left14:40
→ Jong joined14:40
← thiago left14:42
← roadie left14:43
← skapata left14:43
→ donsequitur_ joined14:43
→ dsrt^ joined14:45
→ thiago joined14:45
← donsequitur left14:46
donsequitur_ → donsequitur14:47
← dsrt^ left14:47
→ madewokherd` joined14:48
← Rashad left14:50
← madewokherd left14:51
← unluckyshrubbery left14:52
→ unluckyshrubbery joined14:52
← unluckyshrubbery left14:53
→ unluckyshrubbery joined14:54
← unluckyshrubbery left14:54
→ unluckyshrubbery joined14:54
→ Rashad joined14:56
→ rsx joined14:58
← opow left14:58
→ loulou_ joined14:58
← loulou_ left14:58
→ loulou_ joined14:58
→ jazzy joined14:59
← rgrinberg left15:02
← jiffe1 left15:03
→ howdoi joined15:03
→ szkl joined15:06
→ terminalpusher joined15:08
→ roadie joined15:08
→ jiffe1 joined15:09
AnrDaemon Evening. I'm hosting my git repos over SSH, with some helper scripts to reduce the need to login to the server "in person". However, there's these rare times I need to login using sftp. Righ tnow I'm doing it using subsystem internal-sftp, but it's rather indiscriminate in whom it lets to login.15:10
Is there a better solution?15:10
Like, allow only one pubkey to access sftp under git user. Tried google but did not find much relevant information.15:12
← terminalpusher left15:13
→ terminalpusher joined15:13
← ThorMojito left15:15
← theoceaniscool left15:19
→ ThorMojito joined15:20
← roadie left15:22
rewt AnrDaemon, using ssh to clone/etc git repos doesn't require anyone to login to the server -- it's usually done by having a single "git" user, with no login shell, and people who need access having their public keys added to that user15:25
AnrDaemon Great. Now, create a new repo that way.15:26
→ rgrinberg joined15:26
rewt you can also move the repo if you want to keep it15:26
AnrDaemon Or change repo description.15:26
rewt or if you mean local repos, the remote url can be updated15:26
AnrDaemon I mean repositories on the server. Of course.15:27
← tyson2 left15:29
← tuskkk____ left15:30
← jiffe1 left15:32
← terminalpusher left15:32
→ jiffe1 joined15:35
→ greatgold joined15:37
← jinsl left15:38
← greatgold left15:38
→ jinsl joined15:39
→ gurkenglas joined15:44
→ madewokherd joined15:44
→ odoood joined15:45
← hiroot left15:45
← madewokherd` left15:46
→ roadie joined15:48
← madewokherd left15:49
→ orbyt joined15:50
← ThorMojito left15:53
→ ThorMojito joined15:54
← clime left15:57
bambams I'm on Windows 10 running Git for Windows. git ls-files -v outputs only H in the first column. But my modified file appears unchanged, and git update-index --no-assume-unchanged <file> fixes the index so that Git now sees changes.15:57
→ sudoforge joined15:58
→ pyeveryt_ joined15:59
bambams I have this problem periodically. I wonder if it's related to having conflicting case paths in the repo still (thanks to Windows' case insensitive file system). Albeit, a one-liner proves the 6 remaining duplicates are in a totally different directory.16:00
git version 2.37.0.windows.116:01
AnrDaemon bambams: If you have more than one partition on your system, and you could move your work to a separate partition, you CAN make it case-sensitive. But you would regret it.16:02
Not every Windows tool is prepared for case sensitivity. Even core ones.16:02
But you do have this possbility.16:03
→ duoi joined16:04
→ a1eaiactaest joined16:04
bambams AnrDaemon: Thanks. My understanding is that Windows also supports it (partially) through a hidden registry setting, but I think it's "use at own risk" and as you say may lead to other problems.16:09
AnrDaemon No.16:09
It supports it fully through volume attributes.16:09
As in, it IS case-preserving AND can be used as case-sensitive. By default it does not, but that's only the default.16:10
(Also, you can not change case matching or short name generation flags on system partition.)16:11
← john_johnk left16:12
← axisys left16:15
← coot left16:16
bambams Thanks. In any case, since the affected path isn't duplicated I wonder if that is even related or just misleading.16:17
→ bob518 joined16:18
← enoq left16:21
→ The_Blode joined16:22
← The_Blode left16:22
→ The_Blode joined16:22
← mw_ left16:23
← The_Blode left16:24
→ The_Blode joined16:24
← bob518 left16:25
← rsx left16:29
→ gast0n joined16:35
→ mw_ joined16:37
← Rashad left16:46
→ AnXa joined16:47
→ revoltingPeasant joined16:48
revoltingPeasant Is there some way to just auto-resolve all conflicts by auto accepting all the new changes without having to manuall go through each one.16:49
← jole left16:49
→ jole joined16:49
bookworm yes, choose the theirs merge strategy16:51
← rwp left16:51
revoltingPeasant Thanks bookworm.16:53
→ tyson2 joined16:56
→ hamburgler2 joined16:56
← revoltingPeasant left16:58
→ dionysus69 joined16:59
← hamburgler left16:59
sangy → usapolitics16:59
usapolitics → sangy17:00
← MajorBiscuit left17:05
→ john_johnk joined17:06
← Jong left17:08
← ThorMojito left17:14
→ Wh0 joined17:16
→ ThorMojito joined17:17
→ Sasazuka joined17:20
→ Sasazuka__ joined17:22
← malteger left17:22
← Sasazuka left17:24
→ malteger joined17:26
← john_johnk left17:26
→ nicolas17 joined17:27
← ThorMojito left17:33
← Murr left17:33
→ ThorMojito joined17:34
→ Murr joined17:34
← dnh left17:34
← m1dnight left17:35
← thiago left17:36
→ thiago joined17:36
← berkay left17:37
→ m1dnight joined17:37
← ThorMojito left17:37
← Wh0 left17:38
→ berkay joined17:38
→ enoq joined17:41
→ Wh0 joined17:41
← mns_ left17:41
→ great_taste joined17:41
→ mns joined17:41
→ lejocelyn joined17:42
→ coot joined17:44
← subopt left17:50
← sol__ left17:52
→ rwp joined17:57
→ madewokherd joined17:58
Arsen hey, can fetch deepen until it encounters a commit? (specifically, knowing a merge commit, I'd like to fetch all the commit the merge includes, so I'd need to deepen until I find the first parent)17:59
← tyson2 left17:59
ikke When I looked for something like that earlier, I could not find anything that does that18:00
I ended up using enough depth to cover 99.9% of the cases18:00
Arsen our history is small enough for a deep fetch to not be too bad for now, so it might be worth implementing18:01
← coot left18:01
← orbyt left18:03
nicolas17 Arsen: you're using shallow clone, with --depth?18:03
Arsen nicolas17: starting with shallow, I want to deepen18:03
nicolas17 maybe the newer "partial clone" feature would work better for you, it gets *all* commits but without the blobs, then downloads blobs on demand18:04
"git clone --filter=blob:none $url"18:05
cbreak shallow clones are very expensive on the server, why not just clone all history?18:05
unless your project is somehow screwed up in a serious way, that shoulnd't be much more expensive18:06
Arsen cbreak: not sure why gh makes that their default18:06
in actions18:06
cbreak gh doesn't like shallow clones18:06
→ typicat joined18:06
ikke Because people want fast clones (ci jobs)18:06
cbreak I think they complained to brew and others about it18:06
ikke Some projects were really abusing it though18:06
using gh as a package repository18:07
cbreak ... like brew :D18:07
ikke They fixed the issue causing the high load18:07
cbreak by not using shallow repos18:07
last time I tried to use homebrew, it complained to me about having to make everything no longer shallow18:08
ikke heh18:08
→ ThorMojito joined18:08
← ThorMojito left18:08
→ orbyt joined18:08
nicolas17 abuses everywhere...18:08
I was dealing with someone abusing CI jobs as a dev environment18:08
Arsen why is shallow cloning expensive?18:08
→ Betal joined18:09
Arsen nicolas17: repeated retriggering or?18:09
nicolas17 Arsen: launching a reverse shell as the CI script, then using it interactively18:09
cbreak shallow clones require work from the server for creating a sutiable delta pack file for which ever things you're missing on the client18:09
Arsen ah, so even worse18:09
ikke nicolas17: heh, ran into that one as well (ci as dev)18:10
nicolas17 even calls it "Get a Ubuntu SSH Virtual Machine for free ;)" on his readme18:10
he has scripts to abuse github actions, gitlab ci, and circleci for the same purpose18:11
Arsen ikke: btw, --shallow-exclude might cover deepening until a commit18:11
not sure how bad that is18:11
ikke https://github.blog/2020-12-22-git-clone-a-data-driven-study-on-cloning-behaviors/18:11
Arsen ah, sounds like a good read18:12
will give it a look18:12
ikke https://github.com/Homebrew/discussions/discussions/22518:14
mentions brew18:14
→ Rashad joined18:16
ikke I think it was Cacoapods that originally caused issues for github18:18
Arsen yeah, https://github.com/CocoaPods/CocoaPods/issues/4989#issuecomment-19377293518:18
ikke right, thanks, that's what I was looking for18:19
← gurkenglas left18:20
→ Guest43 joined18:21
← Guest43 left18:21
→ dnh joined18:22
→ zeyu joined18:22
→ mitrokov joined18:26
Andrew → HaxCPU18:28
← mitrokov left18:30
→ gurkenglas joined18:33
← great_taste left18:33
→ great_taste joined18:33
← dionysus69 left18:34
← gh34 left18:35
nicolas17 Arsen: yikes :P18:36
Arsen yep...18:36
→ lejocelyn_ joined18:37
← lejocelyn_ left18:38
← lejocelyn left18:39
→ ThorMojito joined18:40
← ThorMojito left18:40
→ coot joined18:43
→ ThorMojito joined18:44
← Liblx left18:49
← Rashad left18:58
← orbyt left18:59
← Betal left19:03
← mfiano left19:03
→ mfiano joined19:04
bambams Odd... My vimdiff mergetool is broken..19:05
Paths with spaces don't get passed correctly and so it is opening the wrong buffers..19:06
→ Rashad joined19:08
→ mitrokov joined19:11
→ NeoCron joined19:11
→ forgotmynick joined19:12
bambams I don't think my config should have changed on this.. :\ I'm not even sure that I overrode any defaults... Is it possible a recent update could have broken this? :\ Or any ideas on what I should check?19:14
← mexen left19:15
← junebug left19:17
bambams Hmm, downgrading to git version 2.36.1.windows.1 did indeed fix it..19:17
→ tyson2 joined19:20
← Rashad left19:22
→ orbyt joined19:23
→ Betal joined19:24
← roadie left19:26
→ Rashad joined19:27
← enoq left19:33
← Murr left19:33
→ Murr joined19:34
→ roadie joined19:37
→ feriman joined19:41
← mbalmer left19:43
→ m0viefreak joined19:46
← johnjaye left19:51
→ vikonen joined19:51
→ johnjaye joined19:52
← ThorMojito left19:56
→ ThorMojito joined19:57
← jim87_ left19:57
← mitrokov left19:59
← Rashad left20:03
→ k1773 joined20:04
→ LuxuryMode joined20:05
← a1eaiactaest left20:13
← coot left20:17
← Wh0 left20:17
→ mitrokov joined20:20
← johnjaye left20:20
→ SunClonus joined20:22
→ Rashad joined20:22
→ awmv joined20:23
← gildasio left20:23
awmv I think I rename my local master branch to something else and then I renamed the branch on Gihub as well because that change wasn't reflected. Then I created a new branch master on Github that is empty. My idea was to use an orphan branch called master. I wanted to merge my old master branch into the new master branch to have file changes for a PR20:25
I'm trying to undo everythign now20:25
I think there is still some fragment left20:25
→ ackyshake joined20:26
← ThorMojito left20:27
← roadie left20:27
→ k1773_ joined20:29
→ gildasio joined20:29
← k1773 left20:31
→ junebug joined20:35
← SunClonus left20:37
→ bn_work joined20:37
→ ThorMojito joined20:42
→ theoceaniscool joined20:43
← yuljk left20:43
→ yuljk joined20:44
← typicat left20:44
→ rapmoc joined20:49
k1773_ → k177320:51
← thebombzen left20:53
← mitrokov left20:53
← nicolas17 left20:54
→ causasui joined20:59
← squirrel left21:00
→ Deep3D joined21:03
→ YuGiOhJCJ joined21:04
← ueberall left21:12
← srinidhi left21:13
→ ueberall joined21:16
→ wootehfoot joined21:20
→ DavidTucker[m] joined21:23
DavidTucker[m] I got kicked for idling?21:23
DavidTucker[m] sent a code block: https://libera.ems.host/_matrix/media/r0/download/libera.chat/807773f7acff382d11c660f70c7e3cf2dea47e3521:24
ajak libera saw that as a quit with a quit message of (Quit: You have been kicked for being idle)21:25
rewt probably matrix shenanigans21:26
ajak yep21:26
DavidTucker[m] weird 🤔 ya, I'm on the Matrix bridge21:26
← Visor left21:27
← onizu left21:28
rewt DavidTucker[m], there's an option --no-track for "Do not set up "upstream" configuration, even if the branch.autoSetupMerge configuration variable is true." -- is that config true for you?21:28
DavidTucker[m] Doesn't look like it (`git config --get branch.autoSetupMerge` doesn't return anything)21:32
`--no-track` works nicely :)21:33
→ Visor joined21:33
→ hbautista joined21:36
← dnh left21:37
→ dnh joined21:37
← YuGiOhJCJ left21:38
→ thebombzen joined21:38
← feriman left21:39
← rgrinberg left21:39
← madewokherd left21:41
← dnh left21:42
← hstct left21:42
← loulou_ left21:45
← orbyt left21:48
← k1773 left21:52
← wootehfoot left21:54
← The_Blode left21:58
→ nate4 joined21:59
← Rashad left21:59
← jmabr left22:01
← nate4 left22:04
← EvilDMP left22:07
→ Rashad joined22:09
→ dsrt joined22:11
← Rashad left22:11
← LuxuryMode left22:14
→ madewokherd joined22:14
← AnXa left22:19
→ AnXa joined22:21
→ karabaja4 joined22:31
← shokohsc left22:35
→ shokohsc joined22:37
← shokohsc left22:37
← NeoCron left22:37
→ shokohsc joined22:38
← shokohsc left22:38
← junebug left22:39
→ shokohsc joined22:41
→ stewie925 joined22:41
← tejr left22:42
→ krushia joined22:45
← awmv left22:45
→ tejr joined22:47
→ hoochmonger joined22:47
← dsrt left22:48
← thebombzen left22:49
← ThorMojito left22:52
← phundrak left22:54
→ ferdna joined22:54
← Saloframes left23:00
→ Saloframes joined23:00
← kenanmarasli left23:02
→ phundrak joined23:05
← acebrianjuan left23:05
← causasui left23:09
→ rgrinberg joined23:33
← Murr left23:33
→ junebug joined23:33
→ Murr joined23:33
← Lord_of_Life left23:36
→ Lord_of_Life joined23:37
→ YuGiOhJCJ joined23:40
← YuGiOhJCJ left23:41
→ YuGiOhJCJ joined23:41
← rgrinberg left23:43
→ thebombzen joined23:51
→ hiroot joined23:56

Logs Search ←Prev date Next date→ Channels Documentation