IRCloggy #git 2024-10-22

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.

2024-10-22

← twice left00:00
→ twice joined00:00
→ cabazon joined00:14
cabazon Hi, I'm trying to apply a cherry-pick and it fails with "fatal: cherry-pick failed". Then I do git status and it shows bunch of red files marked as 'deleted' or 'modified'. At the same time, I cannot abort that cherry-pick and I don't see any conflicts. What is happening? I'm not sure how to resolve it.00:15
→ swamp_ joined00:23
← cabazon left00:24
← swamp_ left00:24
→ swamp_ joined00:25
← swamp_ left00:25
→ swamp_ joined00:26
← zmt01 left00:27
← gsi_ left00:30
→ gsi joined00:32
→ yxt joined00:36
← memset left00:36
→ memset joined00:36
← yxt left00:43
→ Tobbi joined00:46
← shalok left00:47
s17 I'm seeing --quit and --abort as flags which could be passed00:47
`man git-cherry-pick`00:47
gitinfo the git-cherry-pick manpage is available at https://gitirc.eu/git-cherry-pick.html00:47
s17 oh I see you cannot abort, ok00:48
and he's not here, even better00:48
→ shalok joined00:48
→ yxt joined00:49
← Tobbi left00:52
→ austin_ joined00:54
← austin_ left00:56
← austin987 left00:57
→ ferdna__ joined01:01
← ptrck5456 left01:02
→ ptrck5456 joined01:02
← ferdna_ left01:03
← pac1 left01:15
→ Gary_Sinise joined01:22
← ferdna__ left01:30
← umbramalison left01:30
← afdee1c_ left01:30
→ umbramalison joined01:30
← FreeBDSM left01:45
→ travisghansen4 joined01:47
← travisghansen left01:48
travisghansen4 → travisghansen01:48
→ pks_ joined02:19
← pks left02:20
pks_ → pks02:20
→ limon joined02:21
→ hbautista_ joined02:26
← very_sneaky left02:27
→ very_sneaky joined02:29
← alexherbo2 left02:39
← Xaldafax left02:45
← akibageek left02:50
← jas_ left02:55
→ jas joined02:59
→ akibageek joined03:04
→ kaartic joined03:13
← kaartic left03:22
← dlh404 left03:22
← intelfx left03:23
→ joako_ joined03:24
← joako left03:25
← ChmEarl left03:29
← gast0n left03:31
→ intelfx joined03:35
→ kaartic joined03:37
→ chilversc joined03:39
← skapata left03:43
← way_of_UwU left03:46
← insidesources left03:49
→ ryuu joined03:58
→ unlucy joined04:00
← kaartic left04:00
gsish guess the information that was before the "failed" summary is missing, and the "cannot abort" was just a claim while it's uncertain whether it's really the case (why would abort NOT be available?)04:01
ryuu Hello, I tried to setup branch on each existing git submodule by editing the .gitmodules file and add branch entry on each sub module. I've need to confirm if this is applied properly by clone the repository04:02
and after finish clone with git clone --recurse-submodules [email@hidden.address]04:02
there's an issue with bash-config submodule, the head was detached from branch but I'm not sure the cause, can someone give me a hint to fix this? thanks!04:02
I think it's not detached, but the branch is not present at all in the first place: http://0x0.st/XlU5.txt04:06
← lllh left04:09
→ llh joined04:09
ryuu alright, it seems the culprit is git index? solved by git rm --cached path_to_submodule04:21
← FH_thecat left04:39
← Gary_Sinise left04:46
ryuu hmm but even tho I already add branch to the .gitsubmodules, the repository still demand to the user to commit if submodules commit sha changed? http://0x0.st/Xl0m.txt04:50
I mean, .gitmodules04:50
I thought if the branch entry is specified in the .gitmodules it will not track changes on commit sha of submodules? http://0x0.st/Xl0B.txt04:51
→ jmd joined05:00
← gildasio left05:10
→ gildasio joined05:12
← akibageek left05:13
→ rosco joined05:13
→ jinsun joined05:14
→ oxy290 joined05:17
← oxy290 left05:17
→ oxy290 joined05:17
← Oxymoron290 left05:18
← Oxymoron left05:18
→ Oxymoron joined05:19
← iomari891 left05:20
→ FH_thecat joined05:20
→ kale joined05:23
→ user_oreloznog joined05:28
← indy left05:36
← jas left05:39
→ akibageek joined05:45
→ insidesources joined05:46
← ahsb left05:48
→ Chaser joined05:55
→ rfuentess joined05:58
← osc4rpt left05:59
← uco left06:14
→ uco joined06:17
→ osc4rpt joined06:23
← larryv left06:29
← hbautista_ left06:37
→ duxsco joined06:44
→ gandhibobandhi_ joined06:50
→ gandhibobandhi__ joined06:52
← gandhibobandhi_ left06:56
→ Sazhen86 joined06:59
→ john_johnk joined07:00
→ duxsco_ joined07:02
← Chaser left07:03
→ duxco joined07:03
→ x_x joined07:04
← duxsco left07:04
← duxsco_ left07:07
← rosco left07:09
→ rosco joined07:09
→ becm joined07:12
→ Azin joined07:15
→ Chaser joined07:18
→ peirik_ joined07:21
→ anakimluke joined07:24
← Sazhen86 left07:24
← anakimluke left07:25
→ anakimluke joined07:26
← x_x left07:26
→ x_x joined07:26
← jmd left07:29
← Chaser left07:38
← Lord_of_Life left07:39
← anakimluke left07:42
→ Lord_of_Life joined07:42
→ Sazhen86 joined07:53
← Betal left07:59
← duxco left08:00
→ warmana joined08:02
← PortableDave left08:04
→ duxsco joined08:04
→ PortableDave joined08:05
← shalok left08:05
← duxsco left08:05
← germ_ left08:09
→ RiFo joined08:09
→ peirik__ joined08:17
← lolok left08:17
→ Chaser joined08:20
← peirik_ left08:20
→ belsirk joined08:30
← rfuentess left08:32
→ oxymoron93 joined08:35
← lojik left08:37
→ germ joined08:38
belsirk → rfuentess08:39
→ spareproject joined08:40
← kurahaupo left08:42
← Sazhen86 left08:42
→ Sazhen86 joined08:47
← Sazhen86 left09:00
← gildasio left09:04
→ gildasio joined09:06
← PortableDave left09:07
← gildasio left09:10
→ gildasio joined09:10
→ duxsco joined09:13
→ obrien joined09:16
→ KnoP joined09:17
→ dxmann joined09:19
← spareproject left09:19
← obrien left09:24
← peirik__ left09:25
→ op joined09:28
← op left09:29
→ npc joined09:29
← npc left09:34
→ spareproject joined09:34
→ t0mm13b_ joined09:35
← intelfx left09:36
← t0mm13b left09:37
→ CrunchyFlakes joined09:37
← spareproject left09:42
← Azin left09:43
→ Azin joined09:44
← chuanshi left09:44
← dxmann left09:46
← CrunchyFlakes left09:48
→ PortableDave joined09:50
→ peirik_ joined09:52
→ lojik joined09:52
→ antranigv_ joined09:53
← antranigv left09:53
→ CrunchyFlakes joined09:54
← peirik_ left09:57
← so-offish left10:05
→ so-offish joined10:06
→ dxmann joined10:10
→ myme joined10:12
→ spareproject joined10:13
ryuu alright, maybe it was intended in the first place?10:16
← oxymoron93 left10:22
→ peirik_ joined10:24
→ Xaldafax joined10:28
← antranigv_ left10:31
← crabbedhaloablut left10:36
→ afdee1c_ joined10:36
→ antranigv joined10:38
→ crabbedhaloablut joined10:38
→ bluesmonk joined10:42
← bluesmonk left10:42
→ bluesmonk joined10:42
← crabbedhaloablut left10:48
→ crabbedhaloablut joined10:50
→ alexherbo2 joined11:00
→ oxymoron93 joined11:03
→ stolen joined11:09
→ Betal joined11:12
← spareproject left11:14
← Azin left11:15
→ obrien joined11:16
→ donofrio joined11:24
← yxt left11:31
← obrien left11:32
→ olspookishmagus joined11:37
olspookishmagus is there a way to parse/convert the date/time format used in git log to another format?11:38
for example: "Thu Aug 17 18:07:40 2023 +0200"11:38
ikke A command like git log accepts the `--date` argument, which allows you to specify a format11:39
olspookishmagus oh thank you ikke11:43
← rhe left11:44
→ rhe joined11:45
olspookishmagus I should've checked man git-log instead of checking man git11:47
gitinfo the git-log manpage is available at https://gitirc.eu/git-log.html11:47
the git manpage is available at https://gitirc.eu/git.html11:47
olspookishmagus tickles gitinfo11:47
→ duxsco_ joined11:49
← PortableDave left11:50
← duxsco left11:52
← Xaldafax left11:52
→ yxt joined11:53
→ FreeBDSM joined12:04
→ dlh404 joined12:10
→ iomari891 joined12:12
→ Azin joined12:16
← yxt left12:18
→ bin101 joined12:21
← donofrio left12:25
← memset left12:25
→ memset joined12:25
→ Azin_authenticat joined12:27
→ cdown joined12:30
← Oblomov left12:30
← m1dnight left12:30
→ m1dnight joined12:31
← Azin left12:31
← peirik_ left12:33
→ theyneversleep joined12:36
→ OnkelTem joined12:40
← duxsco_ left12:42
→ duxsco joined12:43
→ peirik_ joined12:45
→ davispuh joined12:46
← makara1 left12:47
→ makara joined12:48
← peirik_ left12:49
← kale left12:50
← m1dnight left12:51
→ becm1 joined12:57
→ m1dnight joined12:57
→ pasky joined12:57
→ donofrio joined12:59
← becm left12:59
becm1 → becm12:59
← alexherbo2 left12:59
→ alexherbo2 joined13:00
→ becm1 joined13:03
← becm left13:05
becm1 → becm13:05
← memset left13:06
→ memset joined13:07
← alexherbo2 left13:10
→ alexherbo2 joined13:10
← dxmann left13:10
→ Oblomov joined13:12
→ peirik_ joined13:15
← john_johnk left13:18
← YuGiOhJCJ left13:21
← pasky left13:21
← peirik_ left13:23
← afdee1c_ left13:33
→ becm1 joined13:34
→ peirik_ joined13:34
→ pasky joined13:36
Betal if I have a fork/branch, and 'main' get a history rewrite, how I can sync my branch back, to new main?13:38
← becm left13:38
becm1 → becm13:38
← stolen left13:38
← peirik_ left13:39
← Azin_authenticat left13:42
→ Azin joined13:43
ikke Does git log --oneline main.. (including dots) return just the commits from your branch?13:45
Make sure your local main is up-to-date13:45
Betal ikke: I should run `git log --oneline main..` with old or new main? by "local main up-to-date" I guess it is the new main13:57
→ peirik_ joined13:57
→ celmor joined13:57
← peirik_ left14:02
ikke Correct14:03
← peirik left14:08
→ peirik joined14:09
← bin101 left14:10
← kjartan left14:11
← alexherbo2 left14:12
→ alexherbo2 joined14:12
→ peirik_ joined14:14
→ afdee1c_ joined14:14
→ john_johnk joined14:15
← flowinho left14:15
→ flowinho joined14:15
← alexherbo2 left14:16
→ kjartan joined14:16
← peirik_ left14:19
→ alexherbo2 joined14:20
→ skapata joined14:20
→ jensen1 joined14:20
→ hwpplayer1 joined14:22
← duxsco left14:24
→ techietrash joined14:24
← CrunchyFlakes left14:26
← jensen1 left14:26
→ dxmann joined14:26
← itsuki left14:27
→ itsuki joined14:28
→ CrunchyFlakes joined14:31
← donofrio left14:31
← rfuentess left14:37
→ jensen1 joined14:41
jensen1 → akdn14:41
← dsimic left14:42
→ newpy joined14:43
→ dsimic joined14:44
← dxmann left14:45
ZLima12 Betal: I would say rebasing is what makes the most sense since they rewrote history too14:45
→ kurahaupo joined14:46
→ bin101 joined14:46
ZLima12 `git rebase --onto <new_main> <old_main> <your_branch>`14:46
Should work for simple branches14:47
→ peirik_ joined14:47
→ jfsimon1981_b joined14:51
← bin101 left14:51
← peirik_ left14:52
← jfsimon1981 left14:53
← itsuki left14:56
→ itsuki joined14:57
→ crossby1004 joined14:58
→ bin101 joined14:58
Betal ZLima12: it will be starting 150+ commits back, removing stuff that were not supose to be there, I even wonder if it easier to restart the repo from last commit and delete what shouldn't be there, but I didn't want to lose history15:03
← itsuki left15:04
← celmor left15:04
→ itsuki joined15:04
ZLima12 Betal: did you merge anything into your branch?15:05
If you only made commits, it should work15:05
← itsuki left15:06
→ itsuki joined15:07
← ackyshake left15:11
Betal ZLima12: my last comment was more about main main, main merged a lot of stuff, other branchs didn't, I first need to rewrite main (so Iam planning the impact it will have)15:12
→ Left_Turn joined15:14
→ Turn_Left joined15:16
→ Tobbi_ joined15:19
→ peirik_ joined15:19
← itsuki left15:19
→ itsuki joined15:19
← Left_Turn left15:19
← bin101 left15:21
← peirik_ left15:24
← rhe left15:24
→ rhe joined15:27
→ ___nick___ joined15:28
← oxymoron93 left15:29
→ bin101 joined15:30
→ duxsco joined15:30
→ ChmEarl joined15:32
← ___nick___ left15:33
→ ___nick___ joined15:35
← ___nick___ left15:36
→ ___nick___ joined15:38
→ Vonter_ joined15:39
← Vonter left15:39
→ shalok joined15:39
← hwpplayer1 left15:42
← gandhibobandhi__ left15:44
← Vonter_ left15:55
→ Vonter joined15:56
← Vonter left15:56
← itsuki left15:57
→ Vonter joined15:57
← alexherbo2 left15:57
→ itsuki joined15:57
→ alexherbo2 joined15:57
→ jmd joined15:59
← bin101 left16:00
→ donofrio joined16:07
← memset left16:07
→ memset joined16:07
← dlh404 left16:09
← jfsimon1981_b left16:10
→ hwpplayer1 joined16:10
→ jfsimon1981 joined16:10
→ dlh404 joined16:11
→ so-offishul joined16:12
← theyneversleep left16:14
→ op joined16:14
← so-offish left16:15
← john_johnk left16:16
← gnoo left16:17
← m1dnight left16:18
← jfsimon1981 left16:18
→ jfsimon1981 joined16:18
← jinsun left16:18
→ gnoo joined16:20
← so-offishul left16:22
→ bin101 joined16:25
← alexherbo2 left16:27
← P1ro left16:28
→ hbautista_ joined16:32
→ puff joined16:32
← Tobbi_ left16:33
← bin101 left16:35
← x_x left16:37
→ MyLifeIsAMistake joined16:37
→ x_x joined16:37
← itsuki left16:38
→ itsuki joined16:38
→ oxymoron93 joined16:48
← warmana left16:49
→ lllh joined16:51
→ crossby1004_ joined16:53
→ wootehfoot joined16:53
← crossby1004_ left16:55
← llh left16:55
← Celelibi left16:58
← donofrio left16:59
← hbautista_ left16:59
→ donofrio joined17:00
→ Celelibi joined17:01
← insidesources left17:01
→ Tobbi_ joined17:02
→ insidesources joined17:03
→ hdh joined17:04
← cmc left17:04
→ cmc joined17:04
← Azin left17:09
→ Left_Turn joined17:10
← Tobbi_ left17:11
← Turn_Left left17:12
→ Azin joined17:13
← oxymoron93 left17:18
← Azin left17:18
ZLima12 Betal: What do you mean by main main?17:19
→ intelfx joined17:21
← rosco left17:25
→ bin101 joined17:27
← afdee1c_ left17:30
Betal ZLima12: the master's main, the one that other branchs will need to rebase to17:30
oxy290 "default branch" is the term you are looking for I think17:30
→ James0r joined17:31
ZLima12 Are you saying that you have a fork of the whole repo? So there's 1) Upsteam's main branch, 2) your own main branch, and 3) your separate feature branch?17:31
oxy290 what is the output of `git branch -a`17:33
← randm left17:34
→ randm joined17:34
← jmd left17:38
← memset left17:39
→ memset joined17:40
← jfsimon1981 left17:49
← kjartan left17:51
← bin101 left17:53
→ kaartic joined17:56
← cmc left18:03
→ cmc joined18:03
← fundatillus left18:05
← iomari891 left18:05
← kaartic left18:17
← haritz left18:19
← cmc left18:19
→ cmc joined18:20
→ haritz joined18:21
← MyLifeIsAMistake left18:22
← haritz left18:22
→ haritz joined18:22
→ MyLifeIsAMistake joined18:23
→ fundatillus joined18:26
← peirik left18:26
→ Turn_Left joined18:27
← rainn92675560720 left18:30
→ john_johnk joined18:31
← Left_Turn left18:31
→ rainn92675560720 joined18:32
→ oxymoron93 joined18:36
→ Sazhen86 joined18:37
→ Azin joined18:39
→ kale joined18:40
→ marc2377 joined18:47
→ iomari891 joined18:49
Betal ZLima12, oxy290: I need to edit upstream main, the first question was about how others forks would resync after-edit. The 2nd question is about if there is a recommended way to edit history (I know the recommended is "don't"), if I should keep editting the commits and solving all conflicts until last commit18:56
→ larryv joined18:59
← oxymoron93 left19:00
← szkl left19:00
→ peirik joined19:00
← Azin left19:09
→ intelfx_ joined19:10
intelfx_ Hey.19:11
Is there a reasonable way of adding a submodule or a subtree _with multiple different paths to different subtrees of the child repository_?19:11
E.g. suppose I have a "parent" repo and a "child" repo, and I want to graft "child" onto "parent" such that "<child>/src" becomes "<parent>/src/child", AND "<child>/include" becomes "<parent>/include/child".19:11
Is this somehow possible short of splitting/joining two separate git-subtrees?19:11
Betal: I didn't see the entire discussion, but do I understand correctly that you basically want to rewrite history (interactive rebase or similar) of a published branch?19:11
← intelfx left19:11
→ bin101 joined19:13
← hwpplayer1 left19:14
intelfx_ → intelfx19:15
→ so-offish joined19:18
← peirik left19:26
→ alexherbo2 joined19:29
→ m1dnight joined19:34
← bin101 left19:35
← op left19:36
← duxsco left19:36
← m1dnight left19:40
→ m1dnight joined19:43
→ snoriman joined19:44
snoriman hey, this is a bit off-topic, but maybe someone here knows this; when I use `git log` on my development PC (linux) it works fine; showing colors, but when I do this on another server (linux, same os), I see ESC codes. I've never configured anything regarding this (at least not that I can remember) and curious why I'm getting ESC codes?19:45
selckin https://raw.githubusercontent.com/pablopunk/colortest/master/colortest19:47
snoriman selckin: thanks, though all other apps work fine19:48
I do see that the pager uses this: `LESS=--ignore-case --status-column --window=4`19:48
ikke snoriman: You want -R in there19:49
selckin unset LESS; ./colortest | less19:50
→ bin101 joined19:50
ikke ./colortest | env -u LESS less19:50
snoriman when I just run the colortest it works fine; when I pipe it through less I see escape codes19:51
selckin add -R as ikke said19:51
snoriman did that, didn't work19:52
`unset LESS` did work19:52
selckin try -RX19:54
← bin101 left19:56
snoriman I'm going to remove the LESS= from my .bashrc, I can't remember putting it in there and I never used the options in there19:56
ikke The default that git uses if LESS is not set is FRSX19:56
← john_johnk left19:56
ikke Oh, no S nowadays19:57
LESS=-FRX19:57
← FreeBDSM left19:59
← Ishmael left20:01
→ ferdna joined20:03
← ___nick___ left20:04
← bn_work left20:04
← Juest left20:09
→ Juest joined20:10
→ bin101 joined20:12
← Gallimaufry left20:12
← iomari891 left20:15
→ cabazon joined20:17
→ bn_work joined20:17
cabazon Hey, I'm doing cherry-pick that fails with 'fatal: cherry-pick failed' but then git status shows no conflicts. Git status only shows bunch of files as deleted and modified but not actual conflicts. What's going on?20:17
ikke No other errors?20:18
→ iomari891 joined20:19
← lllh left20:19
← wootehfoot left20:20
→ Ishmael joined20:21
selckin google says that can happen if both creates files that aren't in the base20:23
cabazon look, https://i.imgur.com/Nd9LPmP.png20:23
← bin101 left20:23
cabazon I tried opening the files listed but none show any conflicts20:23
and I cannot --abort nor --continue the cherry-pick either20:23
this is kernel cherry-pick (backport from v6.8 to v5.15)20:24
and this is the actual commit I'm trying to cherry-pick - https://git.samba.org/?p=sfrench/kernel-smb3;a=commit;h=e4624435f38b34e7ce827070aa0f8b533a37c07e20:26
as you can see, it renames bunch of files20:26
← Chaser left20:29
→ peirik joined20:29
→ peirik_ joined20:32
cabazon selckin can you elaborate? How can both create files that aren't in the base?20:35
← kale left20:36
← peirik_ left20:37
← ferdna left20:39
← plantroon left20:43
→ bin101 joined20:44
selckin been able to reproduce this https://paste.mozilla.org/Xwpv1xij cherry-pick and edit to a new file20:46
← bin101 left20:46
→ plantroon joined20:48
← bluesmonk left20:50
← Juest left20:50
→ bluesmonk joined20:51
→ Juest joined20:51
→ somedude joined20:56
cabazon selckin that's different. When I do git cherry-pick test on your example, I get 'error: could not apply ad4d03b... modified file2'20:59
and git status shows 'deleted by us: file2'20:59
moreover, in your example I'm in the middle of cherry-pick so I can --abort and I can --continue21:00
in my example, the cherry-pick is not in progress21:01
→ bin101 joined21:01
cabazon also, in my example git creates bunch of ~HEAD files21:01
← bin101 left21:04
→ YuGiOhJCJ joined21:10
← intelfx left21:14
→ intelfx joined21:16
← th3voic3 left21:18
← memset left21:18
→ th3voic3 joined21:20
→ ghost43_ joined21:23
← ghost43 left21:23
→ llh joined21:25
→ PortableDave joined21:27
→ Tobbi_ joined21:30
← sihloo left21:32
→ afdee1c_ joined21:33
← becm left21:35
← somedude left21:39
← James0r left21:41
← user_oreloznog left21:49
← Tobbi_ left21:50
← omero left21:50
→ omero joined21:51
← donofrio left21:53
← crossby1004 left22:00
← adamtajti left22:04
→ Tobbi joined22:04
← x_x left22:05
→ adamtajti joined22:05
b0nn cabazon: can your mergetool see the two files?22:08
← germ left22:10
cabazon git mergetool says 'no files need merging'22:10
→ germ joined22:11
← afdee1c_ left22:12
← iomari891 left22:16
→ dudek joined22:22
← YuGiOhJCJ left22:29
cabazon b0nn have you ever seen a weird cherry-pick like that? I have no clue how to handle it22:39
→ bin101 joined22:45
→ pac1 joined22:47
← davispuh left22:48
pac1 What can and cannot be done with a worktree. I want to create a worktree on my bare repository, which has some branch set as the default. Can I rebase the worktree on some other branch if there are no worktrees associated with the other branch?22:54
← alexherbo2 left23:00
→ mefistofeles joined23:06
← Karyon_ left23:11
→ Karyon joined23:12
← apathor left23:17
→ apathor joined23:19
← dudek left23:20
→ iomari891 joined23:20
← darkbit left23:38
← Turn_Left left23:40
→ ackyshake joined23:45
→ BK- joined23:48
← ackyshake left23:49
← MyLifeIsAMistake left23:50
→ MyLifeIsAMistake joined23:50
← BK- left23:51

Logs Search ←Prev date Next date→ Channels Documentation