IRCloggy #git 2022-10-18

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-10-18

→ jazzy joined00:01
→ Betal joined00:03
→ odoood joined00:05
← YuGiOhJCJ left00:07
→ YuGiOhJCJ joined00:08
← odoood left00:10
→ nattiestnate joined00:14
→ bambanxx joined00:14
← hbautista left00:15
← pulse left00:16
→ junebug joined00:17
← clime left00:20
→ Dragoon joined00:22
← gsi_ left00:23
→ gsi joined00:25
← arescorpio left00:26
jazzy → jazz-o-lantern00:30
→ madewokherd joined00:32
→ roadie joined00:36
← rama left00:37
→ rama joined00:37
← bambanxx left00:38
← nyah left00:40
→ bambanxx joined00:40
← ferdna left00:41
→ geosmile joined00:41
← Filip2 left00:43
→ zeroes_ joined00:43
← adanwan left00:44
→ adanwan joined00:44
← zeroes left00:46
→ nate1 joined00:47
← jb1277976 left00:49
→ jb1277976 joined00:51
→ atrigent joined00:52
← nate1 left00:52
→ randm joined00:54
← roadie left00:55
← Lord_of_Life left00:57
→ Jong joined00:58
Jong Anyone know how to search for a filename through an entire repo to find the commits that have the filenmae?00:58
→ Lord_of_Life joined00:59
← Novi left01:00
← skylize left01:00
→ skylize joined01:02
→ Novi joined01:05
→ nate1 joined01:06
→ softirq joined01:07
← jimklimov left01:08
→ gvg_ joined01:09
← gvg left01:10
← nate1 left01:13
← umbramalison left01:13
→ umbramalison joined01:13
→ roadie joined01:21
← nattiestnate left01:22
→ MockingMoniker_ joined01:25
← bambanxx left01:25
← softirq left01:26
→ softirq joined01:27
← roadie left01:27
← sudoforge left01:29
← softirq left01:29
→ roadie joined01:39
← vdamewood left01:40
← rama left01:42
→ hbautista joined01:42
← roadie left01:44
→ dba_ joined01:48
gvg_ → dcd01:53
dcd → gvg01:53
→ hiroot joined01:54
→ hbautista_ joined02:00
→ lucasta joined02:00
← hbautista left02:01
← farzat left02:10
→ sudoforge joined02:21
→ nate1 joined02:22
← rgrinberg left02:23
← junebug left02:26
→ rustyshackleford joined02:29
← FinnElija left02:31
→ FinnElija joined02:31
→ rgrinberg joined02:41
→ vdamewood joined02:44
→ farzat joined02:44
← sudoforge left02:44
← Dotz0cat left02:46
→ sudoforge joined02:46
→ vinleod joined02:48
← vdamewood left02:52
→ wallabra_ joined03:00
← wallabra left03:01
wallabra_ → wallabra03:01
← epicout left03:04
vinleod → vdamewood03:14
← NightMonkey left03:15
← nate1 left03:16
→ NightMonkey joined03:17
← zebrag left03:18
← derpydoo left03:25
← rgrinberg left03:32
→ tflow joined03:33
← tirnanog left03:37
← rurtty left03:39
← llh left03:41
→ nate1 joined03:43
← lucasta left03:45
→ lucasta joined03:45
→ wallabra_ joined03:46
← wallabra left03:47
wallabra_ → wallabra03:48
← nate1 left03:49
← sudoforge left03:53
← gast0n left03:59
→ glik22 joined04:02
glik22 i'm using a bare repository to manage dotfiles, like in this post: https://www.atlassian.com/git/tutorials/dotfiles. is there a way i can add a file from some subfolder (say $HOME/some/folder/file.txt) and have it show up in git without the directory structure (so just file.txt at the root)?04:05
← c0dehu1k left04:16
→ Kaladin joined04:17
→ nate1 joined04:19
→ epicout joined04:22
← nate1 left04:24
← atrigent left04:24
→ atrigent_ joined04:24
← farzat left04:25
→ farzat joined04:27
→ c0dehu1k joined04:27
← Cleverness left04:43
→ paddymahoney joined04:45
← hamburgler left04:51
→ Crassus joined04:52
← fling left05:00
→ fling joined05:01
← hbautista_ left05:01
← Crassus left05:06
← thiago left05:10
→ madewokherd` joined05:11
→ Dotz0cat joined05:13
← madewokherd left05:14
→ twb joined05:19
twb So I was just noticing that I've version control history for my DNS zones all the way back to 1996, i.e. in my active ansible repo, "git log --before='26 years ago'" works.05:20
And I wondered: what's the oldest git commit in any (active!) git repo?05:20
Peng Wow05:20
twb e.g. ITS wouldn't count because ITS isn't actively maintained. Emacs should have git history back to about 198705:20
https://github.com/emacs-mirror/emacs/releases/tag/emacs-19.34 is 1996, same as me05:26
There's older commits tho05:27
https://github.com/emacs-mirror/emacs/commit/ce558412505:29
https://github.com/PDP-10/its/ only goes back 6 years05:30
→ gazalam joined05:33
← bloody left05:36
→ recyclehero joined05:36
twb RCS itself was started in 1982, but the oldest git commit in GNU RCS is "2a07671 32Y WTi ◎ <4.3> Import RCS 4.3 from <ftp://ftp.cs.purdue.edu/pub/RCS/>."05:39
grawity https://gitlab.freedesktop.org/alanc/x-consortium-historical-code-history/-/commit/61f194870d68f26f554e3782f92bb4709250442b05:40
ah I guess not really active though05:40
but you COULD argue that it's active as xorg.git05:40
twb My rough heuristic for "active" is that the commit has to be in the repo that people are actually pushing to05:41
Your one is 4 Sep 1985; ce5584125 is 18 Apr 198505:42
grawity yeah emacs is probably the oldest project that I've seen get a full import05:42
twb The logical limit ought to be 1973 for SCCS, and 1982 for RCS05:42
So GNU Emacs and X9 are pretty close to the RCS floor05:42
← vdamewood left05:45
← Dotz0cat left05:48
→ Dotz0cat joined05:49
→ cvmn joined05:51
→ carl-- joined05:51
→ srinidhi joined05:53
→ peirik_ joined05:57
twb FreeBSD only starts in 1993. https://github.com/freebsd/freebsd-src/commits/release%2F1.0.0_cvs05:58
→ nate1 joined05:58
twb https://github.com/weiss/original-bsd/commit/5e6c808bdb from SCCS, but not connected to FreeBSD &c05:59
→ caveman_ joined06:01
grawity gcc is 1988 (from rcs via svn)06:01
← cvmn left06:02
grawity huh gdb is like half a year older06:02
← nate1 left06:03
grawity aww kerberos doesn't go further back than 4.x in 198706:06
twb I didn't realize krb was quite that old06:07
was that out of MIT CSAIL?06:07
grawity whichever group worked on Project Athena06:09
well, the earliest mention of it as an *idea* in tcp-ip mailing list archives was 1984 so I guess it makes sense the repo doesn't go that far back06:10
I've ran out of old projects to check in ~/src06:11
← Henry151 left06:11
← Funhouse left06:13
← moldorcoder7 left06:17
→ dionysus69 joined06:18
→ igemnace joined06:19
← fling left06:20
→ Rashad joined06:22
→ fling joined06:24
← fling left06:24
← hiroot left06:25
← peirik_ left06:25
→ fling joined06:25
← Rashad left06:27
← dionysus69 left06:31
→ madewokherd joined06:32
← caveman_ left06:33
→ dionysus69 joined06:33
← madewokherd` left06:34
→ austin987 joined06:38
← srinidhi left06:39
→ jimklimov joined06:45
→ manin891 joined06:46
← manin891 left06:46
← carl-- left06:46
→ manin891_ joined06:46
← manin891_ left06:46
→ rfuentess joined06:49
→ Rashad joined06:53
← Murr left06:53
→ Murr joined06:54
→ VaniaPy joined06:56
→ shkurata joined06:58
→ coot joined06:59
→ zeenk joined06:59
→ clime joined07:01
→ srinidhi joined07:03
→ codaraxis__ joined07:04
← Betal left07:05
← LuxuryMode left07:07
← codaraxis___ left07:08
→ belsirk joined07:12
← NightMonkey left07:12
→ stevet_ joined07:13
ronny1 again, anyone aware of a tool that incrementaly runs rebases from the current merge base to the top of the base branch, i have multiple larger changes on thebase branch and rebase/merge at once is a bit too bug/error pront07:14
← rfuentess left07:14
bookworm ... plain git?07:16
← twb left07:16
bookworm unless I misunderstand what you are asking git can happily do that07:16
← tflow left07:17
← blahboybaz left07:18
← dermoth left07:19
→ john_johnk joined07:20
→ sa0 joined07:21
← cation left07:21
→ feriman joined07:22
← terminaldweller left07:29
← jazz-o-lantern left07:34
→ terminaldweller joined07:35
→ theoceaniscool joined07:36
→ theoceaniscool_ joined07:36
osse bookworm, ronny1: a sprinkle of script will do that07:41
→ cation joined07:42
osse something like git rev-list --reverse HEAD..upstream | while read -r hash; do git rebase $hash || break; done07:42
← feriman left07:43
→ tflow joined07:45
← farzat left07:46
bookworm considering that git rebase does the above, what's the point?07:46
ronny1 That's just what I needed, thanks07:46
bookworm it'll stop either way if there's a problem, it won't do anything else07:46
osse bookworm: what do you mean07:47
ronny1 bookworm: rebase does the loop for the other side, i need rebase in small increments as they upstream moved a lot and reconciliation is harder at once07:48
→ farzat joined07:48
bookworm I'm probably misunderstanding what you try to do... not enough coffee yet07:49
you want to rebase feature on upstream, one upstream commit after the other?07:50
← john_johnk left07:50
osse yes07:50
bookworm ah07:50
← Masklin left07:51
osse ronny1: there's also this thing: https://github.com/mhagger/git-imerge07:52
→ peirik_ joined07:53
→ TomyWork joined07:55
← darkstardevx left07:55
→ Telmud joined07:56
→ Masklin__Gurder joined07:58
← peirik_ left07:59
→ KimK joined08:00
→ darkstardevx joined08:01
Masklin__Gurder → Masklin08:02
← kevr left08:04
→ kevr joined08:04
→ rosco joined08:06
← tflow left08:10
← VaniaPy left08:13
belsirk → rfuentess08:17
→ dermoth joined08:21
→ nate1 joined08:24
diverdude Hello, i did: git switch pumpintegration and then git fetch homeoffice pumpintegration which then outputted: * branch pumpintegration -> FETCH_HEAD. How do i then now merge what i fetched into my current branch (pumpintegration) ?08:24
← skapata left08:25
→ iomari891 joined08:25
→ maret joined08:28
← nate1 left08:28
→ AirOnSkin joined08:30
← iomari891 left08:32
← KimK left08:33
→ MajorBiscuit joined08:36
→ otisolsen70 joined08:38
→ iomari891 joined08:39
osse diverdude: I think git merge homeoffice/pumpintegration should do the trick08:48
← Telmud left08:55
← rosco left08:55
→ sknbl joined08:56
→ cdown joined08:57
sknbl how do you know which commit to use when apply patch to sourcecode?08:58
→ KnoP joined08:59
→ rosco joined09:00
← Dyluster[m] left09:00
← JanC left09:02
← fling left09:04
← transhumanist left09:05
→ fling joined09:06
→ transhumanist joined09:06
osse sknbl: what do you mean?09:09
sknbl osse: i mean how can i use this patch https://patches.libav.org/patch/22446/09:11
which commit of libav?09:12
→ KimK joined09:12
osse there is no good way to know in this case09:12
but in general the idea of a patch is that it can be applied to several version of the sourcecode09:12
so I would just try to apply it to the latest09:13
→ KimK_ joined09:13
← KimK_ left09:14
← KimK left09:14
sknbl osse "...there is no good way to know". ok, thank you09:15
→ nyah joined09:17
osse usually mails generated by git format-patch contains this info09:18
but I can't find it via that UI09:18
selckin 201209:19
→ KimK joined09:20
→ lolok joined09:21
→ trace1918 joined09:24
← cation left09:25
→ mobidrop joined09:26
← epony left09:27
← FH_thecat left09:28
lolok → lolok-old09:31
→ epony joined09:32
→ GoGi joined09:32
← GoGi left09:32
→ GoGi joined09:32
← Rashad left09:36
→ Rashad joined09:38
← Noisytoot left09:39
← trace1918 left09:41
→ Noisytoot joined09:42
← szkl left09:46
← Kaladin left09:47
→ trace1918 joined09:48
hendry given a rev-list, how can i make git show me just those commits? for example; git rev-list --grep=FOOBAR-1450 HEAD | git log # shows them all09:50
→ Filip2 joined09:53
osse hendry: git log takes all the same args as rev-list09:56
git log --grep=...09:56
hendry osse: just need it to render stdin commit hashes though09:58
→ xx joined09:59
osse hendry: git log --stdin09:59
presumably --no-walk too10:00
or git show --stdin10:01
→ Dhruvag2000[m] joined10:02
→ rurtty joined10:04
→ JanC joined10:05
← YuGiOhJCJ left10:05
← rosco left10:07
→ codaraxis___ joined10:09
← trace1918 left10:10
← rurtty left10:11
→ trace1918 joined10:11
→ pickanick joined10:11
← codaraxis__ left10:13
→ JanC_ joined10:16
← JanC left10:16
JanC_ → JanC10:16
→ cation joined10:19
← bodiccea_ left10:19
← sknbl left10:23
zeroes_ → zeroes10:25
→ bodiccea joined10:29
← sa0 left10:29
→ sa0 joined10:29
← sa0 left10:30
← trace1918 left10:30
→ sa0 joined10:31
→ trace1918 joined10:31
→ vitali64 joined10:31
→ bambanxx joined10:33
← trace1918 left10:34
→ trace1918 joined10:34
← c0dehu1k left10:35
← lucasta left10:43
→ feriman joined10:44
← Jong left10:48
→ vqueiroz joined10:49
← trace1918 left10:51
← vishal left10:51
← cdown left10:51
← Murr left10:53
→ lucasta joined10:53
→ Murr joined10:54
→ vishal joined10:54
→ Jong joined10:56
← KnoP left11:02
← maret left11:03
→ szkl joined11:05
→ maret joined11:06
→ lgc joined11:15
← epony left11:15
← lgc left11:16
← lucasta left11:19
→ lucasta joined11:19
← AirOnSkin left11:21
→ pulse joined11:24
← Noisytoot left11:30
← vitali64 left11:30
→ Noisytoot joined11:33
← maret left11:42
→ maret joined11:43
← cation left11:57
← maret left11:57
→ cation joined11:58
→ Swahili joined12:00
→ cdown joined12:04
→ john_johnk joined12:09
→ maret joined12:18
← maret left12:25
→ nate1 joined12:25
← lucasta left12:27
→ lucasta joined12:28
← nate1 left12:30
→ derpydoo joined12:33
→ rosco joined12:35
→ onizu joined12:39
← vanessa left12:40
→ vanessa joined12:40
→ odoood joined12:45
← JanC left12:45
→ JanC joined12:45
→ ozoned joined12:47
← odoood left12:49
→ littlefinger joined12:50
← lucasta left12:51
→ lucasta joined12:51
→ hans_ joined12:54
← cdown left12:58
← feriman left13:02
← gildasio left13:03
→ gildasio joined13:05
← lucasta left13:06
→ lucasta joined13:07
→ cdown joined13:07
→ neure joined13:14
neure Hi13:14
I started using worktrees in a repository that I had been already using before. Can I somehow "uncheckout" the root level to make sure I only operate with the worktrees?13:15
→ odoood__ joined13:17
← ozoned left13:20
← off^ left13:21
← coot left13:22
← Xenguy left13:23
← neure left13:24
→ coot joined13:24
→ Tangent-Man joined13:26
→ sd5 joined13:31
→ rurtty joined13:33
← cdown left13:33
→ gryffus joined13:33
→ cdown joined13:34
← gazalam left13:35
→ sudoforge joined13:35
→ softirq joined13:36
← srinidhi left13:40
→ neure joined13:40
→ Kulrak joined13:40
← Kulrak left13:41
ikke Not sure if it works, but you can try to change the main repository to a bare repository13:42
neure how would I do that?13:42
→ Kulrak joined13:42
→ rgrinberg joined13:44
← littlefinger left13:44
→ littlefinger joined13:45
→ vitali64 joined13:46
← odoood__ left13:46
ikke hmm, thinking about it, it would most likely not work, as that config setting would also affect the working trees13:48
→ gryffus_ joined13:48
← gryffus left13:48
← rosco left13:52
← nhartman_ left13:52
→ gas51627 joined13:53
← neure left13:58
→ neure joined13:58
→ thiago joined13:59
← softirq left14:06
← Crispy left14:09
← lucasta left14:09
→ lucasta joined14:11
→ zer0bitz joined14:12
→ thebombzen joined14:21
→ gast0n joined14:24
→ nhartman joined14:25
← Maxattax left14:25
→ softirq joined14:26
→ Maxattax joined14:27
→ rama joined14:33
← rama left14:33
→ rama joined14:34
→ srinidhi joined14:34
← Maxattax left14:34
→ Maxattax joined14:36
→ feriman joined14:39
→ gh34 joined14:40
← feriman left14:43
→ feriman joined14:45
← Sulky left14:45
← iomari891 left14:46
→ Sulky joined14:46
← feriman left14:47
→ iomari891 joined14:49
→ sknbl joined14:49
← gryffus_ left14:51
sknbl how can i get commit hash by diff file index? like index c01e446..5eae23e 10064414:52
selckin git rev-parse c01e44614:52
← softirq left14:55
← rama left14:56
→ rama joined14:57
→ madewokherd` joined15:00
sknbl selckin, that command gives me full hash i cannot checkout to15:01
selckin yea i'm wrong, was just guessing15:01
sknbl oh, ok15:03
← madewokherd left15:03
→ gryffus_ joined15:04
→ odoood__ joined15:07
→ gazalam joined15:08
→ zebrag joined15:09
→ softirq joined15:13
← splud left15:13
← hans_ left15:14
← Kulrak left15:15
← rama left15:16
→ rama joined15:17
→ Kulrak joined15:18
→ jazz-o-lantern joined15:19
← reset left15:20
← skylize left15:20
→ c0dehu1k joined15:21
→ fattredd joined15:23
→ fattredd_ joined15:23
← fattredd_ left15:24
→ atrus joined15:24
→ bloody joined15:24
atrus I'm having an issue latetly where a 'git grep -l' is returning file names with hyphens replaced with colons -- anybody else seen something similar?15:25
← srinidhi left15:25
selckin no15:26
← Maxattax left15:26
← vitali64 left15:27
→ splud joined15:27
sknbl here is what i needed -> git whatchanged --all --find-object=<blob hash>. appreciate your help15:27
← bambanxx left15:28
IRChatter atrus, if you've Docker installed, you could try running the same command under different Git versions to see if it's a version thing or something else15:28
→ Maxattax joined15:28
atrus AHA -- it seems like it's delta, which i use to get better coloring, and is set up as the pager, doing something to it.15:30
→ tflow joined15:30
→ feriman joined15:32
← rfuentess left15:32
atrus still not sure how, but disabling it makes the problem go away anyways.15:34
→ vitali64 joined15:36
← softirq left15:36
→ FH_thecat joined15:36
← neure left15:38
← sknbl left15:39
→ cousteau joined15:41
cousteau My project has two folders that are very similar (same structure, very similar files); in fact one of them started as a copy of the other and then I added some changes. They're for platforms A and B and I thought it made sense to have them separately rather than trying to reuse code. What would be the proper way to maintain this?15:44
My current issue is that after working with B for a while, some issues/bugs were fixed, but only in B folder. Now I want to apply those changes to A.15:45
selckin branches in the same repo, idealy the differences would be config/plugins type thing tho15:46
J_Darnley You want to split SUM into repo A and repo B?15:46
← darkstardevx left15:46
cousteau Was thinking on creating a patch and applying it to the other folder somehow... I don't know if there's a way to cherry-pick from one folder to another15:46
selckin: do you mean using submodules?15:46
← rama left15:46
selckin hell no15:47
→ rama joined15:47
cousteau One thing I considered was making the two folders a submodule, and the submodule has two branches, one per folder, and then yes, I can cherry-pick or merge the changes from one folder (branch) to the other15:48
Then what? Did you mean having yep branches, one with each folder / version / platform, and just switch to one branch or the other depending on which platform I'm targeting?15:50
→ darkstardevx joined15:50
→ srinidhi joined15:52
cousteau ("hell no" did cross my mind as well, and probably also my coworkers' when they have to maintain this, but these subfolders are kind of like separate projects after all)15:52
← darkstardevx left15:52
cousteau I really need to learn subtree15:52
← thebombzen left15:53
→ skapata joined15:53
← vitali64 left15:53
selckin the problem is the subfolders that was a bad idea to start with15:54
→ wavesong joined15:55
← cousteau left15:57
→ barbado joined15:59
← cdown left15:59
→ cdown joined16:00
→ vitali64 joined16:02
← Swahili left16:10
→ wallabra_ joined16:10
← wallabra left16:12
wallabra_ → wallabra16:12
← vitali64 left16:12
→ Swahili joined16:13
← MajorBiscuit left16:13
← makara1 left16:16
← makara left16:16
← fattredd left16:18
← odoood__ left16:21
← Sulky left16:24
→ nate1 joined16:27
← gazalam left16:29
→ makara joined16:29
→ makara_ joined16:30
← Rashad left16:31
← nate1 left16:32
← cdown left16:34
← john_johnk left16:34
→ funhouse joined16:40
← rama left16:40
→ rama joined16:41
← Vonter left16:44
→ thebombzen joined16:47
→ Vonter joined16:48
→ KnoP joined16:48
→ cweiss0765321242 joined16:48
→ wootehfoot joined16:48
← sudoforge left16:49
← cweiss076532124 left16:50
cweiss0765321242 → cweiss07653212416:50
← dionysus69 left16:51
← Murr left16:53
→ Murr joined16:53
→ cousteau joined16:55
cousteau selckin: well, they were going to be different enough to be put on separate places rather than having them reuse a lot of functions16:57
→ sudoforge joined16:57
cousteau (plus I didn't choose this project's structure... but even if I had, I'm not sure I would've gone for a different approach)16:57
→ Sulky joined17:01
← KnoP left17:04
← Maxattax left17:07
→ Maxattax joined17:09
→ travisghansen joined17:10
← mcon left17:10
→ Sasazuka joined17:11
→ NSOL joined17:15
→ ___nick___ joined17:18
→ dionysus69 joined17:18
→ darkstardevx joined17:19
← igemnace left17:19
← darkstardevx left17:19
← NSOL left17:19
→ darkstardevx joined17:20
selckin then they are different projects and you should keep them seperated17:22
→ bambanxx joined17:25
← mobidrop left17:26
← theoceaniscool left17:26
← theoceaniscool_ left17:26
← lucasta left17:28
→ lucasta joined17:29
← indy left17:33
ikke .version17:35
gitinfo changed the topic to: Welcome to #git, we like graphs | Current stable version: 2.38.1 | First visit? https://gitirc.eu | This channel is logged: https://gitirc.eu/log17:35
← rama left17:38
→ rama joined17:39
→ vitali64 joined17:40
← cousteau left17:42
← bambanxx left17:42
→ bambanxx joined17:45
→ LuKaRo joined17:46
← bambanxx left17:46
← mat001 left17:47
→ sgt_chuckles joined17:47
→ bambanxx joined17:48
→ mat001 joined17:48
→ briian joined17:50
← lucasta left17:50
← rama left17:50
→ lucasta joined17:51
→ rama joined17:51
← bambanxx left17:53
← onizu left17:53
→ indy joined17:53
→ bambanxx joined17:56
← vitali64 left17:57
← jedix left17:58
← bambanxx left17:58
→ thuna` joined17:59
← Sasazuka left18:02
← lucasta left18:03
← briian left18:03
→ lucasta joined18:04
→ nate1 joined18:04
→ blahboybaz joined18:05
→ Sasazuka joined18:06
→ softirq joined18:07
→ mandeep joined18:09
← rama left18:09
← lucasta left18:09
→ rama joined18:10
→ lucasta joined18:10
→ bambanxx joined18:10
→ vitali64 joined18:11
← ___nick___ left18:12
→ ___nick___ joined18:14
← vitali64 left18:14
← ___nick___ left18:14
← coot left18:15
← srinidhi left18:15
→ ___nick___ joined18:16
← bambanxx left18:16
→ bambanxx joined18:18
← blahboybaz left18:18
→ odoood__ joined18:20
← derpydoo left18:26
→ ozoned joined18:28
← fling left18:28
→ hamburgler joined18:28
← littlefinger left18:29
← softirq left18:29
→ fling joined18:29
→ softirq joined18:30
← odoood__ left18:31
← lucasta left18:31
← fling left18:31
→ lucasta joined18:31
← rgrinberg left18:31
→ fling joined18:31
→ srinidhi joined18:36
→ Volu joined18:36
← Volu left18:36
→ dlb76 joined18:37
← bambanxx left18:39
← indy left18:39
← iomari891 left18:40
← zeenk left18:42
→ bambanxx joined18:42
→ Volu joined18:44
Volu So for some reason I cant pull from my git repos anymore. I have the remotes as ssh keys. I already deleted them, and added new keys to my github account. Its the only ssh key I have so it definitely cant pick the wrong private key. with a simple ssh command I can connect to github, verifying that it works but when I try to pull or clone a repo I get a `fatal> Could not read from remote repository18:45
i also tried the whole thing with `eval $(ssh-agent)` and `ssh-add` but still doesn't work18:46
← TomyWork left18:47
← thuna` left18:48
← lucasta left18:50
→ lucasta joined18:50
→ coot joined18:50
← Sasazuka left18:51
→ indy joined18:52
← Murr left18:53
→ Murr joined18:53
→ peirik_ joined18:56
← rama left18:57
← lucasta left18:59
→ lucasta joined19:00
← hexadecagram left19:01
← peirik_ left19:01
← Sulky left19:01
← nate1 left19:04
→ howdoi joined19:04
→ thuna` joined19:05
← fweht left19:06
← sgt_chuckles left19:08
→ hexadecagram joined19:10
→ epony joined19:10
← lucasta left19:10
→ lucasta joined19:10
← Swahili left19:16
← softirq left19:17
→ softirq joined19:18
← lucasta left19:20
→ littlefinger joined19:23
→ t3nj1n joined19:24
← xx left19:24
← fling left19:25
← tflow left19:27
→ fling joined19:30
→ rama joined19:30
← gildasio left19:30
→ rama_ joined19:30
← crabbedhaloablut left19:31
→ crabbedhaloablut joined19:31
→ tflow joined19:32
→ gildasio joined19:32
→ chexum_ joined19:33
← chexum left19:33
← rama left19:35
→ cousteau joined19:35
→ Sulky joined19:36
← wootehfoot left19:38
→ john_johnk joined19:39
← jb1277976 left19:40
→ arescorpio joined19:41
→ jb1277976 joined19:42
→ sh0ne joined19:42
← bambanxx left19:46
→ bambanxx joined19:47
→ gazalam joined19:47
← Volu left19:49
← TonyStone left19:51
→ gazalam_ joined19:53
← gazalam left19:53
gazalam_ → gazalam19:54
→ elgraz joined19:55
→ DibbTubberOne joined19:56
← thebombzen left19:56
→ ferdna joined19:59
← zebrag left20:03
← ___nick___ left20:04
← DibbTubberOne left20:06
← shkurata left20:06
← Maxattax left20:11
← skapata left20:11
→ KZ-Spectra joined20:13
← KZ-Spectra left20:13
→ Maxattax joined20:13
← Flow left20:16
← cousteau left20:18
← bambanxx left20:23
→ wootehfoot joined20:23
← nyuszika7h left20:24
← coot left20:25
← Coop left20:27
→ derpydoo joined20:29
← rama_ left20:29
→ rama joined20:29
→ nyuszika7h joined20:32
← nyuszika7h left20:33
→ nyuszika7h joined20:34
→ Sasazuka joined20:36
← nyuszika7h left20:37
→ nyuszika7h joined20:37
← Sulky left20:37
→ Sulky joined20:37
← zer0bitz left20:40
→ lucasta joined20:40
→ rgrinberg joined20:43
→ rosco joined20:44
← lucasta left20:45
→ lucasta joined20:47
→ luke-jr joined20:50
→ sh0ne_ joined20:52
← Murr left20:52
← sh0ne left20:53
→ Murr joined20:53
← dob1 left20:54
→ sh0ne joined20:54
→ dob1 joined20:55
→ Coop joined20:56
← sh0ne_ left20:57
← wootehfoot left21:00
→ off^ joined21:02
← littlefinger left21:03
← arescorpio left21:04
← ozoned left21:06
→ bambanxx joined21:06
→ ketas joined21:08
← sd5 left21:09
← tflow left21:10
→ blahboybaz joined21:16
← chexum_ left21:17
← nyuszika7h left21:17
→ chexum joined21:18
→ nyuszika7h joined21:19
← blaklistd left21:20
← nyuszika7h left21:23
→ nyuszika7h joined21:23
→ irrgit joined21:25
← Sasazuka left21:25
→ vdamewood joined21:29
← nyuszika7h left21:30
→ nyuszika7h joined21:30
← dionysus69 left21:30
→ drbeco joined21:33
→ TonyStone joined21:34
→ ozoned joined21:39
← Tangent-Man left21:44
← gazalam left21:45
→ ccx joined21:48
ccx Is there a way to initialize submodules to an empty repository, so I can push into them?21:50
← rama left21:51
← rosco left21:52
← softirq left21:52
← gh34 left21:52
ccx Ordinarily I'm able to `git init` empty repo and push into it. But with submodules those it gets complicated as there's indirection into the .git/modules directory and I'm not sure how to setup it correctly without `git submodule update` which pulls, rather than pushes.21:52
← lucasta left21:53
← wallabra left21:53
→ wallabra joined21:54
→ lucasta joined21:54
→ trace1918 joined21:56
BtbN push into a submodule?21:57
A submodule is basically just the outer repo saying "this commit of that other repo goes here"21:57
DynamiteDan how do I remove a commit from a branch in a repository?22:02
ccx BtbN: Indeed. And there's some support for submodules whose "here" is relative path to the parent module. So you can clone the parent and it will infer the paths to the submodules.22:04
→ rama joined22:04
BtbN What? Submodules paths are always relative to the repo the submodule is in22:05
DynamiteDan: top commit or somewhere deeper in the history?22:06
→ Cleverness joined22:06
ccx [submodule "scripts"]22:06
path = scripts22:06
url = ./scripts22:06
^ like this22:06
→ coot joined22:06
← john_johnk left22:06
→ peirik_ joined22:07
ccx And while the clone direction works well enough I haven't found a good way to upload that structure to remote bar cloning locally from it & rsyncing it.22:07
BtbN No idea what that's even trying to accomplish22:08
← lucasta left22:09
→ lucasta joined22:09
→ softirq joined22:11
→ Sasazuka joined22:14
← rama left22:14
→ rama joined22:15
DynamiteDan BtbN, top commit22:16
→ agarr joined22:17
BtbN reset to the previous one and force push22:17
DynamiteDan ah okay. thanks22:17
BtbN keep in mind that if anyone else has already pulled it, they can and likely will push it again22:17
lolok-old → lolok22:22
← otisolsen70 left22:25
← lucasta left22:29
← mandeep left22:29
← peirik_ left22:29
← srinidhi left22:29
→ lucasta joined22:31
← rama left22:33
→ rama joined22:34
← coot left22:38
→ kexec joined22:38
← trace1918 left22:42
← rama left22:44
→ rama joined22:44
← leftyfb left22:47
→ leftyfb joined22:47
→ xx joined22:49
→ TheCatBehemoth joined22:51
→ trace1918 joined22:51
← TheCatBehemoth left22:54
→ sgt_chuckles joined22:55
← rama left22:56
→ cdown joined22:56
← agarr left22:58
→ agarr joined22:58
← trace1918 left22:59
→ nate1 joined23:01
← lolok left23:04
← lucasta left23:04
← jb1277976 left23:04
→ lucasta joined23:05
← lucasta left23:05
← nate1 left23:05
← sa0 left23:07
← sgt_chuckles left23:07
→ Betal joined23:12
→ thebombzen joined23:13
→ odoood__ joined23:13
→ shokohsc joined23:14
← Sasazuka left23:15
← ozoned left23:16
← geosmile left23:16
← feriman left23:18
→ naiveaigal joined23:19
naiveaigal Is there a way to put a git repository underneath another repo without making them separate per se? What I mean by this is that, as opposed to submodules, I need the child repo to be fully within the parent repo, and whenever I rewrite the child repo's history, I can use that as a commit to the parent repo23:21
nyuszika7h maybe git subtree is what you need? haven't used it much23:22
← bambanxx left23:22
→ peirik_ joined23:24
→ bambanxx joined23:29
naiveaigal nyuszika7h: that looks like a promising suggestion, thanks!23:30
← agarr left23:31
← sh0ne left23:37
→ thefons joined23:39
→ atrigent joined23:40
← atrigent_ left23:41
← thiago left23:42
→ reset joined23:51
← naiveaigal left23:53
→ mfiano joined23:55
→ Orby joined23:55
← mfiano left23:55
← blahboybaz left23:56
→ mfiano joined23:56
← mfiano left23:57
→ mfiano joined23:58
← odoood__ left23:59

Logs Search ←Prev date Next date→ Channels Documentation