IRCloggy #git 2022-04-03

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2022-04-03

→ Xenguy_ joined00:00
← Wulf left00:01
→ squirrel joined00:02
→ Wulf joined00:02
← Xenguy left00:03
→ tejr joined00:05
Xenguy_ → Xenguy00:10
→ vysn joined00:10
→ capn joined00:11
← Murr left00:11
→ Murr joined00:11
← jclsn1007 left00:12
→ bertvvvs joined00:14
→ Xenguy_ joined00:15
→ jclsn1007 joined00:17
→ cdown_ joined00:17
← Xenguy left00:17
← cdown left00:18
cdown_ → cdown00:18
\\ so it already didn't have that line in the config, and the command didn't do anything , but deleting the spam in refs/remote/theremote worked00:18
→ cdown_ joined00:21
→ llh joined00:23
← jclsn1007 left00:23
← cdown left00:24
cdown_ → cdown00:24
parsnip → hominidae00:28
→ jclsn1007 joined00:28
hominidae → hominoidea00:29
← TheCatBehemoth left00:30
← cronos left00:31
→ cronos joined00:32
← jclsn1007 left00:35
→ bambanxx joined00:37
→ donofrio joined00:38
→ jclsn1007 joined00:40
← Novi left00:42
→ sa0 joined00:44
→ Novi joined00:45
← jclsn1007 left00:47
← pflanze left00:50
→ cdown_ joined00:50
→ jclsn1007 joined00:52
← donofrio left00:53
← cdown left00:53
cdown_ → cdown00:53
← cdown left00:56
→ cdown joined00:57
← cloaker left01:01
← jclsn1007 left01:06
→ ALowther joined01:10
ALowther I've made changes to ~6 files and haven't staged or committed any of them yet. I'd like to revert 2 of those files to their state from the previous commit, while leaving the current 4 as they are. What command could I use to make that happen?01:11
→ jclsn1007 joined01:11
← coaxing left01:13
→ roadie joined01:14
← cdown left01:17
→ rgrinberg joined01:17
→ cdown joined01:17
← bertvvvs left01:18
← The_Blode_ left01:19
→ cdown_ joined01:19
← cdown left01:22
→ cdown joined01:22
← jclsn1007 left01:23
← cdown_ left01:25
→ jclsn1007 joined01:28
→ thiago joined01:31
← zulutango left01:33
← rgrinberg left01:34
← adhawkins left01:34
← jclsn1007 left01:35
→ adhawkins joined01:36
→ zulutango joined01:39
→ jclsn1007 joined01:41
→ cdown_ joined01:42
nedbat ALowther: `git restore some_file_name`01:44
ALowther nedbat: Thank you.01:44
← cdown left01:45
cdown_ → cdown01:45
← jclsn1007 left01:49
→ jclsn1007 joined01:55
← jclsn1007 left02:01
← karabaja4 left02:03
Xenguy_ → Xenguy02:03
← gurkenglas left02:06
→ jclsn1007 joined02:07
→ agrosant joined02:10
→ TheCatBehemoth joined02:13
← jclsn1007 left02:13
← nyah left02:15
← TheCatBehemoth left02:17
→ jclsn1007 joined02:18
← cdown left02:20
→ cdown joined02:22
→ cdown_ joined02:24
← cdown left02:27
cdown_ → cdown02:27
← jclsn1007 left02:28
→ jclsn1007 joined02:34
← pulse left02:34
← jclsn1007 left02:39
← ALowther left02:43
→ jclsn1007 joined02:45
← cdown left02:48
→ cdown joined02:49
← jclsn1007 left02:50
→ jclsn1007 joined02:50
→ cdown_ joined02:51
← cdown left02:51
← cdown_ left02:52
→ cdown joined02:53
← cdown left02:54
→ cdown joined02:56
← roadie left02:58
← hololeap left03:00
→ cdown_ joined03:00
→ hololeap joined03:01
← cdown left03:02
cdown_ → cdown03:02
→ rgrinberg joined03:05
← jclsn1007 left03:08
← cdown left03:10
← chenqisu1 left03:10
→ cdown joined03:11
→ jclsn1007 joined03:13
← cdown left03:16
→ cdown joined03:18
← very_sneaky left03:20
→ very_sneaky joined03:22
→ tabakhase joined03:25
← Yruama left03:26
→ YuGiOhJCJ joined03:26
← gast0n left03:26
→ geowiesnot joined03:28
← krushia left03:28
→ euouae joined03:30
euouae Hello can I contribute a PR in github with a shallow copy of the repo?03:30
i.e. clone a shallow copy, add a commit and push a PR?03:31
← rgrinberg left03:32
euouae guess I'll give it a go and see03:33
← thiago left03:36
→ jwillikers joined03:37
→ donofrio joined03:40
← tyson2 left03:40
→ skapate joined03:46
← skapate left03:46
→ skapate joined03:46
← donofrio left03:46
← skapata left03:46
euouae Oh yeah apparently it's fine :)03:47
→ tmz joined03:50
← ChmEarl left04:05
← jwillikers left04:06
← geowiesnot left04:06
← anaveragehuman left04:20
→ skapata joined04:24
← skapata left04:24
→ skapata joined04:24
→ bertvvvs joined04:24
← skapate left04:25
→ anaveragehuman joined04:26
→ rgrinberg joined04:31
sphex Hey. Say you have a large-ish set of modifications to a code base, and you need to extract changes out of it and break it down into smaller patches. And the process might be a bit chaotic and take some trial and error to get the separate patches to work right. What's the best way to go about that with git? I'm not too sure where to start...04:35
← bambanxx left04:43
hominoidea sphex: the way i tend to do that, is create a new branch at the starting point, then checkout the worktree of the large modification branch, and consider what changes there might work as a smaller set of changes.04:44
but sometimes, i decide it's not worth it, and do only the most obvious splitting out of smaller changes, then just allow some bigger commits... with my own projects04:45
a change might involve splitting out a function and making some changes to the result. i can potentially make that as two commits, one as a minimal factoring out of the function, a second commit for the non-obvious changes i've made04:46
sphex hominoidea: ok. yeah it's not my project. I got to break it down. and then I might get feedback on the separate patches and need to make some changes. and resubmit a changed patch and re-integrate that in my main branch as well...04:49
← euouae left04:53
← wonko-th1-sane left04:57
sphex this is going to be hell no matter what is it? I feel like git could help with that if I understood it better but I don't see how.04:59
hominoidea → parsnip05:01
← parsnip left05:02
→ parsnip joined05:02
parsnip → parsnip005:04
parsnip0 → parsnip05:04
← zmt00 left05:07
→ zmt00 joined05:12
← duxsco left05:13
→ wonko-the-sane joined05:14
→ chenqisu1 joined05:15
→ madewokherd` joined05:19
← madewokherd left05:22
← YoungFrog left05:24
← bloody left05:24
→ YoungFrog joined05:24
→ bambanxx joined05:30
← bertvvvs left05:37
← pretty_dumm_guy left05:41
→ pretty_dumm_guy joined05:42
→ wolfdale83 joined05:48
← wolfdale8 left05:50
wolfdale83 → wolfdale805:50
→ nuttingd joined05:54
→ howdoi joined06:02
← rgrinberg left06:08
→ bkircher joined06:10
← bambanxx left06:11
← reset left06:12
← great_taste left06:18
→ otisolsen70 joined06:19
→ han-solo joined06:19
→ hbautista joined06:27
← hbautista left06:28
← xkuru left06:31
← nuttingd left06:32
← squirrel left06:32
→ hbautista joined06:32
← Misotauros left06:34
→ lehinsun joined06:41
← lehinsun left06:43
→ lehinsun joined06:44
→ TheCatBehemoth joined06:46
→ igemnace joined06:48
→ zachel joined06:48
← TheCatBehemoth left06:50
→ hbautista_ joined06:51
→ euouae joined06:53
← hbautista left06:54
← bkircher left06:55
← Gustavo6046 left06:55
→ hbautista__ joined07:02
→ Gustavo6046 joined07:02
← wonko-the-sane left07:04
→ The_Blode joined07:04
→ wonko-the-sane joined07:04
← Gustavo6046 left07:04
← hbautista_ left07:05
→ Gustavo6046 joined07:05
← hbautista__ left07:07
← vicecea left07:09
→ vicecea joined07:11
→ dionysus69 joined07:12
→ feriman joined07:26
→ EvilDMP joined07:31
→ geowiesnot joined07:36
→ donofrio joined07:40
← Wulf left07:40
j416 sphex: you can create commits, try stuff, redo if needed07:41
sphex: man git-add look for --patch (-p)07:42
gitinfo sphex: the git-add manpage is available at https://gitirc.eu/git-add.html07:42
j416 sphex: also read up on work tree vs. staging area (index) vs. committed changes; this might be a good read -> https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository07:43
← wonko-the-sane left07:44
← donofrio left07:48
→ kix joined07:54
← x88x88x left07:55
← fling left07:55
← chenqisu1 left07:57
→ fling joined07:57
← kix left07:58
→ kix joined07:58
← lehinsun left08:01
→ wonko-the-sane joined08:03
← howdoi left08:14
← Gustavo6046 left08:14
→ rsx joined08:16
→ MajorBiscuit joined08:23
→ menace joined08:26
← Sulky_ left08:26
← menace left08:27
→ menace joined08:27
menace → Deknos08:27
→ Tangent-Man joined08:29
← Tangent-Man left08:31
→ Tangent-Man joined08:31
→ gurkenglas joined08:38
→ bkircher joined08:45
→ kenanmarasli joined08:50
← dionysus69 left08:51
← The_Blode left08:55
← fling left08:59
→ x88x88x joined09:00
→ fling joined09:02
← kyshoc left09:02
→ kyshoc joined09:03
← kyshoc left09:03
→ kyshoc joined09:03
← MajorBiscuit left09:06
→ TheCatBehemoth joined09:07
← TheCatBehemoth left09:11
← sudoforge left09:13
→ wootehfoot joined09:14
→ coot joined09:31
→ The_Blode joined09:34
→ vimal joined09:34
→ ss4 joined09:37
→ zeenk joined09:38
← The_Blode left09:38
← euouae left09:40
← wootehfoot left09:41
→ The_Blode joined09:41
→ wootehfoot joined09:52
← ss4 left09:53
← kix left09:54
→ The_Blode_ joined09:54
← The_Blode left09:55
→ TheCatBehemoth joined09:55
← Willtech left09:56
→ kix joined09:56
→ Willtech joined09:56
→ vitali64 joined09:58
← fling left10:04
→ carl- joined10:04
→ fling joined10:06
← GoGi left10:07
← bindu left10:08
→ bindu joined10:08
→ GoGi joined10:09
← GoGi left10:09
→ GoGi joined10:09
→ MajorBiscuit joined10:24
→ sobkas joined10:25
← kix left10:33
← skapata left10:35
→ coaxing joined10:35
← geowiesnot left10:37
← MajorBiscuit left10:38
← vishal left10:41
→ vishal joined10:42
← toulene left10:43
→ sudoforge joined10:45
← kenanmarasli left10:45
→ Sulky_ joined10:46
→ toulene joined11:03
← toulene left11:03
→ The_Blode joined11:06
→ toulene joined11:06
← vitali64 left11:07
← The_Blode_ left11:07
← fling left11:07
← chexum left11:08
→ fling joined11:08
→ chexum joined11:09
→ vitali64 joined11:09
→ geowiesnot joined11:10
← jazzy left11:16
→ gustik joined11:18
← zeenk left11:21
→ tyson2 joined11:24
→ m0viefreak2 joined11:27
← m0viefreak left11:27
m0viefreak2 → m0viefreak11:27
← bkircher left11:28
→ DNH joined11:44
→ bkircher joined11:44
→ mannequin joined11:50
→ Guest6951 joined12:01
← EvilDMP left12:03
→ wakeup joined12:05
← bkircher left12:07
→ oriba joined12:10
← GoGi left12:11
← fling left12:12
→ GoGi joined12:14
← GoGi left12:14
→ GoGi joined12:14
→ fling joined12:14
→ cweiss0765321 joined12:14
← vitali64 left12:17
→ thiago joined12:18
→ ss4 joined12:18
→ metabulation joined12:20
← wootehfoot left12:20
→ vitali64 joined12:22
→ seifeslimene joined12:23
→ lpapp joined12:23
← ss4 left12:24
lpapp hi, is there a nicer way than this "grep Laszlo" at the end? for branch in `git branch -r --no-merged | grep -v HEAD`; do echo -e `git show --format="%ci %cr %an" $branch | head -n 1` \\t$branch; done | sort -r12:24
https://railsware.com/blog/git-housekeeping-tutorial-clean-up-outdated-branches-in-local-and-remote-repositories/ -> want to find all branches on the remote where I am the last author basically.12:24
So that I can do my fair share of cleaning up stale remote branches.12:24
ikke lpapp: look at man git for-each-ref12:25
gitinfo lpapp: the git-for-each-ref manpage is available at https://gitirc.eu/git-for-each-ref.html12:25
ikke Not sure how you can avoid grepping for author, though12:27
lpapp I was hoping some kind of --author option12:28
ikke The closest I could get to is this:12:34
git for-each-ref refs/remotes/origin --format='%(if:equals=<name>)%(authorname)%(then)%(refname:short)%(else)%(end)'12:34
The only drawback is that it would return an empty line for every branch that does not match12:34
→ cdown_ joined12:35
lpapp if I --delete the branches remotely and come down to 0 lines left on me, can I be sure that no remote branches are staling on me?12:36
→ avalon joined12:36
lpapp that command does not work for me somehow12:36
← cdown left12:38
cdown_ → cdown12:38
→ Yruama joined12:42
← rsx left12:48
→ masber joined12:49
← sudoforge left12:49
→ donofrio joined12:55
← gustik left12:55
→ cdown_ joined12:56
← YuGiOhJCJ left12:58
← cdown left12:59
cdown_ → cdown12:59
→ rsx joined13:02
→ m0viefreak2 joined13:02
← m0viefreak left13:02
m0viefreak2 → m0viefreak13:02
← wakeup left13:03
→ DibbTubberOne joined13:08
← seifeslimene left13:13
→ seifeslimene joined13:15
← seifeslimene left13:16
← fling left13:16
→ fling joined13:16
← Guest6951 left13:20
→ n8chan joined13:21
← neightchan left13:23
→ cdown_ joined13:28
← m0viefreak left13:29
← cdown left13:30
cdown_ → cdown13:30
← thebombzen left13:31
→ Misotauros joined13:32
→ junktext joined13:35
→ seifeslimene joined13:35
← DibbTubberOne left13:36
→ MajorBiscuit joined13:37
→ nate1 joined13:40
→ rgrinberg joined13:43
← nate1 left13:45
→ duxsco joined13:46
→ gast0n joined13:53
← zer0bitz left14:00
→ zer0bitz joined14:03
← cronos left14:05
vitali64 → BaluBot14:07
BaluBot → vitali6414:07
vitali64 → BaluBot14:07
BaluBot → vitali6414:07
→ cronos joined14:09
→ roadie joined14:12
→ EvilDMP joined14:16
← donofrio left14:21
→ iomari891 joined14:21
→ donofrio joined14:21
← Sazhen86 left14:29
← anaveragehuman left14:33
← DNH left14:43
→ srinidhi joined14:45
→ xkuru joined14:50
→ thebombzen joined14:51
→ sudoforge joined14:54
→ cloaker joined14:57
← donofrio left15:08
→ kix joined15:09
→ bkircher joined15:12
→ Guest2493 joined15:14
→ nyah joined15:16
← FinnElija left15:17
← vimal left15:18
→ FinnElija joined15:18
→ madewokherd joined15:19
← madewokherd` left15:22
← vdamewood left15:24
→ vdamewood joined15:25
→ reset joined15:27
← Jong left15:27
← carl- left15:33
→ donofrio joined15:37
→ carl- joined15:43
→ palasso joined15:44
← rgrinberg left15:46
→ Gustavo6046 joined15:47
← Gustavo6046 left15:48
→ Gustavo6046 joined15:48
← metabulation left15:50
← donofrio left15:56
← bkircher left16:01
→ bkircher joined16:02
← geowiesnot left16:04
→ Jacques joined16:05
← Murr left16:10
→ Murr joined16:10
← MajorBiscuit left16:19
→ wakeup joined16:19
→ MajorBiscuit joined16:23
→ spacenautx joined16:23
→ m_ joined16:24
→ snedd joined16:25
← m__ left16:27
→ The_Blode_ joined16:28
← The_Blode left16:29
→ geowiesnot joined16:34
→ DNH joined16:37
← bkircher left16:41
← roadie left16:43
→ bkircher joined16:43
← EvilDMP left16:43
← vysn left16:47
→ bloody joined16:51
→ roadie joined16:52
← bkircher left16:56
→ auk joined16:56
→ bkircher joined16:56
← bkircher left16:57
← Sulky_ left16:57
→ bkircher joined16:58
→ zebrag joined17:01
← coot left17:12
→ coot joined17:13
→ great_taste joined17:16
← TheCatBehemoth left17:26
→ TheCatBehemoth joined17:26
← Jacques left17:28
→ ChmEarl joined17:30
→ nuttingd joined17:33
→ zeenk joined17:34
← machinehum left17:35
→ john_johnk joined17:35
→ machinehum joined17:36
← geowiesnot left17:37
← fflam left17:40
→ fflam joined17:42
← Deknos left17:45
← MajorBiscuit left17:46
→ Sulky joined17:49
← rsx left17:50
← vitali64 left17:50
→ vitali64 joined17:52
← wakeup left17:55
← spacenautx left17:59
→ bambanxx joined17:59
→ spacenautx joined17:59
← vicfred left18:00
→ hkm joined18:02
← han-solo left18:02
→ cerill joined18:04
← john_johnk left18:07
← junktext left18:07
→ junktext joined18:10
← Murr left18:10
→ entbsagtc^ joined18:10
→ Murr joined18:10
← bambanxx left18:20
← snedd left18:21
← machinehum left18:28
← moldorcoder7 left18:28
→ moldorcoder7 joined18:32
← palasso left18:37
← Xenguy left18:38
→ palasso joined18:38
→ john_johnk joined18:38
← hkm left18:39
gumnos is there an easy way to inform git of a rename that has happened outside of git? If I `mv a.txt b.txt` and then inform git with `git mv {a,b}.txt` it complains that the target already exists.18:41
← foul_owl left18:42
gumnos I can manually `git rm a.txt; git add b.txt` and it will do what I intend, but is there a single command to do the same?18:42
ikke gumnos: you don't need to tell git about renames18:42
it does not store anywhere that files have been renamed18:42
gumnos right, but if I've renamed the file in the shell (or my $EDITOR), I need to do the two-step remove-the-old-add-the-new for it to be recognized.18:43
looking for something like (an imaginary) `git mv --already-did-it-in-the-shell {a,b}.txt`18:44
→ duxco joined18:44
ikke Don't think there is18:45
except for making an alias that uses rm --cached + add18:45
← duxsco left18:46
duxco → duxsco18:46
→ foul_owl joined18:46
gumnos okay, that's the path I was going to chase down next (my alias-authoring is weak), but I wanted to make sure there wasn't something obvious I'd missed. Thanks!18:47
← cliluw left18:47
→ cliluw joined18:47
← ano left18:49
← auk left18:53
← LuKaRo_ left18:54
→ ano joined18:59
→ The_Blode joined18:59
→ Rashad joined19:01
← Rashad left19:01
← The_Blode_ left19:02
← hololeap left19:02
→ LuKaRo_ joined19:02
→ hololeap joined19:03
→ EvilDMP joined19:11
← vitali64 left19:13
← iomari891 left19:17
← LuKaRo_ left19:18
→ vimal joined19:19
→ LuKaRo joined19:24
← kix left19:25
← keypusher left19:27
→ keypusher joined19:27
→ skapata joined19:35
← skapata left19:35
→ skapata joined19:35
→ pflanze joined19:36
→ dionysus69 joined19:36
← entbsagtc^ left19:41
→ bertvvvs joined19:45
→ wonko-th1-sane joined19:46
← wonko-the-sane left19:47
← vimal left19:48
→ Sazhen86 joined19:49
→ zer0bitz_ joined19:50
→ dodo joined19:51
← zer0bitz left19:51
← Sulky left19:53
→ Sulky joined19:53
→ bambanxx joined19:54
→ vicfred joined19:58
← hololeap left20:00
→ lgc joined20:03
→ hololeap joined20:09
← Murr left20:10
← palasso left20:10
→ Murr joined20:10
← lgc left20:11
← junktext left20:13
← ChmEarl left20:14
← zer0bitz_ left20:15
→ rgrinberg joined20:16
→ Lord_of_Life_ joined20:16
← Lord_of_Life left20:17
Lord_of_Life_ → Lord_of_Life20:19
← keypusher left20:19
→ funhouse joined20:19
→ keypusher joined20:20
nedbat is there a disciplined way to know for a git repo what the GitHub name/repo is, if there is one?20:25
ikke git remote -v20:25
← carl- left20:25
nedbat ikke: i didn't know if there was a plumbing version of it at least?20:26
← tyson2 left20:26
← bambanxx left20:27
ikke nedbat: git config --get-regex 'remote.*url'20:27
nedbat ikke: interesting. Why is there a leading space in the output?20:28
ikke not for me20:28
nedbat ikke: hmm, not for me either if i pipe it through cat....20:29
→ Xenguy joined20:32
← feriman left20:34
← LuKaRo left20:42
← bertvvvs left20:43
→ ChmEarl joined20:48
→ bambanxx joined20:51
→ wakeup joined20:51
→ cx joined20:52
← john_johnk left20:52
→ AbleBacon joined20:52
← cx left20:56
→ tyson2 joined21:06
← cebor left21:07
→ cebor joined21:07
← bambanxx left21:08
← dionysus69 left21:09
← DNH left21:09
→ jazzy joined21:11
← roadie left21:15
← sobkas left21:20
→ sobkas joined21:21
→ LuKaRo joined21:23
→ ramblebamble joined21:23
← cebor left21:24
→ cebor joined21:24
→ auk joined21:27
← otisolsen70 left21:29
← ramblebamble left21:33
→ roadie joined21:41
← mannequin left21:44
← wakeup left21:55
→ DNH joined21:56
← thebombzen left21:56
→ wakeup joined21:59
← roadie left21:59
← vdamewood left22:04
→ wagle joined22:05
← jazzy left22:05
← elastic_dog left22:18
← sobkas left22:19
→ sobkas joined22:20
→ elastic_dog joined22:24
← DNH left22:27
← nyah left22:30
→ zen_coder joined22:36
→ roadie joined22:40
← sobkas left22:44
← coot left22:45
← roadie left22:45
jjakob I checked out a new branch, did git submodule update --init (new submodules) but now it says the sobmodule paths are modified content, the submodule paths are empty except for .git, and nothing I try will do the correct checkout22:48
← zeenk left22:53
← arand left22:55
← igemnace left22:56
← hanneso left22:57
→ bambanxx joined22:57
← masber left23:00
→ hoochmonger joined23:02
← pizdets left23:03
→ pizdets_ joined23:03
← TheCatBehemoth left23:05
← vicfred left23:08
← sa0 left23:09
jjakob fixed it with git reset --hard origin/master inside the submodule (the commit it was supposed to checkout)23:10
→ hanneso joined23:13
→ finn_elija joined23:15
← FinnElija left23:15
finn_elija → FinnElija23:15
→ arand joined23:17
← Tangent-Man left23:23
← nuttingd left23:24
→ nuttingd joined23:26
→ chenqisu1 joined23:27
← chenqisu1 left23:27
→ chenqisu1 joined23:28
← chenqisu1 left23:28
→ chenqisu1 joined23:29
→ roadie joined23:29
duxsco a remote git repo's content is initially retrieved with "git clone --depth 1 https://github.com/gentoo-mirror/gentoo.git .". thereafter, the local repo is updated with "git fetch origin --depth 1". why does a "git reset --merge" lead to this error: https://dpaste.com/E5ZLUCG8523:31
← nuttingd left23:33
→ nuttingd joined23:33
← Ram-Z left23:35
← roadie left23:37
← srinidhi left23:37
← jstein left23:40
→ Ram-Z joined23:41
→ sa0 joined23:47
← sa0 left23:52
← gurkenglas left23:59

Logs Search ←Prev date Next date→ Channels Documentation