| 2021-08-10 |
| → planetcall joined | 00:00 |
| ← planetcalls|work left | 00:04 |
| → kingjulian joined | 00:11 |
| ← zebrag left | 00:18 |
| → christall joined | 00:25 |
| ← christall left | 00:31 |
| → adlternative joined | 00:33 |
| ← clime left | 00:33 |
| ← shokohsc left | 00:34 |
| → shokohsc joined | 00:35 |
| ← kingjulian left | 00:35 |
| → Xenguy joined | 00:42 |
| ← nyah left | 00:45 |
| → nyah joined | 00:47 |
| → ninjin joined | 00:52 |
| → BlessJah joined | 00:55 |
| → roadie joined | 01:01 |
| ← roadie left | 01:06 |
| ← jwillikers left | 01:10 |
| ← blahboybaz left | 01:10 |
| ← gast0n left | 01:12 |
| → gast0n joined | 01:12 |
| → fjmorazan joined | 01:15 |
| ← natechan left | 01:19 |
| → natechan joined | 01:19 |
| → pcarphin joined | 01:19 |
| → planetcalls|work joined | 01:20 |
| → elichai2_ joined | 01:20 |
| → cespare_ joined | 01:21 |
| → jrm2 joined | 01:21 |
| → ketas- joined | 01:21 |
| → milosz_ joined | 01:21 |
| → Xenguy_ joined | 01:21 |
| → Drool joined | 01:22 |
| ← cespare_ left | 01:22 |
| → dittid[m] joined | 01:22 |
| → ludovicchabant_ joined | 01:22 |
| ← Xenguy left | 01:22 |
| → howdoi_ joined | 01:22 |
| Xenguy_ → Xenguy | 01:22 |
| → Milos_ joined | 01:22 |
| → cespare_ joined | 01:22 |
| → mjorgensen_ joined | 01:22 |
| → pizdets_ joined | 01:22 |
| → Misotauros joined | 01:23 |
| → average_ joined | 01:23 |
| → cyberpear_ joined | 01:23 |
| → kurtthem1ker joined | 01:23 |
| → irrgit_ joined | 01:23 |
| → fjmorazan_ joined | 01:23 |
| → t3nj1n_ joined | 01:23 |
| → hgl- joined | 01:24 |
| → debsan joined | 01:24 |
| → charly_ joined | 01:24 |
| → fflam_ joined | 01:25 |
| ← ackyshake left | 01:25 |
| ← pcarphin1 left | 01:25 |
| ← planetcall left | 01:25 |
| ← elichai2 left | 01:25 |
| ← ketas left | 01:25 |
| ← ludovicchabant left | 01:25 |
| ← jrm left | 01:25 |
| ← cespare left | 01:25 |
| ← Droolio left | 01:25 |
| ← mjorgensen left | 01:25 |
| ← average left | 01:25 |
| ← pizdets left | 01:25 |
| ← Lord_of_Life left | 01:25 |
| ← hgl left | 01:25 |
| ← Milos left | 01:25 |
| ← Misanthropos left | 01:25 |
| ← bn_work left | 01:25 |
| ← cyberpear left | 01:25 |
| ← howdoi left | 01:25 |
| ← fjmorazan left | 01:25 |
| ← kurtthemaker left | 01:25 |
| ← t3nj1n left | 01:25 |
| ← paruh left | 01:25 |
| ← irrgit left | 01:25 |
| ← HumanG33k left | 01:25 |
| ← cambrian_invader left | 01:25 |
| ← pretty_dumm_guy left | 01:25 |
| ← BUSY left | 01:25 |
| ← milosz left | 01:25 |
| ← fflam left | 01:25 |
| ← charly left | 01:25 |
| elichai2_ → elichai2 | 01:25 |
| jrm2 → jrm | 01:25 |
| ludovicchabant_ → ludovicchabant | 01:25 |
| howdoi_ → howdoi | 01:25 |
| average_ → average | 01:25 |
| ← Jonno_FTW left | 01:25 |
| cyberpear_ → cyberpear | 01:25 |
| → Jonno_FTW joined | 01:25 |
| → Lord_of_Life joined | 01:25 |
| → BUSY joined | 01:25 |
| → pretty_dumm_guy joined | 01:25 |
| → bn_work joined | 01:25 |
| → cambrian_invader joined | 01:25 |
| → ackyshake joined | 01:26 |
| → paruh joined | 01:26 |
| → human_g33k joined | 01:27 |
| → eternalromance joined | 01:28 |
| ← Strom left | 01:34 |
| → Strom joined | 01:36 |
| → odoood joined | 01:37 |
| ← pretty_dumm_guy left | 01:46 |
| ← howdoi left | 01:50 |
| → gnoo joined | 01:54 |
| → jazzy joined | 02:00 |
| Milos_ → Milos | 02:09 |
| → hbautista joined | 02:15 |
| ← rewrit3 left | 02:17 |
| → rewrit3 joined | 02:20 |
| → Izem joined | 02:24 |
| ← vysn left | 02:25 |
| → christall joined | 02:28 |
| → zumba_addict joined | 02:28 |
| → finn_elija joined | 02:28 |
| ← FinnElija left | 02:28 |
| finn_elija → FinnElija | 02:28 |
| → vdamewood joined | 02:29 |
| → bambanxx joined | 02:31 |
| ← AnAverageHuman left | 02:36 |
| → vinleod joined | 02:37 |
| ← christall left | 02:37 |
| ← vdamewood left | 02:40 |
| → durham joined | 02:42 |
| → AnAverageHuman joined | 02:42 |
| → paddymahoney joined | 02:45 |
| ← durham left | 02:46 |
| ← eternalromance left | 02:51 |
| → arxanas joined | 02:52 |
| ← arxanas left | 02:52 |
| → arxanas joined | 02:53 |
| ← arxanas left | 02:53 |
| → ash_worksi joined | 02:55 |
| → beencubed joined | 02:57 |
| ← Izem left | 03:00 |
| → roadie joined | 03:02 |
| ← roadie left | 03:07 |
| ← Crispy left | 03:07 |
| → Crispy joined | 03:08 |
| vinleod → vdamewood | 03:08 |
| → roadie joined | 03:09 |
| ← pulse left | 03:10 |
| → Bombe joined | 03:23 |
| → planetcall joined | 03:25 |
| ← planetcalls|work left | 03:29 |
| → durham joined | 03:33 |
| ← cespare_ left | 03:36 |
| → cespare joined | 03:36 |
| ← durham left | 03:37 |
| → clime joined | 03:45 |
| ← odoood left | 03:53 |
| fjmorazan_ → fjmorazan | 03:59 |
| ← Hax0r left | 04:02 |
| ← fling left | 04:03 |
| → ferdna joined | 04:06 |
| ← igemnace left | 04:07 |
| ← bambanxx left | 04:08 |
| → bambanxx joined | 04:09 |
| ← bn_work left | 04:09 |
| ← hbautista left | 04:12 |
| → hbautista joined | 04:12 |
| ← zumba_addict left | 04:12 |
| → durham joined | 04:16 |
| → odoood joined | 04:20 |
| ← durham left | 04:21 |
| ← roadie left | 04:22 |
| → planetcalls|work joined | 04:25 |
| ← planetcall left | 04:29 |
| → igemnace joined | 04:31 |
| → mci64 joined | 04:31 |
| → chovy joined | 04:32 |
| ← mci64 left | 04:32 |
|
chovy
| i need help | 04:32 |
|
| my tech lead merged my PR and then reverted it. now all the code is issing ont he branch | 04:32 |
|
| missing* | 04:32 |
|
| how do i get it back? | 04:32 |
| ← odoood left | 04:33 |
|
ikke
| What do you mean with source missing on the branch? | 04:33 |
|
| Merging a branch and reverting it does not affect the branch at all, at most, it affects the branch that it was being merged | 04:34 |
|
| If you try to create another PR from the same branch, than it's correct that you do not see any new changes | 04:34 |
|
| What you can do is rebase your branch on the latest version of the target branch | 04:35 |
| → YuGiOhJCJ joined | 04:40 |
| → christall joined | 04:41 |
| → ByteHackr joined | 04:44 |
| ← christall left | 04:46 |
| ← lightstalker left | 04:47 |
| → bam32_ joined | 04:47 |
| → roadie joined | 04:48 |
| → mci64 joined | 04:49 |
| → blahboybaz joined | 04:50 |
| ← bam32 left | 04:50 |
| ← roadie left | 04:54 |
| ← shokohsc left | 05:00 |
| → shokohsc joined | 05:01 |
| ← debsan left | 05:01 |
| → roadie joined | 05:02 |
| ← vishal left | 05:05 |
| → vishal joined | 05:07 |
| ← mci64 left | 05:08 |
| ← bambanxx left | 05:08 |
| → mci64 joined | 05:10 |
| ← adlternative left | 05:17 |
| → Shentino joined | 05:17 |
| → adlternative joined | 05:17 |
| → planetcall joined | 05:25 |
| ← AnAverageHuman left | 05:25 |
| ← planetcalls|work left | 05:29 |
| ← Xaldafax left | 05:37 |
| → FH_thecat joined | 05:47 |
| ← roadie left | 05:48 |
| ← blahboybaz left | 05:50 |
| ← ferdna left | 05:56 |
| ← ByteHackr left | 06:01 |
| → ByteHackr joined | 06:03 |
| ← snappy left | 06:04 |
| → snappy joined | 06:04 |
| ← Shentino left | 06:05 |
| ← hbautista left | 06:11 |
| ← gast0n left | 06:13 |
| → planetcalls|work joined | 06:25 |
| ← ham left | 06:28 |
| → Lord_of_Life_ joined | 06:28 |
| ← planetcall left | 06:29 |
| ← Lord_of_Life left | 06:29 |
| Lord_of_Life_ → Lord_of_Life | 06:31 |
| ← zmt00 left | 06:31 |
| → EvilDMP joined | 06:34 |
| ← thiago left | 06:36 |
| → ham joined | 06:36 |
| → SirRippovMaple joined | 06:39 |
| → rfuentess joined | 06:56 |
| → tirnanog joined | 06:58 |
| ← bam32_ left | 07:00 |
| ← velo left | 07:02 |
| → velo joined | 07:04 |
| ← unluckyshrubbery left | 07:04 |
| → palasso joined | 07:11 |
| → OnkelTem joined | 07:15 |
| ← AbleBacon left | 07:15 |
| → kaisyu joined | 07:18 |
| → randomuser joined | 07:20 |
| → planetcall joined | 07:25 |
| → xx joined | 07:27 |
| → vysn joined | 07:28 |
| ← planetcalls|work left | 07:30 |
| → christall joined | 07:30 |
| → ham2 joined | 07:31 |
| → lgc joined | 07:31 |
| ← ham left | 07:32 |
| ← caveman left | 07:32 |
| → caveman joined | 07:32 |
| ← christall left | 07:35 |
| → christall joined | 07:36 |
| → alkino joined | 07:37 |
| → bam32_ joined | 07:39 |
| ← christall left | 07:40 |
| ← reset left | 07:41 |
| ← eamanu left | 07:44 |
| → eamanu joined | 07:45 |
| ← bam32_ left | 07:45 |
| ← mat001 left | 07:51 |
| → bam32_ joined | 07:53 |
| → Shentino joined | 07:54 |
| → mbalmer joined | 07:54 |
| ← mbalmer_ left | 07:57 |
| → Anticom joined | 08:00 |
|
roxlu
| I'm using gitk with a i3 (linux, tiling window manager) and every time I open gitk I have to drag the columns of the author/date to make them visible. Someone around who knows if there is a fix for this? | 08:13 |
| → ksynwa joined | 08:14 |
| → durham joined | 08:18 |
| ← skapata left | 08:21 |
| ← durham left | 08:22 |
| ← adlternative left | 08:22 |
| → adlternative joined | 08:23 |
| → planetcalls|work joined | 08:25 |
| ← planetcall left | 08:29 |
|
gnoo
| roxlu: i3 has a similar problem with imagemagick, last i saw, they refused to fix it. | 08:34 |
|
roxlu
| is it a i3 issue? I thought it was more likely something in gitk | 08:36 |
| ← alkino left | 08:44 |
| → theoceaniscool joined | 08:50 |
| ← Betal left | 08:51 |
| → t_unix[m] joined | 08:58 |
|
t_unix[m]
| hi | 08:58 |
|
davve_
| does floating the window fix it? | 09:00 |
|
| i3 supports float by wm class I think | 09:00 |
| ← randomuser left | 09:01 |
|
t_unix[m]
| does git support some kind of global configuration to automatically use reference repositories (https://git-scm.com/docs/git-clone#Documentation/git-clone.txt---reference-if-ableltrepositorygt) if the remote url matches some pattern? | 09:04 |
| → unluckyshrubbery joined | 09:07 |
| → almarwazi joined | 09:09 |
| ← almarwazi left | 09:09 |
| → almarwazi joined | 09:10 |
| ← hnOsmium0001 left | 09:12 |
| → mbalmer_ joined | 09:15 |
| ← mbalmer left | 09:16 |
| ← nyah left | 09:20 |
| → nyah joined | 09:24 |
| → tolot joined | 09:26 |
|
t_unix[m]
| just to be sure: this is the "git scm" users channel, correct? | 09:26 |
|
j416
| t_unix[m]: you're in the right channel. | 09:27 |
| ← kaisyu left | 09:28 |
| → enoq joined | 09:32 |
|
enoq
| hi, are tags bound to a branch? | 09:32 |
|
| like can you have the same tag in different branches | 09:33 |
|
ikke
| no | 09:33 |
|
| tags are global | 09:33 |
|
enoq
| thanks | 09:34 |
|
Nomikos
| "source code management" TIL | 09:39 |
|
j416
| enoq: you can print a raw tag with git cat-file; you'll see that it references a commit hash | 09:40 |
|
| enoq: git cat-file -p tagname | 09:41 |
|
enoq
| yeah, that's what I've figured as well | 09:41 |
|
| my company has a weird tag/branch/release strategy though | 09:41 |
|
j416
| enoq: if it's a tag object (annotated tag). | 09:41 |
|
enoq
| like 4 branches for develop, acceptance, integration and production | 09:41 |
|
j416
| enoq: if it's not annotated, it's just a reference (similar to a branch name) to a commit hash | 09:41 |
| → randomuser joined | 09:42 |
|
enoq
| j416: where do I find that annotation | 09:43 |
|
j416
| enoq: man git-tag look for -a | 09:44 |
|
gitinfo
| enoq: the git-tag manpage is available at https://gitirc.eu/git-tag.html | 09:44 |
|
j416
| -a means create a tag object, without -a it's just a ref | 09:44 |
| ← FH_thecat left | 09:44 |
|
enoq
| so git tag XXX creates a non annotated tag | 09:44 |
|
j416
| yes | 09:44 |
|
enoq
| ok, thanks | 09:44 |
|
j416
| I'd avoid that | 09:45 |
|
enoq
| so technically it's a commit message for a tag | 09:45 |
|
j416
| enoq: if you see that a tag has its own hash (git show yourtag), then it's an annotated tag | 09:45 |
|
| enoq: technically it's a tag object which in turn references a commit | 09:45 |
|
| or any other object for that matter (you can tag any object) | 09:45 |
|
enoq
| ok, and that object contains the message right? | 09:46 |
|
j416
| yes | 09:46 |
|
enoq
| thank you | 09:46 |
|
Marmotte
| also, tags are global (refs/tags) while branches are by repo (refs/heads and refs/remotes/remote_name) | 09:47 |
|
ikke
| remote tracking branches are by repo (remote) | 09:48 |
| → Oddly joined | 09:48 |
| → christall joined | 10:04 |
| ← christall left | 10:09 |
| → christall joined | 10:10 |
|
j416
| Marmotte: I think by that you mean that they are automatically created by default on fetch | 10:10 |
|
| Marmotte: or? | 10:10 |
| ← christall left | 10:14 |
| → kikijiki joined | 10:19 |
| ← rewrit3 left | 10:20 |
| → furrymcgee joined | 10:21 |
| → reset joined | 10:28 |
| → blaisebool joined | 10:33 |
|
osse
| tsdh: Nice! | 10:36 |
| ← shailangsa left | 10:37 |
| ← austin987 left | 10:39 |
| ← palasso left | 10:47 |
|
tsdh
| osse: Your prediction about the test was exactly right and made me discover that type parameter declarations and arrays in return types weren't recognized, too. | 10:49 |
| → austin987 joined | 10:57 |
| → rewrit3 joined | 11:02 |
| ← nyah left | 11:02 |
| ← ano left | 11:07 |
| → shailangsa joined | 11:12 |
| → nyah joined | 11:12 |
| → kingjulian joined | 11:15 |
| → ano joined | 11:21 |
| → Zubin joined | 11:22 |
| → pulse joined | 11:31 |
| → christall joined | 11:31 |
| ← christall left | 11:34 |
| ← lgc left | 11:38 |
| → michele_ joined | 11:42 |
| → ThorMojito1 joined | 11:43 |
| → roman joined | 11:43 |
| → DrowningElysium_ joined | 11:44 |
| → Manouchehri_ joined | 11:44 |
| → wyre_ joined | 11:44 |
| → pupskucheen joined | 11:44 |
| → bingos_ joined | 11:44 |
| → reillybrogan_ joined | 11:44 |
| → terrorjack4 joined | 11:45 |
| → spaceplo_ joined | 11:45 |
| → noord_ joined | 11:45 |
| → jwillikers joined | 11:45 |
| → polyrob_ joined | 11:46 |
| → indy_ joined | 11:46 |
| → ndorf_ joined | 11:46 |
| → PinealGl1ndOptic joined | 11:46 |
| → foo_ joined | 11:47 |
| → MrBenC joined | 11:47 |
| ← MrC left | 11:47 |
| MrBenC → MrC | 11:47 |
| ← BinGOs left | 11:47 |
| bingos_ → BinGOs | 11:47 |
| ← BinGOs left | 11:47 |
| → BinGOs joined | 11:47 |
| → francis_ joined | 11:47 |
| → OMGOMG joined | 11:47 |
| → imMute^ joined | 11:48 |
| → magic_ninja1 joined | 11:48 |
| → ericnoan_ joined | 11:50 |
| → guardian` joined | 11:50 |
| ← terrorjack4 left | 11:50 |
| → leib joined | 11:51 |
| ← kingjulian left | 11:51 |
| → terrorjack7 joined | 11:51 |
| ← velo left | 11:51 |
| ← tirnanog left | 11:51 |
| ← vdamewood left | 11:51 |
| ← Samian left | 11:51 |
| ← t_unix[m] left | 11:51 |
| ← silvio[m] left | 11:51 |
| ← sa left | 11:51 |
| ← bdeshi left | 11:51 |
| ← dob1 left | 11:51 |
| ← Arokh left | 11:51 |
| ← phroa left | 11:51 |
| ← s1b1 left | 11:51 |
| ← axisys_ left | 11:51 |
| ← imMute left | 11:51 |
| ← przemoc86 left | 11:51 |
| ← elibrokeit left | 11:51 |
| ← earthbreaker left | 11:51 |
| ← FFY00_ left | 11:51 |
| ← guardian left | 11:51 |
| ← treefrob left | 11:51 |
| ← lucerne left | 11:51 |
| ← reillybrogan left | 11:51 |
| ← DrowningElysium left | 11:51 |
| ← Manouchehri left | 11:51 |
| ← indy left | 11:51 |
| ← keypusher left | 11:51 |
| ← wolfdale left | 11:51 |
| ← hendry left | 11:51 |
| ← mweckbecker left | 11:51 |
| ← avar left | 11:51 |
| ← jsatk left | 11:51 |
| ← jkl left | 11:51 |
| ← Bombe left | 11:51 |
| ← jazzy left | 11:51 |
| ← TJ- left | 11:51 |
| ← bodiccea left | 11:51 |
| ← lechner left | 11:51 |
| ← ThorMojito left | 11:51 |
| ← leah2 left | 11:51 |
| ← unclechu left | 11:51 |
| ← ringo_ left | 11:51 |
| ← reprazent left | 11:51 |
| ← PinealGlandOptic left | 11:51 |
| ← geirha left | 11:51 |
| ← harv left | 11:51 |
| ← itok left | 11:51 |
| ← daddy left | 11:51 |
| ← fingercomp left | 11:51 |
| ← derfj left | 11:51 |
| ← tofran left | 11:51 |
| ← circuitbone left | 11:51 |
| ← m1dnight left | 11:51 |
| ← hquirinosmith left | 11:51 |
| ← strudl left | 11:51 |
| ← jiffe left | 11:51 |
| ← yuljk left | 11:51 |
| ← shored1 left | 11:51 |
| ← gitinfo left | 11:51 |
| ← blaisebool left | 11:51 |
| ← reset left | 11:51 |
| ← navidr left | 11:51 |
| ← tuxayo left | 11:51 |
| ← Ody[m] left | 11:51 |
| ← cpackham[m] left | 11:51 |
| ← cmn left | 11:51 |
| ← energizer left | 11:51 |
| ← berndj left | 11:51 |
| ← colona left | 11:51 |
| ← Soliton left | 11:51 |
| ← foo left | 11:51 |
| ← bket left | 11:51 |
| ← SpacePlod left | 11:51 |
| ← yksi left | 11:51 |
| ← ElKowar549 left | 11:51 |
| ← Jck_true left | 11:51 |
| ← Timvde left | 11:51 |
| ← jor left | 11:51 |
| ← rossome left | 11:51 |
| ← SleePy left | 11:51 |
| ← mackerman left | 11:51 |
| ← niyawe left | 11:51 |
| ← catern left | 11:51 |
| ← zmotaj left | 11:51 |
| ← ServerStatsDisco left | 11:51 |
| ← s0dyy[m] left | 11:51 |
| ← zfnmxt left | 11:51 |
| ← morguldir left | 11:51 |
| ← AnisBarghouthi[m left | 11:51 |
| ← happy-dude left | 11:51 |
| ← elemongw[m] left | 11:51 |
| ← Ekho left | 11:51 |
| ← LogicAside left | 11:51 |
| ← dmc left | 11:51 |
| ← greyrat left | 11:51 |
| ← seanBE left | 11:51 |
| ← chemsmith left | 11:51 |
| ← nuala left | 11:51 |
| ← ikke left | 11:51 |
| ← andreas3- left | 11:51 |
| ← splud left | 11:51 |
| ← Tykling left | 11:51 |
| ← frobnic left | 11:51 |
| ← soifou left | 11:51 |
| ← Ragnor left | 11:51 |
| ← sitaramc_ left | 11:51 |
| ← teddyc left | 11:51 |
| ← polyrob left | 11:51 |
| ← rudi_s left | 11:51 |
| ← obiwahn left | 11:51 |
| ← rapha left | 11:51 |
| ← xD- left | 11:51 |
| ← ndorf left | 11:51 |
| ← Puyo left | 11:51 |
| ← ericnoan left | 11:51 |
| ← LordLion left | 11:51 |
| ← cation left | 11:51 |
| ← nesmysl left | 11:51 |
| ← michele left | 11:51 |
| ← tkazi left | 11:51 |
| ← dustinm left | 11:51 |
| ← noord left | 11:51 |
| ← mirai left | 11:51 |
| ← Quack left | 11:51 |
| ← bencevans left | 11:51 |
| ← FLHerne left | 11:51 |
| ← CommunistWolf left | 11:51 |
| reillybrogan_ → reillybrogan | 11:51 |
| ← fstd_ left | 11:51 |
| ← jimklimov left | 11:51 |
| ← magic_ninja left | 11:51 |
| ← g2anj_ left | 11:51 |
| ← casaca left | 11:51 |
| ← Black left | 11:51 |
| ← i7c left | 11:51 |
| ← niluje left | 11:51 |
| terrorjack7 → terrorjack | 11:51 |
| francis_ → francis | 11:51 |
| indy_ → indy | 11:52 |
| DrowningElysium_ → DrowningElysium | 11:52 |
| Manouchehri_ → Manouchehri | 11:52 |
| wyre_ → wyre | 11:52 |
| polyrob_ → polyrob | 11:52 |
| pupskucheen → pupskuchen | 11:52 |
| pupskuchen → pupskucheen | 11:53 |
| → t_unix[m] joined | 11:53 |
| → velo joined | 11:53 |
| → tirnanog joined | 11:53 |
| → vdamewood joined | 11:53 |
| → Samian joined | 11:53 |
| → silvio[m] joined | 11:53 |
| → sa joined | 11:53 |
| → bdeshi joined | 11:53 |
| → Arokh joined | 11:53 |
| → dob1 joined | 11:53 |
| → phroa joined | 11:53 |
| → axisys_ joined | 11:53 |
| → przemoc86 joined | 11:53 |
| → elibrokeit joined | 11:53 |
| → earthbreaker joined | 11:53 |
| → FFY00_ joined | 11:53 |
| → lucerne joined | 11:53 |
| → keypusher joined | 11:53 |
| → wolfdale joined | 11:53 |
| → hendry joined | 11:53 |
| → mweckbecker joined | 11:53 |
| → avar joined | 11:53 |
| → jsatk joined | 11:53 |
| → jkl joined | 11:53 |
| → dfg joined | 11:53 |
| → tonitch joined | 11:53 |
| → fructose joined | 11:53 |
| → jpnurmi joined | 11:53 |
| → Celelibi joined | 11:53 |
| → ch joined | 11:53 |
| → dupondje joined | 11:53 |
| → mgedmin joined | 11:53 |
| ← dfg left | 11:53 |
| → dfg joined | 11:53 |
| ← dfg left | 11:53 |
| → dfg joined | 11:53 |
| pupskucheen → pupskuchen | 11:54 |
| ← psydroid left | 11:55 |
| ← Helmholtz left | 11:55 |
| ← heftig[m] left | 11:55 |
| ← ronny left | 11:55 |
| ← dittid[m] left | 11:55 |
| ← kadoban left | 11:56 |
| ← pinage404 left | 11:56 |
| ← viral_mutant[m] left | 11:56 |
| ← Rubin left | 11:56 |
| ← t_unix[m] left | 11:56 |
| ← silvio[m] left | 11:56 |
| ← dieggsy left | 11:56 |
| charly_ → charly | 11:57 |
| → fstd_ joined | 11:57 |
| → jimklimov joined | 11:57 |
| → g2anj_ joined | 11:57 |
| → casaca joined | 11:57 |
| → Black joined | 11:57 |
| → i7c joined | 11:57 |
| → niluje joined | 11:57 |
| → Peng joined | 11:57 |
| → Arsen joined | 11:57 |
| → fsg joined | 11:57 |
| → xkr47 joined | 11:57 |
| → extor joined | 11:57 |
| → hinderaker joined | 11:57 |
| → bkhl joined | 11:57 |
| → bookworm joined | 11:57 |
| → ecs joined | 11:57 |
| → jle joined | 11:57 |
| → raghavgururajan joined | 11:57 |
| → joj_ joined | 11:57 |
| → Frogging101 joined | 11:57 |
| → mspe joined | 11:57 |
| → Bilge joined | 11:57 |
| → Seveas joined | 11:57 |
| → ThiefMaster joined | 11:57 |
| → Eustachy_Kapusta joined | 11:57 |
| → Exa joined | 11:57 |
| → Bombe joined | 11:57 |
| → jazzy joined | 11:57 |
| → TJ- joined | 11:57 |
| → bodiccea joined | 11:57 |
| → lechner joined | 11:57 |
| → leah2 joined | 11:57 |
| → ringo_ joined | 11:57 |
| → reprazent joined | 11:57 |
| → geirha joined | 11:57 |
| → harv joined | 11:57 |
| → itok joined | 11:57 |
| → tofran joined | 11:57 |
| → fingercomp joined | 11:57 |
| → derfj joined | 11:57 |
| → circuitbone joined | 11:57 |
| → m1dnight joined | 11:57 |
| → hquirinosmith joined | 11:57 |
| → strudl joined | 11:57 |
| → jiffe joined | 11:57 |
| → yuljk joined | 11:57 |
| → shored1 joined | 11:57 |
| → gitinfo joined | 11:57 |
| → sunyibo joined | 11:57 |
| → AACIKF joined | 11:57 |
| → qsx joined | 11:57 |
| → AlexKalopsia joined | 11:57 |
| → mw_ joined | 11:57 |
| → Peng_ joined | 11:57 |
| → mx08 joined | 11:57 |
| → ephemer0l joined | 11:57 |
| → bin joined | 11:57 |
| → yourfate joined | 11:57 |
| → simon816 joined | 11:57 |
| calcium.libera.chat set mode: +o | 11:57 |
| ← tofran left | 11:57 |
| → zfnmxt joined | 11:57 |
| → morguldir joined | 11:57 |
| → AnisBarghouthi[m joined | 11:57 |
| → happy-dude joined | 11:57 |
| → elemongw[m] joined | 11:57 |
| → Ekho joined | 11:57 |
| → LogicAside joined | 11:57 |
| → greyrat joined | 11:57 |
| → seanBE joined | 11:57 |
| → chemsmith joined | 11:57 |
| → nuala joined | 11:57 |
| → ikke joined | 11:57 |
| → andreas3- joined | 11:57 |
| → splud joined | 11:57 |
| → Tykling joined | 11:57 |
| → Ragnor joined | 11:57 |
| → frobnic joined | 11:57 |
| → soifou joined | 11:57 |
| → sitaramc_ joined | 11:57 |
| → teddyc joined | 11:57 |
| → rudi_s joined | 11:57 |
| → obiwahn joined | 11:57 |
| → rapha joined | 11:57 |
| → xD- joined | 11:57 |
| → Puyo joined | 11:57 |
| → LordLion joined | 11:57 |
| → cation joined | 11:57 |
| → tkazi joined | 11:57 |
| → dustinm joined | 11:57 |
| → mirai joined | 11:57 |
| → Quack joined | 11:57 |
| → bencevans joined | 11:57 |
| → FLHerne joined | 11:57 |
| → CommunistWolf joined | 11:57 |
| → Fusl joined | 11:57 |
| → anddam joined | 11:57 |
| → marw joined | 11:57 |
| → stark joined | 11:57 |
| → Dragoon joined | 11:57 |
| → selckin joined | 11:57 |
| → dodo joined | 11:57 |
| → wacko joined | 11:57 |
| → catbeard joined | 11:57 |
| → nsh joined | 11:57 |
| → RichiH joined | 11:57 |
| → eldritch_ joined | 11:57 |
| ← happy-dude left | 11:57 |
| → blaisebool joined | 11:57 |
| → navidr joined | 11:57 |
| → tuxayo joined | 11:57 |
| → yksi joined | 11:57 |
| → cmn joined | 11:57 |
| → energizer joined | 11:57 |
| → colona joined | 11:57 |
| → berndj joined | 11:57 |
| → Soliton joined | 11:57 |
| → bket joined | 11:57 |
| → ElKowar549 joined | 11:57 |
| → Jck_true joined | 11:57 |
| → quesker joined | 11:57 |
| → infernix joined | 11:57 |
| → Timvde joined | 11:57 |
| → jor joined | 11:57 |
| → rossome joined | 11:57 |
| → SleePy joined | 11:57 |
| → catern joined | 11:57 |
| → zmotaj joined | 11:57 |
| → mackerman joined | 11:57 |
| → niyawe joined | 11:57 |
| → rkta joined | 11:57 |
| → waterkip joined | 11:57 |
| → phylaz joined | 11:57 |
| → vodkra joined | 11:57 |
| → Henry151 joined | 11:57 |
| → wolf joined | 11:57 |
| → n-st joined | 11:57 |
| → limon joined | 11:57 |
| → shalok joined | 11:57 |
| → barlas joined | 11:57 |
| → Soni joined | 11:57 |
| → davidfetter joined | 11:57 |
| ← n-st left | 11:58 |
| → treefrob joined | 11:58 |
| → tofran joined | 11:58 |
| → n-st- joined | 11:58 |
| → dmc joined | 11:58 |
| n-st- → n-st | 11:59 |
| → daddy joined | 11:59 |
| → reset joined | 11:59 |
| ← zfnmxt left | 12:00 |
| ← morguldir left | 12:00 |
| ← AnisBarghouthi[m left | 12:00 |
| ← elemongw[m] left | 12:00 |
| ← tuxayo left | 12:01 |
| ← Guest526 left | 12:01 |
| ← lasr[m] left | 12:01 |
| ← cameron[m] left | 12:01 |
| ← Industrial[m] left | 12:01 |
| ← Vipulk left | 12:01 |
| ← smuise[m] left | 12:01 |
| → s1b1 joined | 12:01 |
| ← Dragoon left | 12:02 |
| ← mbalmer_ left | 12:03 |
| → Dragoon joined | 12:04 |
| → christall joined | 12:05 |
| ← leib left | 12:05 |
| → leib joined | 12:06 |
| → viral_mutant[m] joined | 12:07 |
| → dittid[m] joined | 12:07 |
| ← christall left | 12:09 |
| ← leib left | 12:14 |
| → christall joined | 12:16 |
| → natrys joined | 12:16 |
| → bam32 joined | 12:19 |
| → dviola joined | 12:19 |
| → durham joined | 12:19 |
| → mat001 joined | 12:20 |
| → ronny joined | 12:21 |
| → heftig[m] joined | 12:21 |
| ← bam32_ left | 12:21 |
| ← durham left | 12:24 |
| ← adlternative left | 12:27 |
| → AnAverageHuman joined | 12:36 |
| → filePeter joined | 12:36 |
| ← christall left | 12:37 |
| ← Arokh left | 12:44 |
| → Arokh joined | 12:45 |
| → kingjulian joined | 12:48 |
| → danisanti joined | 12:49 |
| → FFY00 joined | 12:50 |
|
danisanti
| Now there is a git channel for git translators. It is the #git-l10n channel | 12:50 |
| → christall joined | 12:52 |
| ← FFY00_ left | 12:52 |
| → adlternative joined | 12:54 |
| ← randomuser left | 12:54 |
| → eternalromance joined | 12:56 |
| → Industrial[m] joined | 12:56 |
| → lasr[m] joined | 12:56 |
| → unclechu joined | 13:01 |
| → psydroid joined | 13:04 |
| ← kingjulian left | 13:04 |
| → Ody[m] joined | 13:05 |
| → cpackham[m] joined | 13:08 |
| → durham joined | 13:09 |
| → AnisBarghouthi[m joined | 13:10 |
| → t_unix[m] joined | 13:12 |
| ← travisghansen left | 13:13 |
| → ServerStatsDisco joined | 13:14 |
| → travisghansen joined | 13:15 |
| → Vipulk joined | 13:16 |
| → cameron[m] joined | 13:16 |
| → randomuser joined | 13:16 |
| → smuise[m] joined | 13:17 |
| ← AnapodoPsalidi left | 13:20 |
| → Rubin joined | 13:21 |
| → kadoban joined | 13:21 |
| → Helmholtz joined | 13:21 |
| → epolanski joined | 13:22 |
| → AACS48 joined | 13:23 |
| → AADHCH joined | 13:23 |
| ← randomuser left | 13:23 |
| → randomuser joined | 13:24 |
| → pinage404 joined | 13:25 |
| → dieggsy joined | 13:25 |
| ← Xenguy left | 13:25 |
| → s0dyy[m] joined | 13:27 |
| ← almarwazi left | 13:28 |
| → almarwazi joined | 13:29 |
| ← jazzy left | 13:29 |
| → darkbit joined | 13:29 |
| → silvio[m] joined | 13:31 |
| → elemongw[m] joined | 13:31 |
| → rapid16 joined | 13:32 |
| ← rapid16 left | 13:32 |
| → rapid16 joined | 13:32 |
| → durham_ joined | 13:32 |
| → zfnmxt joined | 13:32 |
| → tuxayo joined | 13:33 |
| → adl_ joined | 13:33 |
| ← durham left | 13:34 |
| ← adlternative left | 13:34 |
| → Guest526 joined | 13:35 |
| → morguldir joined | 13:36 |
| ← randomuser left | 13:37 |
| ← enoq left | 13:37 |
| → gh34 joined | 13:41 |
| ← Helmholtz left | 13:43 |
| → Helmholtz joined | 13:43 |
| ← OnkelTem left | 13:44 |
|
Samian
| if I have remotes/upstream/master and remotes/origin/master, and I type git switch master, which does it get? | 13:44 |
|
| argh, I want the upstream master to just overwrite origin/master | 13:44 |
|
j416
| Samian: try it, and check with git branch -vv | 13:44 |
|
| it might say ambiguous | 13:45 |
|
Samian
| git branch -vv master | 13:45 |
|
| like that? | 13:45 |
|
j416
| just git branch -vv | 13:45 |
| → OnkelTem joined | 13:45 |
|
Samian
| it shows * master cad3b15 [origin/master] data module cean-up | 13:46 |
|
j416
| looks like you have your answer | 13:46 |
|
| also note that origin/master and master are different branhes | 13:46 |
|
| branches*, even | 13:46 |
|
| master is set up to track origin/master, that's all | 13:47 |
|
Samian
| argh | 13:48 |
|
| github doesn't let me make two forks | 13:48 |
|
j416
| no need | 13:48 |
|
Samian
| I want a new clean fork so it's in sync with master | 13:48 |
|
j416
| fork is just a github concept | 13:48 |
|
Samian
| this is what I'm seeing: https://imgur.com/a/jy2x6zY | 13:48 |
|
| j416 I want to archive or detach my current fork, and make a new fork that's a copy of the upstream repo | 13:49 |
|
| after I have my perfect clone, I'll make a single new branch, commit my changes to it, and then tell the gods of the upstream repo I'm making a pull request | 13:49 |
|
j416
| are you saying that you want a fork that's not labelled fork? | 13:49 |
|
Samian
| j416 yes | 13:50 |
|
j416
| I don't know if you can make GH PRs that way, can you? | 13:50 |
|
Samian
| with all the branches kept. because some of the branches have code I like | 13:50 |
|
| j416 no sure | 13:50 |
|
| *not sure | 13:50 |
|
j416
| clone it with --mirror, push it with --mirror, iirc | 13:50 |
| roman → nesmysl | 13:51 |
|
Samian
| j416 it looks like --mirror is a way to archive a fork and create a fresh one | 13:52 |
| ← eternalromance left | 13:56 |
| → Guest92 joined | 13:56 |
| ← Guest92 left | 13:58 |
| → hubble joined | 13:58 |
| → hubble63 joined | 14:00 |
| ← hubble left | 14:03 |
| → junktext joined | 14:10 |
| → enoq joined | 14:13 |
| ← Murr left | 14:13 |
| → Murr joined | 14:14 |
| imMute^ → imMute | 14:15 |
| ← vodkra left | 14:16 |
| ← Misotauros left | 14:20 |
| ← s1b1 left | 14:20 |
| → Misotauros joined | 14:20 |
| ← Rudde_ left | 14:21 |
| ← danisanti left | 14:21 |
| → Rudde joined | 14:22 |
| → lgc joined | 14:22 |
| → vodkra joined | 14:23 |
| ← adl_ left | 14:26 |
| → kingjulian joined | 14:26 |
| → s1b1 joined | 14:26 |
| → Crassus joined | 14:27 |
| ← ByteHackr left | 14:29 |
| ← durham_ left | 14:30 |
| → zebrag joined | 14:31 |
| → durham joined | 14:32 |
| ← durham left | 14:34 |
| → durham joined | 14:34 |
| → The_Blode_ joined | 14:34 |
| ← The_Blode left | 14:35 |
| ← YuGiOhJCJ left | 14:35 |
| → randomuser joined | 14:36 |
| ← molt left | 14:37 |
| → daoudr joined | 14:37 |
| ← hubble63 left | 14:39 |
| → thiago joined | 14:41 |
| → lpapp_ joined | 14:42 |
|
lpapp_
| osse: do I need to do git-rebase -i to rebase my branch for merge to main? | 14:42 |
|
| it is happening now | 14:42 |
|
| do I need some first-parent hackery? | 14:42 |
| → hubble joined | 14:43 |
|
ikke
| lpapp_: what do you want to achieve exactly? | 14:43 |
|
Soni
| how do you add a submodule without doing the clone operation? | 14:44 |
|
lpapp_
| ikke: my colleague did merge from main into this topic branch a few weeks ago | 14:44 |
| → erochow[hehim][m joined | 14:45 |
|
lpapp_
| I want to use rebase to clean up the history | 14:45 |
|
| e.g. let merge commits go | 14:45 |
|
| from personal topic branches merged into the shared topic branch | 14:45 |
|
| also merge commits from main to the topic branch | 14:45 |
|
| also rewrite commit messages, etc. | 14:45 |
|
Soni
| this is to use git submodule update --init --jobs as a parallel variant of git fetch, but without corrupting the repo | 14:45 |
|
lpapp_
| squash commits, too. | 14:45 |
|
Soni
| (submodules do share objects with the parent repo yeah?) | 14:45 |
| ← Crassus left | 14:46 |
|
ikke
| no | 14:46 |
|
lpapp_
| ikke: I am preparing a few months old long-lived branch for integration into main | 14:47 |
| ← hubble left | 14:47 |
| → hubble joined | 14:47 |
| → skapata joined | 14:47 |
| ← skapata left | 14:47 |
| → skapata joined | 14:47 |
|
lpapp_
| we all used to merge into this topic branch from our personal topic branches and gitlab created a merge commit for each MR. They have to go. | 14:47 |
|
| but not merge commits that we got from main into the topic branch when my colleague merged main into the long-lived shared topic branch | 14:48 |
|
| dittid[m] < https://libera.ems.host/_matrix/media/r0/download/libera.chat/d867819a1c5556936880a6afccb93f2f69e145db/message.txt > | 14:48 |
| → jess joined | 14:48 |
| → hubble98 joined | 14:48 |
| ← hubble98 left | 14:48 |
|
lpapp_
| I guess I want to get the usual git rebase -i, but only for commits that we added to this long-lived branch, not for commits from main | 14:48 |
|
| considering that the linear history was broken by the merge from main to the topic branch. | 14:49 |
|
| so, I can no longer just use git rebase -i 100 or similar stuff. | 14:49 |
| → hubble26 joined | 14:49 |
|
imMute
| dittid[m]: in the parent repo 'git checkout $SHA' where $SHA is the revision you want to explore. Then do 'git submodule update' to have git checkout the version of the submodules that was committed in that revision. | 14:50 |
|
ikke
| lpapp_: you cannot selectively rebase commits | 14:50 |
|
lpapp_
| ikke: git rebase -i XXX would have worked if my colleague had not merged main into our branch, right? | 14:51 |
|
| if he had rebased from main? | 14:51 |
|
imMute
| lpapp_: if main was merged into your branch, and you then rebase your branch on a newer main, it'll be fine. it'll just skip that merge commit. | 14:51 |
|
lpapp_
| will it change the topic branch history back to linear? | 14:52 |
|
| if I rebase from main now? | 14:52 |
| ← hubble left | 14:52 |
|
dittid[m]
| imMute: is there a way to do that in a different worktree? Like something `git archive` but also exporting the submodules content? | 14:52 |
|
| Or adding an additional worktree but without downloading the submodules from scratch. | 14:52 |
|
imMute
| lpapp_: yeah, the rebased branch will be linear. there's a flag to preserve merges I believe. | 14:52 |
| ← lgc left | 14:52 |
|
lpapp_
| --keep-base | 14:52 |
|
imMute
| dittid[m]: I do not know how submodules interact with worktrees, sorry. | 14:52 |
|
| lpapp_: no, it's --preserve-merges or --rebase-merges | 14:52 |
|
lpapp_
| ok, thanks | 14:53 |
|
dittid[m]
| I just need to `git archive` all the content of a revision recursively with submodules. Is there a way to do this? Because I've been searching for a while and it doesn't seem possible. | 14:53 |
|
lpapp_
| so, after rebase, I no longer need to use git log --first-parent topic? | 14:53 |
|
imMute
| lpapp_: --keep-base is not a valid flag. (at least not in 2.20.1) | 14:53 |
|
lpapp_
| it is a valid flag for git rebase | 14:53 |
|
| I have 2.24.3 here | 14:53 |
|
imMute
| lpapp_: ah, it's a new flag. | 14:54 |
| ← hubble26 left | 14:54 |
|
lpapp_
| imMute: so, git merge from main to topic breaks git log, and one needs to start usign --first-parent | 14:54 |
|
| but if I rebase from main, it gets back to linear, and I no longer need --first-parent on git log? | 14:55 |
|
imMute
| lpapp_: it's not "broken", it's just non linear. and yes, rebase will make the rebased commits linear (unless you preserve merges with the flag mentioned) | 14:55 |
|
lpapp_
| thanks | 14:55 |
|
| do I have a nicer way than git bisect -i FIRST_COMMIT_IN_THE_BRANCH? | 14:56 |
|
| git rebase -i FIRST_COMMIT_IN_THE_BRANCH* | 14:56 |
|
| just so that I do not make a mistake with the commit hash | 14:56 |
| ← mci64 left | 14:56 |
|
lpapp_
| or number back in the history | 14:56 |
|
imMute
| lpapp_: git rebase -i origin/main ??? | 14:56 |
|
lpapp_
| thanks, I did not know :) | 14:56 |
|
Soni
| do submodules share objects with supermodules? | 14:58 |
|
| and if not, why not? | 14:59 |
| → molt joined | 15:02 |
| ← kurtthem1ker left | 15:02 |
| ← clime left | 15:02 |
|
lpapp_
| imMute: why is git rebase showing commits in a different order to git log? | 15:03 |
| → bambanxx joined | 15:03 |
|
imMute
| Soni: I don't think so. They don't because they're logically separate repositories. | 15:04 |
|
Soni
| sure but deduplication? | 15:04 |
|
imMute
| lpapp_: no idea, I would expect them to be in the same order. | 15:04 |
| → nobody_ joined | 15:05 |
|
lpapp_
| imMute: at the top, I see the older commit from the branch, and at the bottom, I see the newest from the branch. | 15:05 |
|
imMute
| Soni: they're separate repos, you could assume they don't share any objects in common. | 15:05 |
|
Soni
| imMute: until you start getting submodules of submodules where they're the same repo | 15:05 |
|
imMute
| lpapp_: oh, log shows in reverse chronological order, rebase shows in the order they're going to be applied (chronological order). | 15:05 |
|
lpapp_
| there must be a reverse order option | 15:05 |
|
imMute
| Soni: why would you do that? | 15:05 |
| → hubble joined | 15:06 |
|
imMute
| lpapp_: git log --reverse | 15:06 |
|
Soni
| imMute: because some ppl use submodules to manage deps, like it's a package manager | 15:06 |
|
lpapp_
| imMute: revert git rebase | 15:06 |
|
| I am more familiar with the daily git log order | 15:06 |
|
| by the way, when git rebase -i origin/main removes merge commits on leaving the editor, does it also squash commits in that merge request? | 15:06 |
|
| I do not see "address review comments" commits that colleagues made | 15:06 |
|
| for a MR. | 15:06 |
|
imMute
| lpapp_: rebase shows them in the order they'll be applied. it doesn't make sense to show them in any other order. | 15:07 |
|
lpapp_
| I wanted to squash them, but I do not see them, so git rebase automatically did that for me? | 15:07 |
|
imMute
| lpapp_: it picks up the commits on the branch that was merged in. | 15:07 |
|
| lpapp_: as if they were all applied on the same branch, linearly. | 15:07 |
|
lpapp_
| imMute: so if the MR contained three commits from a personal topic to the long-lived topic, after git rebase -i origin/main, they will only be one commit instead of four (3 for the MR, and the merge commit)? | 15:08 |
|
imMute
| lpapp_: there will be 3 - the three from the topic branch. only the cmerge commit is skipped. | 15:08 |
|
lpapp_
| then something is going on! | 15:08 |
|
| Because I do not see each individual commits from MRs. | 15:09 |
|
imMute
| lpapp_: lets say your branch branched off origin/main, and then some time later merged origin/main into it. the commits that got brought in by that merge will *not* be part of a rebase (a rebase on top of origin/main) because they're already a part of the new base. | 15:09 |
|
lpapp_
| sure. | 15:10 |
|
imMute
| similarly, if you merge a 3rd branch into both your feature branch and main, and then rebase feature on top of main, the 3rd branches commits will not be part of the rebase (because they're already a part of the new base's history) | 15:11 |
|
lpapp_
| we only merged into the long-lived topic | 15:11 |
|
| not main | 15:11 |
|
imMute
| then you should see those commits when you do the rebase. | 15:11 |
|
lpapp_
| is it possible to edit/fixup/reword commits from rebase -i origin/main based on author? | 15:12 |
|
| i.e. all of us clean up their own stuff | 15:12 |
|
| commit messages, etc. | 15:12 |
|
imMute
| not that I know of. | 15:12 |
|
lpapp_
| I guess mark all as edit, and what is not mine, skip? | 15:12 |
|
| as a workaround unless there is something better? | 15:12 |
|
imMute
| I don't think there's any built in way to do that. | 15:13 |
|
lpapp_
| ok, thanks, so is this how you would also work it around? | 15:13 |
|
| Rebase 6273b960c2..1d58b595b7 onto 1d58b595b7 (104 commands) | 15:14 |
|
| does it mean 104 commits? | 15:14 |
|
imMute
| yes. | 15:14 |
|
lpapp_
| ok, so in this case, I can do one-by-one and skip what is not authored by me? | 15:14 |
|
| Unless there is a way | 15:14 |
|
| I own one third or so | 15:14 |
|
imMute
| you don't want to "skip" those commits - that would drop them from the new branch | 15:15 |
|
lpapp_
| or half | 15:15 |
|
| by skip, I do not mean the skip word | 15:15 |
|
| I mean mark all as reword for example | 15:15 |
|
| and if I recognise it is not mine, just :q in vim | 15:15 |
|
imMute
| yeah, that would work. | 15:15 |
|
lpapp_
| thanks | 15:16 |
|
| imMute: for some reason, some of the commits do not mention the author in comments | 15:20 |
|
| just date | 15:20 |
|
| what is the reason for this? | 15:20 |
|
imMute
| no idea. | 15:20 |
|
lpapp_
| how can I know if it is edited by me? :/ | 15:20 |
| ← hubble left | 15:20 |
| → lgc joined | 15:21 |
|
lpapp_
| can I get a hash somehow to check in another window? | 15:21 |
| ← zebrag left | 15:23 |
| foo_ → foo | 15:24 |
|
lpapp_
| oh | 15:25 |
|
| maybe, those are mine :D | 15:25 |
|
| that is why it is not writing in the comment explicitly. | 15:25 |
|
| yeah, that is the rule, apparently | 15:30 |
| ham2 → ham | 15:32 |
| ← ham left | 15:32 |
| → ham joined | 15:32 |
| ← kingjulian left | 15:35 |
| → zmt00 joined | 15:37 |
| → skapate joined | 15:37 |
| ← skapate left | 15:37 |
| → skapate joined | 15:37 |
| ← skapata left | 15:37 |
| → fling joined | 15:37 |
| → kingjulian joined | 15:38 |
| ← ndorf_ left | 15:38 |
| → ndorf joined | 15:39 |
| → LuxuryMode joined | 15:40 |
| → rsrx joined | 15:43 |
|
LuxuryMode
| I am trying to push to a remote branch using `git push --force-with-lease` and I am getting ` ! [remote rejected]...error: failed to push some refs to 'git@github.com:my-org/my-repo.git'` and I'm not sure why. The remote branch still exists and there are no other commits which have been added to the remote branch that I don't have. Any ideas on what might be the issue here? | 15:44 |
|
| oh, it may just be github https://www.githubstatus.com/ | 15:44 |
|
imMute
| nnections received) | 15:45 |
|
| [08/10 05:47:58] -!- Mode change [+Zi] for user imMute^ | 15:45 |
| ← lpapp_ left | 15:45 |
|
imMute
| oops | 15:45 |
|
rsrx
| yeah github is down | 15:46 |
|
| ubuntu ppa archive too it seems | 15:46 |
|
LuxuryMode
| ugh | 15:47 |
| ← kingjulian left | 15:47 |
| → mci64 joined | 15:51 |
| → lpapp_ joined | 15:51 |
|
lpapp_
| imMute: I guess it is a good idea to diff the long-lived topic branch and the rebase branch branched off from it at the end of the rewording to make sure there is no code difference introduced? | 15:52 |
|
| if the rebase and rewrite is only about commit messages? | 15:52 |
|
| and dropping merge commits | 15:52 |
| → DoofusCanadensis joined | 15:53 |
|
imMute
| wouldn't be a bad idea to double check that. there might be differences though, since the new branch will have stuff from main that isn't in the old branch. | 15:53 |
|
| (unless you merged main into said branch just before doing the rebase) | 15:53 |
|
lpapp_
| yeah, sounds like I should create another branch then with main rebase, but without commit message cleanup? | 15:53 |
| ← BlessJah left | 15:53 |
| → howdoi joined | 15:54 |
|
Samian
| any idea why git push --force would fail? | 15:55 |
|
DoofusCanadensis
| server will give you a good reason in the logs | 15:55 |
|
Samian
| remote: fatal error in commit_refs ! [remote rejected] fbgemm_gpu -> fbgemm_gpu (failure) | 15:55 |
|
| error: failed to push some refs to 'https://github.com/samiwilf/dlrm.git' | 15:55 |
|
DoofusCanadensis
| remote rejected your push | 15:56 |
|
Samian
| why though? it's github, and that's my github account | 15:56 |
|
DoofusCanadensis
| so, I'd say the repo is protected againsts forced pushes | 15:56 |
| ← SirRippovMaple left | 15:56 |
|
Samian
| it's my repo! | 15:56 |
|
DoofusCanadensis
| doesn't matter. check your repo setttings on github | 15:56 |
|
imMute
| Samian: github is having issues at the moment. | 15:56 |
|
Samian
| thanks good idea! | 15:56 |
|
imMute
| Samian: https://www.githubstatus.com/ | 15:57 |
|
Samian
| crap | 15:57 |
|
| I need to do this force push before my manager see the code I linked him! | 15:57 |
| → hubble joined | 15:57 |
|
Samian
| thanks imMute | 15:57 |
|
| Samian bookmarks githubstatus.com | 15:57 |
| → SirRippovMaple joined | 15:59 |
| → AbleBacon joined | 16:00 |
| → hnOsmium0001 joined | 16:00 |
|
Samian
| I'm tired of copying and pasting my personal access token every push. I'm trying to find a way around it. | 16:02 |
|
| What are some key words to google? | 16:02 |
|
imMute
| SSH keys | 16:02 |
|
DoofusCanadensis
| use SSH | 16:02 |
|
Samian
| thanks! | 16:02 |
| ← nrg left | 16:03 |
|
Samian
| I put something in a .ssh folder somewhere? | 16:03 |
| ← rsrx left | 16:03 |
| ← stkrdknmibalz left | 16:04 |
|
j416
| Samian: I think github has instructions, find those | 16:04 |
|
DoofusCanadensis
| you don't need a PAT when you have SSH | 16:04 |
|
imMute
| Samian: Samian: https://www.atlassian.com/git/tutorials/git-ssh | 16:04 |
|
DoofusCanadensis
| PAT is only for HTTPS clones | 16:04 |
|
Samian
| I hate setting up ssh keys. It's always a nightmare | 16:04 |
|
| then again, git was a nightmare until I said enough is enough | 16:05 |
|
imMute
| Samian: SSH keys are easy. which part is a nightmare for you? | 16:05 |
| ← hubble left | 16:05 |
|
DoofusCanadensis
| you're a bright boy. SSH should be childs play for you | 16:05 |
|
Samian
| I forgot the details, but remember the overall frustration. Maybe it'll be smooth this time. | 16:05 |
| → gordonfish- joined | 16:06 |
| → trace1918 joined | 16:06 |
|
DoofusCanadensis
| the github tutorials are top notch | 16:06 |
| ← gordonfish left | 16:08 |
| → kurtthemaker joined | 16:12 |
| → nrg joined | 16:12 |
| → shabius joined | 16:12 |
| ← molt left | 16:12 |
| → molt joined | 16:13 |
| ← Anticom left | 16:17 |
| → Lyn joined | 16:18 |
| ← darkbit left | 16:20 |
|
Samian
| github is seriously down. I can't push a regular commit | 16:23 |
|
DoofusCanadensis
| yup | 16:24 |
| ← trace1918 left | 16:24 |
|
ikke
| "The cloud is just somone elses computer" | 16:24 |
|
j416
| good thing git is distributed \^^/ | 16:24 |
| → trace1918 joined | 16:24 |
| → samuelbernardo joined | 16:28 |
| ← EvilDMP left | 16:29 |
|
lpapp_
| imMute: just out of curiosity, without rebase -i origin/main, is it possible to see the commits in our branch that is not in main? | 16:30 |
|
| my colleague started arguing that I should not have rebased on main, as it is "much more complex" :D | 16:30 |
|
| So, I would like to understand the alternative better in details. I do not know it is complex to do git rebase -i origin/main. | 16:30 |
|
| or at least the "much more complex" is a bit heavy to say. | 16:31 |
| → orbyt joined | 16:31 |
| ← bambanxx left | 16:32 |
| → zebrag joined | 16:32 |
|
j416
| lpapp_: git log main..ourbranch | 16:34 |
|
lpapp_
| j416: when I tried that, it did not work for non-linear history. | 16:34 |
|
j416
| define did not work | 16:34 |
|
lpapp_
| it would give intermingled commits | 16:35 |
|
| but in this case, I asked about rebase | 16:35 |
|
| not log. | 16:35 |
|
j416
| but none from main | 16:35 |
|
lpapp_
| yeah, some from main. | 16:35 |
|
j416
| you asked to see the commits in a branch | 16:35 |
|
| rebase doesn't do this | 16:35 |
|
lpapp_
| see the commits in rebase, not log. | 16:35 |
| → Guest448 joined | 16:36 |
|
j416
| what do you mean by that? | 16:36 |
|
lpapp_
| git rebase -i brings up commits for you. | 16:36 |
|
j416
| yes | 16:36 |
|
| (this is called the todo list, for reference) | 16:36 |
|
lpapp_
| in that list, I would only like to see the commits from the long-lived topic branch. | 16:36 |
|
| ok, thanks, I did not know that. | 16:36 |
| ← trace1918 left | 16:36 |
|
j416
| the commits in that list depends on what commit you rebase on | 16:37 |
| → trace1918 joined | 16:37 |
|
Samian
| woohoo github is working now | 16:37 |
|
j416
| git rebase -i HEAD~3 would show 3 commits, for instance. | 16:37 |
|
lpapp_
| yeah, so I do not know how to show the commits from the branch in the rebase todo list without rebasing on main. | 16:38 |
|
j416
| (i.e. all commits since HEAD~3) | 16:38 |
| ← OnkelTem left | 16:38 |
|
j416
| lpapp_: find the common ancestor (merge base) and rebase on that | 16:38 |
| → rsx joined | 16:38 |
|
ikke
| lpapp_: git log --oneline base...<branch> | 16:38 |
|
lpapp_
| ah, that would be quite tiresome or error-prone | 16:38 |
|
ikke
| lpapp_: git log --oneline base..<branch> | 16:38 |
|
lpapp_
| and* | 16:38 |
|
j416
| lpapp_: there's --keep-base for rebase, but I haven't used it. | 16:39 |
|
lpapp_
| also, because main was merged earlier into the long-lived topic branhc | 16:39 |
|
| I am not sure if this works, as the history at that point was not linear | 16:39 |
|
| without rebasing on main. | 16:39 |
|
j416
| lpapp_: you can also manually find the merge base with git merge-base branchA branchB | 16:39 |
| ← planetcalls|work left | 16:39 |
|
j416
| rebase will eat merges by default | 16:39 |
|
| you can make it not to but beware of dragons | 16:40 |
| → OnkelTem joined | 16:40 |
|
lpapp_
| so, what strategy would you use in this case | 16:41 |
|
| to prepare for merge git rebase -i origin/main or without rebasing on main first? | 16:41 |
|
| I guess he has the issue of diff comparison before commit rewrites and after to make sure no code has changed. | 16:41 |
|
| but as far as I know, this can easily be done by creating another rebase-original branch which gets rabsed on main without rewording, and diffing those two rebase branches? | 16:42 |
|
| is this not the preferred way? | 16:42 |
| ← Guest448 left | 16:42 |
|
j416
| it looks like you're trying to do two things at once | 16:43 |
|
lpapp_
| two substeps, but ultimately one goal, merge the topic branch back to main | 16:44 |
|
j416
| while certainly possible, I mostly prefer to do squashing first, and then rebase on a different base as a second step, because it makes it easier to grasp conflicts | 16:44 |
|
lpapp_
| which means: 1) Rebasing on top of main 2) Rewording the commit messages. | 16:44 |
|
j416
| less brain power spent | 16:44 |
|
lpapp_
| I am not sure if it requires branch to rebase | 16:45 |
|
| maybe, if you have conflicts, but we do not have any. | 16:45 |
|
| brain* | 16:45 |
|
j416
| I'd reword first anyway | 16:45 |
|
lpapp_
| brain power, even | 16:45 |
|
| why? | 16:45 |
|
| actually, I still do not see a clear way how to reword simply | 16:45 |
|
| git rebase -i origin/main will bring up all the commits you have made, for you. | 16:46 |
|
j416
| if there are conflicts and you decide to bail out, you'd have to redo the rewording unless you make sure to keep track of or find later the commit chain that has the rewording | 16:46 |
|
lpapp_
| but if you do not want to rebase, I do not know how exactly you would get the same todo list with that ease. | 16:46 |
|
j416
| lpapp_: see above | 16:46 |
|
lpapp_
| there are no conflicts. | 16:46 |
|
| yeah, I saw a lot of manual git magic | 16:46 |
|
| but if I am honest, that is very error-prone | 16:46 |
|
j416
| then by all means have fun doing them both in one step; I'm just saying what I'd do | 16:46 |
|
lpapp_
| ok, thanks, but I still have no clue how you would do it your way :) | 16:47 |
|
j416
| git rebase -i $(git merge-base main HEAD) # reword | 16:47 |
|
| git rebase main # rebase on main | 16:47 |
|
| you might be able to achieve the former with git rebase -i --keep-base, but I have never used it so I don't know. | 16:48 |
| ← rsx left | 16:48 |
|
lpapp_
| would that also work for non-linear topic branch history? | 16:48 |
|
j416
| yes | 16:48 |
|
| although it'd eat the merges as I said | 16:49 |
|
lpapp_
| what is wrong about that? | 16:49 |
|
| They should be binned like anything, they are so silly | 16:49 |
|
j416
| ? | 16:49 |
|
| I generally avoid merging into topic branches if I can. I don't have much experience rebasing merges. sorry. | 16:50 |
|
| not sure if maybe rebasing on main first and then doing the reword (same but opposite order) would mean less potential conflicts | 16:50 |
|
lpapp_
| git rebase -i $(git merge-base main HEAD) worked, amazing. | 16:50 |
|
j416
| magic | 16:51 |
|
ikke
| why did git rebase -i main not work? | 16:51 |
|
| oh, --keep-base | 16:51 |
|
lpapp_
| git rebase -i --keep-base origin/main or what? | 16:52 |
|
| or HEAD? | 16:52 |
| → Betal joined | 16:52 |
|
ikke
| git rebase -i --keep-base main | 16:53 |
|
j416
| git rebase -i main would of course work just fine most of the time; I just said it's often easier to split squashing/rewording etc. and rebasing onto a new base into two operations | 16:53 |
|
ikke
| should be the same as: git rebase -i $(git merge-base main HEAD) | 16:53 |
|
j416
| (in my experience) | 16:53 |
|
| ikke: thanks for confirming | 16:53 |
| → thebombzen joined | 16:54 |
|
ikke
| "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>." | 16:54 |
|
j416
| yes yes. I read it but I've never used it so I don't know if I might be missing something :) | 16:54 |
|
ikke
| "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is." | 16:55 |
|
lpapp_
| hmm, no --keep-base does not work for me | 16:55 |
| → EvilDMP joined | 16:55 |
|
ikke
| What happens then? | 16:55 |
|
lpapp_
| it also linearises the history | 16:55 |
|
ikke
| rebase by default linearises history | 16:55 |
|
j416
| ^ | 16:55 |
|
lpapp_
| yeah, but j416 said that is not how he would do things | 16:56 |
|
| he would first reword, and only when that is done, rebase. | 16:56 |
|
j416
| it'll linearise nonetheless | 16:56 |
|
lpapp_
| so, I am a bit confused if I am honest. | 16:56 |
|
| how you would actually split this step into two different ones. | 16:56 |
|
j416
| lpapp_: did you understand why I said to split them? | 16:56 |
|
lpapp_
| j416: maybe not, were you concerned about conflict resolution? | 16:57 |
|
j416
| it just makes it two steps instead of one, so as to reduce complexity | 16:57 |
|
| if you're done with one step, you have a good state | 16:57 |
|
lpapp_
| I am sorry, maybe I am dumb, but I am unable to follow | 16:57 |
|
| you are saying not to rebase | 16:58 |
|
| first squash/reword | 16:58 |
|
| but for that, you need to run rebase -i | 16:58 |
|
j416
| rather than doing two things at once, ending up with a conflict or whatnot, having to abort, and then redo both the squashing and the rebase, see | 16:58 |
|
lpapp_
| but if you are doing that against main, you will get rebased against main | 16:58 |
|
| so, you would not separate it. | 16:58 |
|
j416
| both use the rebase command, but the former isn't a rebase per-se (it doesn't base the branch on a new base), you just run it for the side-effect of being able to reword | 16:58 |
|
| anyway, do whichever you feel is easiest | 16:59 |
|
| you don't have to split it into two steps. | 16:59 |
| ← rfuentess left | 17:01 |
|
lpapp_
| for me, it is a rebase | 17:01 |
|
| after that, my history becomes linear | 17:01 |
|
| before that, the history is non-linear | 17:02 |
|
| Have I missed something? | 17:02 |
|
j416
| problem solved? | 17:02 |
|
lpapp_
| No, sorry, I am struggling to get it | 17:02 |
|
| and I would like to | 17:02 |
|
| I see a rebase going on, but you say no rebase going on for git rebase -i --keep-base main | 17:02 |
|
j416
| would you state your question again? | 17:02 |
|
lpapp_
| I did git rebase -i origin/main | 17:02 |
|
| and my colleague started complaining that how he can diff now | 17:03 |
|
| after he rewords | 17:03 |
|
| to make sure the code itself has not changed | 17:03 |
|
j416
| diff what to what? | 17:03 |
|
lpapp_
| I suggested to create another branch off from the topic branch that only gets main rebase without rewording | 17:03 |
|
| and diff against that | 17:03 |
|
| but he said, it is much more complex than not changing the base, reword, and then rebase on main | 17:03 |
|
j416
| the commit messages won't appear in the diff | 17:03 |
|
lpapp_
| but I do not know how to do the latter. | 17:03 |
|
| I would like to understand why it is much more complex what I did. | 17:03 |
|
| yes, you are right, commit messages will not appear in the diff. | 17:04 |
|
j416
| so he wants you to first do the reword, then do the rebase onto main? | 17:04 |
|
lpapp_
| we want to make sure we do not change code while integrating into main | 17:04 |
|
| and git diff sounds like a good canditate for that | 17:04 |
|
| we are only aiming to reword | 17:04 |
|
| and squash | 17:04 |
|
j416
| that's difficult, since rebase will by definition re-apply all commits onto a new base, potentially changing something | 17:04 |
|
lpapp_
| I think he thinks that is "much more simpler" | 17:05 |
|
j416
| so you should always verify that the result is correct | 17:05 |
|
lpapp_
| I would like to understand how 1. It is done 2. Why it is much more complex what I did | 17:05 |
|
j416
| how is what done? | 17:05 |
|
lpapp_
| reword the commits done by us in the topic branch, without moving the base to the latest stage of main | 17:05 |
|
j416
| just like I suggested above | 17:06 |
|
lpapp_
| but it does not work for me | 17:06 |
|
j416
| it sounds like your colleague is saying the same thing | 17:06 |
|
lpapp_
| it rewrites the commit history in the git log output | 17:06 |
|
j416
| because it lineariese the history you mean? | 17:06 |
|
lpapp_
| yes, but I believe it will also pull in new commits, surely? | 17:07 |
|
j416
| no | 17:07 |
|
lpapp_
| from main. | 17:07 |
|
j416
| you're not rebasing on main | 17:07 |
|
| "git rebase main" rebases on main | 17:07 |
|
| "git rebase -i $(git merge-base main HEAD)" or "git rebase -i --keep-base main" does not | 17:07 |
|
lpapp_
| git rebase --keep-base main does not actually rebase on main, just linearises the history? | 17:07 |
|
j416
| correct | 17:08 |
|
| you might try your luck with adding --rebase-merges to the latter, to try and keep those as well | 17:08 |
|
| man git-rebase look for --rebase-merges for more info | 17:08 |
|
gitinfo
| the git-rebase manpage is available at https://gitirc.eu/git-rebase.html | 17:08 |
|
lpapp_
| merges should not matter for diff, right? | 17:08 |
|
j416
| merges are regular commits | 17:09 |
|
| they matter | 17:09 |
|
lpapp_
| ? | 17:09 |
|
| They do not bring code changes... | 17:09 |
|
j416
| yes they do | 17:09 |
|
ikke
| They can | 17:09 |
|
lpapp_
| unless there is a conflict resolution, which we do not have. | 17:09 |
|
j416
| the only difference between a merge commit and any other commit is that a merge commit has more than one parent | 17:09 |
|
lpapp_
| but I assume --rebase-merges would not drop code change merges... | 17:09 |
|
| that would be a bit dumb... | 17:09 |
|
j416
| if the merge commit brings in any changes at all from the branch merged in, those will be part of that merge commit | 17:10 |
| ← furrymcgee left | 17:10 |
|
j416
| I'd assume that too, yes. | 17:10 |
|
| it should do the right thing. | 17:10 |
|
| but I have yet to try it. | 17:10 |
|
lpapp_
| ok, so, maybe for next time, I can use git rebase -i --keep-base main | 17:10 |
|
| and once I reworded things, I can do git rebase origin/main? | 17:11 |
|
j416
| yes | 17:11 |
|
lpapp_
| but honestly, I do feel reword should be the last thing | 17:11 |
|
| after the code is settled | 17:11 |
|
j416
| that'll work too | 17:11 |
|
lpapp_
| to me, it is the wrong order to reword, and then, if there is conflict, make code changes, and then potentially reword again | 17:11 |
|
j416
| yep | 17:11 |
|
| makes sense | 17:11 |
|
| since you have merges | 17:12 |
|
| there's a reason you merged something into your branch, and by rebasing (even with --keep-base) those changes will go away and potentially break something | 17:12 |
| ← lgc left | 17:13 |
|
lpapp_
| the only reason was that it was a shared long-lived topic branch multiple devs working in it. | 17:13 |
|
| I was pushing for rebase, but my colleague preferred merge, and I gave in. | 17:13 |
|
| to avoid arguing to eternity :) | 17:13 |
| → lgc joined | 17:13 |
|
lpapp_
| it was just a few of us, so I did not see rebase a big deal instead of merge. | 17:13 |
|
| but that is the only reason why we had merges. | 17:13 |
|
| no conflicts, etc. | 17:13 |
|
j416
| rebase effectively resets to the commit you give it, then cherry-picks each commit one by one, skipping over merge commits | 17:13 |
|
| !backup | 17:14 |
|
gitinfo
| Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups | 17:14 |
|
j416
| then, try it and see™ | 17:14 |
|
| :) | 17:14 |
|
| I often create backup branches when I'm not sure whether I'll need to re-do a rebase or go back to check something | 17:15 |
|
| like, git branch foo-before-rebase | 17:15 |
| spaceplo_ → SpacePlod | 17:15 |
|
j416
| that way I can easily go back to that state if needed | 17:15 |
|
| and if not, I just delete that branch | 17:15 |
| ← ludovicchabant left | 17:16 |
| ← gnoo left | 17:17 |
| ← merpnderp left | 17:17 |
| ← nobody_ left | 17:17 |
| ← lgc left | 17:17 |
| ← christall left | 17:20 |
| ← Pr0phet left | 17:20 |
| → christall joined | 17:21 |
|
lpapp_
| j416: yes, that is what I did | 17:21 |
|
| feature-rebase and feature-rebase-original | 17:21 |
|
| feature-rebase contains the rewording and rebasing | 17:22 |
|
| feature-rebase-original contains the rebase | 17:22 |
|
| and feature is before rebase and rewording | 17:22 |
|
| I feel that my colleague was a bit harsh when he said this is much more complex than it should be as branches are cheap in git. | 17:22 |
|
| and also, well-separated with worktrees as I learnt the other day. | 17:22 |
|
| and when it is only a handful of devs, like 3, I would say, rebase is not too bad in a shared branch either | 17:23 |
|
imMute
| lpapp_: if it's a long lived branch worked on by multiple people? yeah a rebase is going to be more work than a merge. | 17:23 |
|
lpapp_
| since git pull --rebase will adjust automatically based on my experience | 17:23 |
| → Pr0phet joined | 17:23 |
| nomicon_ → nomicon | 17:23 |
|
lpapp_
| imMute: there was no conflict between main and topic | 17:24 |
|
| we work on a fairly separate area that no one else touches | 17:24 |
| ← JayDoubleu left | 17:24 |
|
imMute
| still. just merge and be done with it. | 17:24 |
| → ludovicchabant joined | 17:24 |
|
lpapp_
| ? | 17:24 |
|
| do you mean merge for catchup? | 17:24 |
|
| from main to the feature branch? | 17:25 |
|
imMute
| if that's the whole point of this, yes. | 17:25 |
|
lpapp_
| sure | 17:25 |
| ← jakesyl left | 17:25 |
| ← Manouchehri left | 17:25 |
| ← average left | 17:26 |
| → arxanas joined | 17:26 |
|
arxanas
| How exactly does duplicate commit connection for `git rebase` work? The man-pages suggest that the patch will be skipped if it has the same textual content as any upstream patch, but how does it determine this? Does it compute the patch IDs of all upstream commits and compare them? | 17:27 |
| → jimklimov1 joined | 17:27 |
| ← christall left | 17:28 |
| ← Pr0phet left | 17:28 |
| → Manouchehri joined | 17:29 |
|
bremner
| arxanas: man git-patch-id | 17:29 |
|
gitinfo
| arxanas: the git-patch-id manpage is available at https://gitirc.eu/git-patch-id.html | 17:29 |
| ← randomuser left | 17:29 |
| ← jimklimov left | 17:30 |
| ← cespare left | 17:30 |
| → odoood joined | 17:30 |
| → Pr0phet joined | 17:30 |
|
j416
| arxanas: I don't _think_ it's patch ID (but I may be mistaken, perhaps there are multiple things in place), because it'll also not apply a commit that say, introduces a change that is just _part_ of a commit on which it is being applied. Rather, I think it's git apply or such, seeing that applying it would make no difference. How, I don't know. | 17:31 |
| ← Lyn left | 17:31 |
| → randomuser joined | 17:31 |
|
j416
| lpapp_: note that even though Git says there are no _syntactical_ conflicts, there may be _semantic_ conflicts. | 17:32 |
| ← Manouchehri left | 17:32 |
|
j416
| lpapp_: e.g., branch A depends on a function that was removed in branch B; rebasing branch A on branch B might work just fine syntactically, but the code won't compile because branch A is calling a function that no longer exists. Always check the result after rebasing. | 17:33 |
| ← elichai2 left | 17:33 |
|
imMute
| same thing applies to merging as well. | 17:34 |
| → JayDoubleu joined | 17:34 |
|
j416
| indeed | 17:34 |
| → Manouchehri joined | 17:34 |
|
lpapp_
| yes, agree | 17:34 |
|
| this is being checked | 17:34 |
| ← orbyt left | 17:34 |
|
lpapp_
| thanks for the reassurance. | 17:34 |
|
| it can even be more subtle | 17:35 |
|
| it could compile, but misbehave, isn't it? | 17:35 |
|
j416
| sure. | 17:35 |
| → cespare joined | 17:35 |
| → average joined | 17:35 |
|
j416
| Git doesn't know what your program does. It just merges lines of text. | 17:36 |
| → elichai2 joined | 17:36 |
|
j416
| but it would be cool if it did. | 17:36 |
| → jakesyl joined | 17:37 |
| → merpnderp joined | 17:39 |
| → Duckle joined | 17:39 |
| → lgc joined | 17:40 |
|
lpapp_
| haha :D | 17:43 |
| ← DoofusCanadensis left | 17:48 |
| ← lechner left | 17:48 |
| → sniperwolf joined | 17:49 |
| → lechner joined | 17:51 |
| → christall joined | 17:52 |
| ← arxanas left | 17:52 |
| ← christall left | 18:00 |
| → clime joined | 18:02 |
| ← clime left | 18:02 |
| → bn_work joined | 18:04 |
| → kingjulian joined | 18:05 |
| → gast0n joined | 18:12 |
| ← lgc left | 18:18 |
| → lgc joined | 18:19 |
| ← lgc left | 18:19 |
| → christall joined | 18:20 |
| ← kingjulian left | 18:28 |
| ← sniperwolf left | 18:32 |
| ← odoood left | 18:40 |
| → sniperwolf joined | 18:43 |
| → jetchisel joined | 18:49 |
| → BlessJah joined | 18:49 |
| ← almarwazi left | 18:53 |
| ← mci64 left | 18:56 |
| ← Betal left | 18:56 |
| → mci64 joined | 18:56 |
| ← fnurkla left | 18:56 |
| → Pr0phet_ joined | 18:57 |
| ← Pr0phet left | 18:57 |
| ← ludovicchabant left | 18:57 |
| Pr0phet_ → Pr0phet | 18:57 |
| → ludovicchabant joined | 18:57 |
| ← jakesyl left | 18:57 |
| ← JayDoubleu left | 18:57 |
| → jakesyl joined | 18:58 |
| → Manouchehri_ joined | 18:58 |
| → JayDoubleu joined | 18:58 |
| ← Manouchehri left | 18:58 |
| Manouchehri_ → Manouchehri | 18:58 |
| → Betal joined | 18:59 |
| ← dviola left | 19:01 |
| ← tolot left | 19:01 |
| ← tejr left | 19:06 |
| → tejr joined | 19:07 |
| → SmashingX joined | 19:11 |
| → nvmd joined | 19:12 |
|
SmashingX
| I have an issue in which I had a subdirectory which it was added to the .gitignore file, then I remove it from there and when I enter 'git status' git is still ignoring that path. | 19:12 |
| → j`ey joined | 19:15 |
|
j`ey
| I have commits: A B C D E F, can i easily push A-E to a new repo, while losing all the history from E-F | 19:15 |
|
j416
| j`ey: what do you mean by losing? | 19:16 |
|
j`ey
| basically I have a few commits on top of the linux kernel, and I just want to push my few commits, and then a single big commit for kernel | 19:16 |
|
j416
| j`ey: so you want to push your branch as if it were at D? | 19:17 |
|
j`ey
| (while keeping the history locally..) | 19:17 |
|
| I want to see: A B C D EF(squashed) | 19:17 |
|
j416
| you want to squash E and F into one commit and then push the result? | 19:17 |
|
j`ey
| as if I first checkout out the kernel with --depth 1, and put my changes on top | 19:17 |
| ← randomuser left | 19:20 |
| → randomuser joined | 19:21 |
| → orbyt joined | 19:22 |
|
j`ey
| hmm, maybe I can make a new branch, and then git pull --depth N ? | 19:26 |
| ← austin987 left | 19:26 |
|
SmashingX
| is there anybody that knows why git is still ignoring a path? | 19:27 |
|
dodo
| SmashingX: are files inside the dir? | 19:28 |
|
ikke
| git check-ignore -v <path> | 19:30 |
| → cvmn joined | 19:33 |
| → rwp joined | 19:34 |
|
SmashingX
| ikke: git check-ignore -v wp-content/themes/terrachips/lib/ | 19:35 |
|
| I did this and I got nothing back | 19:36 |
|
ikke
| ls -al wp-content/themes/terrachips/lib/ | 19:36 |
| → absc joined | 19:36 |
|
SmashingX
| ikke: I got a bunch of php files listed | 19:36 |
|
ikke
| and git ls-files wp-content/themes/terrachips/lib/ | 19:37 |
|
SmashingX
| ups | 19:37 |
|
| ops it was a different directory | 19:37 |
|
| git check-ignore -v wp-content/themes/terrachips/dist | 19:37 |
|
| wp-content/themes/terrachips/.gitignore:3:dist wp-content/themes/terrachips/dist | 19:37 |
|
| oh so there's another .gitignore? | 19:38 |
|
ikke
| yes | 19:38 |
|
SmashingX
| wth | 19:38 |
|
| I didn't know you can have more than 1 .gitignore | 19:38 |
|
ikke
| You can have one in every directory | 19:38 |
|
SmashingX
| dang, now I have to do a search for every .gitignore in the repo. Ok thank you so much | 19:39 |
|
| and then I think I have to do something after I remove the .gitignore contents or the file, right? | 19:39 |
|
ikke
| find -name .gitignore | 19:39 |
|
SmashingX
| I think I have to clear the cache or just commiting the file and pushing will do? | 19:40 |
| → austin987 joined | 19:40 |
|
ikke
| There is no cache to clear | 19:40 |
| ← average left | 19:41 |
|
SmashingX
| so the steps are, delete the .gitignore file, commit and push, then if I do git status would do it? | 19:41 |
| ← j`ey left | 19:41 |
|
SmashingX
| Ok, I should try it first. | 19:41 |
|
| Thank you ikke! | 19:41 |
|
ikke
| yw | 19:42 |
|
SmashingX
| oh I just did 'git rm path to the .gitignore file' and I haven't even commited but I checked the status and the paths that the .gitignore file was trying to ignore are now showing up as new. | 19:43 |
| ← absc left | 19:44 |
|
ikke
| good | 19:44 |
|
| that's expectec | 19:45 |
| → lavos joined | 19:46 |
|
SmashingX
| so what 'git check-ignore -v' tells you is what .gitignore file is making that path to be ignored? | 19:46 |
|
| and the location of that .gitignore file | 19:47 |
| ← molt left | 19:47 |
|
ikke
| correct | 19:47 |
| → absc joined | 19:47 |
|
SmashingX
| TIL | 19:47 |
|
| sorry git for swearing at you. | 19:48 |
| ← pizdets_ left | 19:49 |
| → pizdets joined | 19:50 |
| → odoood joined | 19:53 |
|
SmashingX
| if a .gitignore file has in its contents a path that starts with a '/' means that git will ignore that path at root? | 19:53 |
|
ikke
| yes | 19:54 |
|
| well | 19:54 |
| → arxanas joined | 19:54 |
|
ikke
| relative to that .gitignore file | 19:54 |
| ← natrys left | 19:54 |
|
ikke
| a .gitignore file in a subdirectory cannot affect anything outside of that directory | 19:55 |
|
arxanas
| bremner: I've seen the documentation on patch IDs, but it's not said where it's used it, if anywhere, and I want to know if it's used specifically in `git rebase` at present. The man-pages make is sound like it is, but I don't see anything in the source code to back that up. Is the documentation out of date? Is there someone who knows who I can | 19:55 |
|
| ask? | 19:55 |
| ← bam32 left | 19:55 |
|
SmashingX
| gotcha | 19:55 |
|
| that's clear | 19:55 |
|
Nomikos
| what happens if you `git add .git`? | 19:55 |
|
ikke
| Nomikos: nothing, git will ignore it | 19:55 |
|
Nomikos
| awww | 19:56 |
| ← absc left | 19:57 |
|
arxanas
| j416: I think in those case, it just attempts to apply the patch, and if it results in an empty commit, it skips it (unless configured otherwise). But I'm curious about specifically the patch ID mechanism | 19:57 |
| → absc joined | 19:57 |
| ← daoudr left | 19:57 |
| ← randomuser left | 19:58 |
|
bremner
| arxanas: dunno. When I was building a rebase-like-thing, I started with patch-ids, but then ended up doing trial application | 19:58 |
|
arxanas
| I have trial application, I'm just trying to match the behavior of Git, but computing patch IDs on large repos can end up taking quite a while if your branch is stale | 19:59 |
|
SmashingX
| Nomikos: Just curious, why do you want to add it? | 20:01 |
|
ikke
| arxanas: that's something I've wondered about myself before, and at some point, I just came to accept it kind of just meant skipping empty patches, but not sure if this is some old documentation or not | 20:01 |
|
Nomikos
| SmashingX: I like testing things to see if they will or will not break like that | 20:02 |
|
| and if they do break, if there will be shiny glitter shards all over the place | 20:02 |
|
| like some version 1 compact discs, you ever bend one of those outward to their breaking point? | 20:03 |
|
SmashingX
| In my mind there isn't a situation where that might be necessary. | 20:03 |
|
Nomikos
| well, no, not "necessary" | 20:03 |
| ← kurtthemaker left | 20:04 |
|
Nomikos
| it's just a "what if" experiment | 20:04 |
| → randomuser joined | 20:05 |
|
ikke
| Nomikos: the low-hanging fruit should be long gone | 20:05 |
| → kurtthemaker joined | 20:06 |
|
SmashingX
| I don't understand the analogy but well. | 20:06 |
|
ikke
| what analogy? | 20:07 |
|
| low-hanging fruit? | 20:07 |
|
SmashingX
| about the fruit | 20:07 |
|
| yup | 20:07 |
|
ikke
| It's an idiom | 20:07 |
|
arxanas
| ikke: the trouble is that if it's *just* skipping empty patches, then if you try something like commit A, revert A, and then rebase A again onto that branch, then A doesn't get applied a second time. I don't see why that would happen without a patch ID deduplication mechanism. Or maybe I'm just misunderstanding something about how the merge | 20:07 |
|
| happens? | 20:07 |
|
| ^ in the above case, I would expect A to apply again, instead of being skipped, because it should no longer produce an empty patch | 20:07 |
|
ikke
| SmashingX: low-hanging fruit is easy to pick | 20:07 |
|
SmashingX
| lmgt | 20:07 |
|
| what is that actually mean in this case with what Nomikos is doing? | 20:08 |
|
ikke
| SmashingX: trying to add / track .git is fairly basic | 20:08 |
|
Nomikos
| adding the .git directory to the .git directory is something not intended, but easily done - but also easily prevented | 20:09 |
|
ikke
| (in the sense of looking for things that break | 20:09 |
|
SmashingX
| basic but also useless I think | 20:09 |
|
| ikke: got it | 20:09 |
| ← enoq left | 20:09 |
|
Nomikos
| it's like an OS preventing you from copying a directory into itself, or a browser preventing html frames from loading themselves | 20:09 |
|
| *framesets | 20:09 |
| ← theoceaniscool left | 20:10 |
| ← randomuser left | 20:10 |
|
SmashingX
| ok, I just should get back to keep fighting with my .gitignore files, sorry Nomikos. | 20:10 |
|
Nomikos
| SmashingX: no apologies needed, good luck :-) | 20:11 |
| → m0viefreak joined | 20:12 |
| ← Murr left | 20:13 |
| → Murr joined | 20:14 |
| ← gh34 left | 20:14 |
| → theoceaniscool joined | 20:21 |
| → anton joined | 20:22 |
| ← cvmn left | 20:25 |
| ← caveman left | 20:25 |
| ← anton left | 20:26 |
| → bambanxx joined | 20:27 |
| → nobody_ joined | 20:28 |
| → anton joined | 20:28 |
| ← reprazent left | 20:29 |
| ← anton left | 20:30 |
| → reprazent joined | 20:31 |
| → Narrat joined | 20:36 |
| ← odoood left | 20:38 |
| → kingjulian joined | 20:39 |
| ← tejr left | 20:39 |
| → wootehfoot joined | 20:39 |
| → odoood joined | 20:40 |
| → tejr joined | 20:41 |
| ← vysn left | 20:43 |
| ← trace1918 left | 20:51 |
| ← sniperwolf left | 20:53 |
| → __jmcantrell__ joined | 20:53 |
| ← absc left | 20:57 |
|
circuitbone
| i start with a template https://github.com/github/gitignore SmashingX | 21:00 |
|
ikke
| I just ignore the things I need to ignore | 21:01 |
| ← durham left | 21:02 |
| ← lavos left | 21:05 |
| → molt joined | 21:05 |
| ← ash_worksi left | 21:12 |
| ← malteger left | 21:16 |
| → malteger_ joined | 21:16 |
| ← EvilDMP left | 21:21 |
| → ash_worksi joined | 21:25 |
| → lavos joined | 21:29 |
| ← lavos left | 21:29 |
| → lavos joined | 21:30 |
| ← molt left | 21:33 |
| ← bambanxx left | 21:35 |
| → jmcantre1 joined | 21:36 |
| ← __jmcantrell__ left | 21:39 |
| → __jmcantrell__ joined | 21:40 |
| → jmcantre2 joined | 21:42 |
| ← jmcantre1 left | 21:43 |
| → pretty_dumm_guy joined | 21:43 |
| ← __jmcantrell__ left | 21:45 |
| ← lpapp_ left | 21:49 |
| ← lavos left | 21:50 |
|
SmashingX
| circuitbone: nice templates! thank you for sharing! | 21:55 |
|
circuitbone
| welcome SmashingX | 21:57 |
|
| I used the toptal generator before that https://www.toptal.com/developers/gitignore | 21:58 |
| → humanface joined | 22:02 |
| → __jmcantrell__ joined | 22:03 |
| ← m0viefreak left | 22:06 |
| ← jmcantre2 left | 22:06 |
| ← mci64 left | 22:06 |
| ← wootehfoot left | 22:08 |
| ← kingjulian left | 22:09 |
| → anton joined | 22:10 |
| → jmcantre1 joined | 22:11 |
| ← Murr left | 22:13 |
| ← frobnic left | 22:13 |
| → Murr joined | 22:13 |
| → frobnic joined | 22:13 |
| ← junktext left | 22:13 |
| ← __jmcantrell__ left | 22:15 |
| ← Arokh left | 22:15 |
| → lpapp_ joined | 22:15 |
| → Arokh joined | 22:16 |
| → ferdna joined | 22:16 |
| ← christall left | 22:18 |
| → __jmcantrell__ joined | 22:22 |
| ← __jmcantrell__ left | 22:22 |
| ← AnAverageHuman left | 22:23 |
| ← jimklimov1 left | 22:23 |
| ← jmcantre1 left | 22:25 |
| → Xenguy joined | 22:29 |
| ← Narrat left | 22:29 |
| → AnAverageHuman joined | 22:29 |
| ← AnAverageHuman left | 22:34 |
| → AnAverageHuman joined | 22:39 |
| → BlessJah_ joined | 22:44 |
| ← BlessJah left | 22:47 |
| → __jmcantrell__ joined | 22:48 |
| → debsan joined | 22:48 |
| ← LuxuryMode left | 22:49 |
| ← Duckle left | 22:56 |
| → Duckle joined | 22:58 |
| ← humanface left | 22:59 |
| → jmcantre1 joined | 23:03 |
| jmcantre1 → jmcantrell | 23:04 |
| ← theoceaniscool left | 23:05 |
| ← __jmcantrell__ left | 23:06 |
| → christall joined | 23:08 |
| ← dermato left | 23:09 |
| → dermato joined | 23:12 |
| ← reprazent left | 23:13 |
| → reprazent joined | 23:16 |
| ← christall left | 23:16 |
| ← Raguile left | 23:17 |
| → christall joined | 23:21 |
| ← christall left | 23:22 |
| ← reprazent left | 23:23 |
| → christall joined | 23:23 |
| ← shokohsc left | 23:23 |
| ← SuperLag left | 23:24 |
| → reprazent joined | 23:24 |
| → shokohsc joined | 23:24 |
| → __jmcantrell__ joined | 23:25 |
| ← christall left | 23:27 |
| ← jmcantrell left | 23:29 |
| ← dermato left | 23:32 |
| ← arxanas left | 23:33 |
| ← pretty_dumm_guy left | 23:34 |
| → dermato joined | 23:35 |
| → christall joined | 23:35 |
| → jmcantrell joined | 23:37 |
| ← skapate left | 23:37 |
| ← christall left | 23:39 |
| ← __jmcantrell__ left | 23:40 |
| ← PinealGl1ndOptic left | 23:41 |
| ← Misotauros left | 23:46 |
| → Misotauros joined | 23:47 |
| → jstein joined | 23:48 |
| → mrteals joined | 23:48 |
| ← rossome left | 23:48 |
| ← orbyt left | 23:48 |
| → wgrant joined | 23:48 |
| → rossome joined | 23:49 |
| ← treefrob left | 23:55 |
| ← xx left | 23:56 |
| ← frobnic left | 23:57 |
| → treefrob joined | 23:57 |