IRCloggy #git 2022-05-20

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-05-20

← great_taste left00:00
→ sickdyd joined00:01
← Lord_of_Life left00:03
→ cdown_ joined00:04
← cdown left00:08
cdown_ → cdown00:08
→ mooz joined00:08
← rgrinberg left00:08
→ thebombzen joined00:09
→ foul_owl joined00:11
← vaio left00:14
← Sasazuka left00:14
→ vaio joined00:15
→ jenia2 joined00:18
← vdamewood left00:18
→ vdamewood joined00:19
← jclsn0 left00:23
← jenia2 left00:25
← vdamewood left00:26
→ vdamewood joined00:27
→ jclsn0 joined00:28
← TonyStone left00:32
→ great_taste joined00:34
← vicfred left00:35
→ kaiseisei joined00:35
→ Lord_of_Life joined00:38
← kaiseisei left00:40
→ kaiseisei joined00:40
→ TonyStone joined00:46
← DNH left00:49
← jclsn0 left01:00
→ jclsn0 joined01:01
← murii left01:02
Guest2003 → blahboybaz01:03
blahboybaz I have a couple questions related to moving a repository that currently exists upstream and locally to a new / different repsository (upstream and locally). I have an idea what I think would work and be easy but I need some clarification on a couple things before I'd want to try it. I have pasted the questions: https://pastebin.com/Am4XiNgz would anyone be willing to take a look?01:04
I have created a new repository upstream that I wish for it to reside in and I have the current repository locally and upstream (separate repository) at this time01:06
← cdown left01:08
← jclsn0 left01:08
→ jclsn0 joined01:13
← pretty_dumm_guy left01:13
← jclsn0 left01:20
→ jclsn0 joined01:21
→ hbautista joined01:26
→ llh joined01:28
→ murii joined01:29
blahboybaz I found a better way01:32
thanks anyway01:32
← jclsn0 left01:33
→ DNH joined01:33
→ xkuru joined01:34
← murii left01:34
← xkuru left01:37
→ jclsn0 joined01:38
blahboybaz What if I want to cut lop off the top half of the repository? (please try not to laugh). Its just got some bs in it that I don't think should be there. Theres a couple branches above where I want the new tip to be. Would I do something like reset HEAD hard or something like that? Then how to make it haul away that chopped off trash after that? Or is there some other way to do it?01:38
is git prune what deletes danglers?01:39
nedbat blahboybaz: "git reset --hard <OLD_COMMIT>" is how you would move the head back to an old commit.01:40
blahboybaz: then eventually the abandoned commits will be garbage collected01:41
blahboybaz nedbat: right on. Is there any way to make it do gc by executing some command? I thought I remember being prompted by git to run a command that does that but I don't recall what the command was01:44
And what about the remote?01:44
nedbat blahboybaz: you can run "git gc", but there's not much reason to.01:45
blahboybaz ok01:45
nedbat blahboybaz: when you "git push --force-with-lease" the remote head will also move back01:45
blahboybaz ahh01:45
cool01:45
thanks01:45
← DNH left01:48
← kaiseisei left01:51
→ kaiseisei joined01:51
blahboybaz nedbat: I guess there are a couple commits I would want to keep (rebase?) some of them lie in the middle of what would be discarded later (not at the tip). Rebase onto the top of the <OLD-COMMIT> ? then restet the head on top of those added commits?01:51
← jclsn0 left01:52
blahboybaz rebase --onto ?01:54
nedbat blahboybaz: you have a few ways to do that. One way would be to use "rebase -i" and drop the commits you don't want01:54
← LuxuryMode left01:57
→ jclsn0 joined01:57
→ sa0 joined01:58
← GNUmoon2 left01:58
→ bloody joined02:01
← romesrf left02:01
← FinnElija left02:03
→ finn_elija joined02:03
finn_elija → FinnElija02:03
→ murii joined02:04
→ JMcDon joined02:06
→ romesrf joined02:09
← sa0 left02:21
← bertvvvs left02:24
← igemnace left02:26
→ igemnace joined02:26
→ luckman212 joined02:28
→ realies joined02:35
→ rgrinberg joined02:41
← ferdna left02:43
← jclsn0 left02:43
← JMcDon left02:43
→ jclsn0 joined02:48
← terrorjack left02:52
→ terrorjack joined02:53
← jclsn0 left02:53
← vdamewood left02:55
→ vdamewood joined02:57
blahboybaz nedbat: There just no way for me to describe what I'm wanting to do by typing it. I just don't have a way to describe that won't lead to further confusion. Already I had to really stop and look at what is there and see that my initial assumption would not have been the right thing to do (what I asked about the first time). If you don't want to look at it I understand - it's like 4 min long - but I made a02:57
video using the graph of the repo to point out what I'm wanting to do. Its just a little more than I've ever tried to do with git and I'm not sure which commands to look into and what order to perform them. If you feel like taking a look its here: https://youtu.be/kjoXuiDnMKY if not I get that too.02:58
And the screenshot I used in the vid is here too: https://imgur.com/a/98xZyL402:58
→ jclsn0 joined02:59
← Murr left02:59
→ Murr joined02:59
← FinnElija left02:59
→ finn_elija joined02:59
finn_elija → FinnElija02:59
→ YuGiOhJCJ joined03:00
blahboybaz Don't bother messing with it. Every time I consider what I'm aiming to do I see how its not quite right. I'm still working through what to do. That video is a waste of time - sorry03:03
← jclsn0 left03:04
← murii left03:07
→ jclsn0 joined03:09
→ kaartic joined03:11
← kaartic left03:16
→ musti joined03:17
blahboybaz Ok I got it figured out (for sure) what I think I ought to do just not sure how to go about it.. I'll just put it out there if anyone wants to take a look. I got it down to just a hair over one minute (so short).03:17
https://youtu.be/pHhjmmS1pPU03:17
← musti left03:20
→ derfflinger_ joined03:24
← derfflinger_ left03:24
← zebrag left03:24
→ co-JOMBLO-39- joined03:26
blahboybaz Even if I just had the right references or articles to read or even the right ones to look for. I'm sure I'd learn a lot better by reading / studying it03:27
→ celphi joined03:30
← stef204 left03:32
← rgrinberg left03:36
→ murii joined03:36
← vdamewood left03:37
→ vdamewood joined03:37
← squirrel left03:39
→ kaartic joined03:45
← bloody left03:47
→ gco joined03:49
← riposte left03:54
→ riposte joined03:54
← kaartic left03:55
← gast0n left03:57
→ kaartic joined03:57
→ szkl joined03:58
← The_Blode_ left03:59
→ Dotz0cat_ joined03:59
← kaartic left04:01
Dotz0cat_ → Dotz0cat04:02
→ rgrinberg joined04:02
← rgrinberg left04:07
← Sulky__ left04:11
→ kaartic joined04:11
← ChmEarl left04:12
→ Sulky__ joined04:12
→ The_Blode joined04:13
← kaartic left04:16
→ yeirr joined04:18
→ GNUmoon joined04:19
← skered left04:21
← elastic_dog left04:21
→ k_sze joined04:21
← k_sze left04:21
→ k_sze joined04:24
→ elastic_dog joined04:28
→ coot joined04:30
→ skered joined04:32
← tyson2 left04:38
← jinsun left04:40
← murii left04:42
← gco left04:48
→ jazzy2 joined05:00
← jazzy left05:03
→ gurkenglas joined05:05
← great_taste left05:06
← jazzy2 left05:07
→ madewokherd` joined05:08
→ kaartic joined05:10
← madewokherd left05:12
→ murii joined05:12
→ jinsun joined05:17
← murii left05:17
← GNUmoon left05:18
→ mjt0k joined05:23
← kaartic left05:25
← igemnace left05:25
→ igemnace joined05:25
→ kaartic joined05:28
→ murii joined05:30
→ ice9 joined05:31
← Dotz0cat left05:31
→ murii_ joined05:31
→ Dotz0cat joined05:32
→ GNUmoon joined05:32
← murii left05:35
→ theoceaniscool joined05:36
← Dotz0cat left05:37
→ Dotz0cat joined05:37
← kaiseisei left05:37
→ kaiseisei joined05:39
← ice9 left05:41
← igemnace left05:42
→ igemnace joined05:42
→ vanessa joined05:43
← kaartic left05:44
→ kaartic joined05:44
← hoochmonger left05:48
← kaiseisei left05:50
→ kaiseisei joined05:52
← co-JOMBLO-39- left05:52
→ mexen joined05:52
→ magic_ninja joined05:53
→ co-JOMBLO-39- joined05:53
← GNUmoon left05:53
← kaartic left05:54
← Sulky__ left05:55
→ Sulky__ joined05:56
→ GNUmoon joined05:56
→ carl--- joined05:57
← GNUmoon left05:59
→ kaartic joined06:00
← carl-- left06:00
→ _vanessa_ joined06:01
← Sulky__ left06:02
← riposte left06:02
← _vanessa_ left06:02
→ Sulky__ joined06:02
→ GNUmoon joined06:02
← vanessa left06:04
← howdoi left06:04
← kaartic left06:05
← w_lehinsun left06:06
→ roadie joined06:07
→ sa0 joined06:13
← thiago left06:13
→ toluene joined06:15
→ pulse_ joined06:17
→ eroux joined06:17
← pulse left06:20
→ a joined06:20
a → Guest712606:20
← co-JOMBLO-39- left06:21
← atrigent left06:22
→ atrigent joined06:23
← Sulky__ left06:24
→ Sulky__ joined06:25
← reset left06:25
← eroux left06:30
→ hstct joined06:32
→ peterhull90 joined06:36
← Sulky__ left06:36
→ Sulky__ joined06:37
→ co-JOMBLO-39- joined06:38
← Guest7126 left06:40
→ palasso joined06:40
← Sulky__ left06:40
→ Sulky__ joined06:41
← szkl left06:42
→ kaartic joined06:46
← sa0 left06:46
← Sulky__ left06:48
→ masber joined06:48
← coot left06:48
→ riposte joined06:48
→ Sulky__ joined06:48
← kaartic left06:50
→ john_johnk joined06:56
→ mseidl joined06:56
← Murr left06:59
← masber left06:59
→ Murr joined06:59
→ sa0 joined07:02
→ eroux joined07:02
→ jazzy joined07:02
→ AnapodoPsalidaki joined07:03
← AnapodoPsalidi left07:04
→ rfuentess joined07:05
→ coot joined07:11
← skapata left07:12
→ kenan-office joined07:13
→ otisolsen70 joined07:13
→ ___nick___ joined07:13
← co-JOMBLO-39- left07:13
→ kaartic joined07:16
→ EvilDMP joined07:18
← kaartic left07:20
← eroux left07:20
→ jim87 joined07:20
← atrigent left07:23
→ masber joined07:23
← Betal left07:24
bgs I got "error: sha1 information is lacking or useless (<filename>)" when trying to apply a patch with git am07:25
what exactly does that mean?07:25
→ atrigent joined07:25
→ abu joined07:26
→ iomari891 joined07:27
← john_johnk left07:33
bookworm that you don't have the commit that is referenced by the patch07:34
← sa0 left07:35
→ sa0 joined07:35
→ Lich17 joined07:35
→ eroux joined07:35
← Lich17 left07:38
→ csm3105 joined07:42
← abu left07:42
→ drogas joined07:45
→ feriman joined07:46
→ john_johnk joined07:47
→ DibbTubberOne joined07:48
→ rsx joined07:48
← romesrf left07:52
← roadie left07:56
← DibbTubberOne left07:58
← FinnElija left07:58
← gxt left07:58
→ FinnElija joined07:59
→ gxt joined07:59
← jim87 left08:03
→ dionysus69 joined08:07
← GNUmoon left08:08
← blahboybaz left08:09
→ tulpa_ joined08:09
← pulse_ left08:10
← drogas left08:10
← gurkenglas left08:11
→ Celelibi joined08:11
→ drogas joined08:12
→ TheCatBehemoth joined08:14
→ romesrf joined08:15
← Sulky__ left08:17
← atrigent left08:26
→ ethrl joined08:27
→ atrigent joined08:28
→ roadie joined08:31
← sudoforge left08:36
← henko left08:36
→ sudoforge joined08:38
→ GNUmoon joined08:40
← roadie left08:41
← ackyshake left08:47
→ kaiseisei1 joined08:48
→ nuala2 joined08:49
← kaiseisei left08:49
kaiseisei1 → kaiseisei08:49
→ ackyshake joined08:55
→ zeenk joined08:55
→ Sulky joined08:55
← romesrf left08:58
← Murr left08:59
→ Murr joined08:59
→ romesrf joined08:59
→ Soulfire joined08:59
→ roadie joined09:07
→ Sulky_ joined09:11
→ TomyWork joined09:14
← Sulky left09:14
→ OJFord joined09:21
→ kaartic joined09:24
→ cdown joined09:24
→ nyah joined09:27
← kaartic left09:28
← bkircher left09:28
→ Rashad joined09:29
← atrigent left09:29
→ humanface joined09:29
→ atrigent joined09:30
→ m0viefreak joined09:36
→ bkircher joined09:36
← Soulfire left09:37
← sickdyd left09:37
→ Soulfire joined09:37
← Soulfire left09:37
→ DNH joined09:40
→ Soulfire joined09:41
← Soulfire left09:44
← jazzy left09:48
← romesrf left09:53
← DNH left09:54
← rfuentess left09:58
← yeirr left09:59
→ machaddr joined10:00
← humanface left10:02
→ sickdyd joined10:03
→ rfuentess joined10:08
← sickdyd left10:08
← wolf left10:10
← TheCatBehemoth left10:12
→ kaartic joined10:13
← bigendian left10:15
→ squirrel joined10:15
→ gas51627 joined10:15
→ ad__ joined10:15
← OJFord left10:17
← ad__ left10:21
→ ad__ joined10:21
→ romesrf joined10:23
→ DNH joined10:24
← ad__ left10:27
← kaartic left10:28
→ ad__ joined10:28
← drogas left10:29
← atrigent left10:30
→ wolf joined10:33
→ atrigent joined10:33
→ machaddr_ joined10:34
← machaddr left10:36
→ kaartic joined10:37
→ sickdyd joined10:38
← romesrf left10:40
→ romesrf joined10:41
← sickdyd left10:43
← kaartic left10:45
← roadie left10:46
→ kaartic joined10:50
→ forgotmynick joined10:51
→ roadie joined10:51
→ gurkenglas joined10:52
← kaiseisei left10:52
← masber left10:53
← kaartic left10:54
→ kaartic joined10:56
← vishal left10:56
← Ajax146 left10:58
→ Ajax1461 joined10:58
→ vishal joined10:59
← kaartic left11:00
← romesrf left11:02
→ romesrf joined11:04
→ kaartic joined11:04
→ sickdyd joined11:11
← kaartic left11:16
← sickdyd left11:16
← gurkenglas left11:19
← romesrf left11:20
← ackyshake left11:24
→ romesrf joined11:28
→ luckman212_ joined11:28
→ tyson2 joined11:28
← luckman212 left11:28
→ boka joined11:29
← atrigent left11:33
← romesrf left11:34
→ atrigent joined11:34
→ romesrf joined11:35
← peterhull90 left11:37
→ ice9 joined11:38
ice9 how to clone repo by providing username/password interactively without using public key?11:38
← sudoforge left11:41
osse use the https URL11:41
→ wakeup joined11:43
→ kaartic joined11:44
→ pflanze joined11:48
← romesrf left11:48
← kaartic left11:49
← machaddr_ left11:49
→ peterhull90 joined11:50
→ sudoforge joined11:53
→ micah joined11:55
furrymcgee see man gitcredentials "REQUESTING CREDENTIALS"11:56
gitinfo the gitcredentials manpage is available at https://gitirc.eu/gitcredentials.html11:56
micah i've got a .gitignore that has one entry for a binary and nothing else. i've created a directory 'conf' and added files there, but git is ignoring them and I don't understand why11:56
if I try to add the files, git says they are ignored, and to pass -f if I really want to do it11:56
ok i see that the binary that I'm ignoring is the same name as a directory under conf, so I guess that is why it is ignoring it11:58
← sudoforge left11:58
→ Noisytoot joined11:58
← vicecea left11:59
osse micah: you can use git check-ignore11:59
→ vicecea joined11:59
micah osse: that was what I was looking for, thanks!12:00
→ sudoforge joined12:01
→ sickdyd joined12:01
→ bertvvvs joined12:02
← wakeup left12:02
→ Ajax14615 joined12:03
← Ajax1461 left12:05
Ajax14615 → Ajax146112:05
← sickdyd left12:06
→ romesrf joined12:07
→ jinsun__ joined12:08
← csm3105 left12:08
← jinsun left12:09
← nickel715 left12:11
→ abu joined12:12
← coot left12:12
→ opow joined12:13
→ nickel715 joined12:13
→ coot joined12:14
→ csm3105 joined12:14
→ yeirr joined12:15
← csm3105 left12:16
← gas51627 left12:24
→ pulse_ joined12:26
← astlep left12:27
pulse_ → pulse12:27
← malteger left12:28
→ malteger joined12:31
← opow left12:33
← atrigent left12:35
← otisolsen70 left12:38
← boka left12:38
→ atrigent joined12:46
→ rgrinberg joined12:50
→ samuelbernardo joined12:51
→ bloody joined12:53
← rgrinberg left12:55
← p3rry left12:56
← Murr left12:58
→ Murr joined12:59
← roadie left13:00
→ gildasio joined13:01
→ vladoski joined13:01
→ OnkelTem joined13:04
→ vimal joined13:04
→ vodkra joined13:05
→ RiFo joined13:07
← eroux left13:08
← forgotmynick left13:10
→ odoood joined13:12
stutz git:// uses tcp right?13:13
→ kaartic joined13:13
→ hoochmonger joined13:13
→ a1eaiactaest joined13:14
bremner yes13:15
stutz thanks, so the problem is not that :D13:16
← kaartic left13:17
← odoood left13:19
← jinsun__ left13:20
→ jinsun joined13:20
→ odoood joined13:21
← a1eaiactaest left13:21
← vodkra left13:23
→ vodkra joined13:23
→ roadie joined13:25
→ cousteau_ joined13:28
← romesrf left13:30
→ junktext joined13:30
cousteau_ Merging a branch will require using a newer version of a tool, so I will need to modify the documentation in master to say "Use Tool v2.0 or newer" instead of v1.0.13:30
Should I modify the doc and then merge, or merge and then modify the doc?13:31
← roadie left13:31
selckin modify it on the branch?13:32
cousteau_ (also, a silly reason I want to change something before merging is that I have already merged master into the feature branch, and I kinda want the graph to show this merge going two ways and to give me the opportunity to write a proper merge commit message, but if I merge directly it'll fast-forward... Not sure if I should --no-ff only because of that)13:33
← hstct left13:33
cousteau_ selckin: that'd make sense, yeah... But the truth is that the change also affects the current branch (I should've introduced it earlier)13:34
→ cvmn joined13:34
selckin roll a dice13:34
→ sickdyd joined13:35
cousteau_ I think I'll --no-ff, for the sake of the graph13:36
→ zebrag joined13:36
→ roadie joined13:37
→ fillx joined13:40
← sickdyd left13:40
→ drogas joined13:41
karstensrage say i know a commit id like f3abe8533c3, how do you show the commit before that one13:42
or the diffs from the one before to the one you know13:42
osse karstensrage: the commit before foo is foo~113:43
the commit before that is foo~213:43
karstensrage is that a tilde?13:43
osse so you can do git diff foo~1 foo13:43
karstensrage or dash13:43
osse That is a tilde13:43
karstensrage ok13:43
osse man gitrevisions13:44
gitinfo the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html13:44
← Rhonda left13:44
karstensrage thank you osse thats what i needed13:45
→ Rhonda joined13:45
← fillx left13:46
→ fillx joined13:46
→ cdown_ joined13:48
→ roadie` joined13:49
→ han-solo joined13:49
← cdown left13:51
cdown_ → cdown13:51
← OnkelTem left13:51
← roadie left13:52
→ reset joined13:52
→ OnkelTem joined13:54
← kenan-office left13:59
← bodiccea left14:01
→ opow joined14:03
← roadie` left14:05
← vdamewood left14:06
nedbat karstensrage, osse: also: foo^ iiuc14:08
→ ChmEarl joined14:09
→ romesrf joined14:12
← fillx left14:12
→ filly joined14:12
mackerman There is a difference. ~2 is first parent of first parent, but ^2 is second parent14:12
→ thiago joined14:14
osse indeedily doodely14:14
← romesrf left14:16
→ bodiccea joined14:17
→ gurkenglas joined14:19
← opow left14:20
→ madewokherd joined14:22
← madewokherd` left14:24
→ pretty_dumm_guy joined14:25
← remedan left14:30
← filly left14:31
→ filly joined14:32
→ LuxuryMode joined14:32
→ fillx joined14:36
→ remedan joined14:37
→ opow joined14:38
← filly left14:38
→ rkta__ joined14:41
→ gast0n joined14:42
→ romesrf joined14:42
rkta__ → rkta14:44
← bertvvvs left14:44
← Rashad left14:48
cousteau_ ^1 ^2 etc are useful for merge commits, so if you want to specify "the commit before" but there are several "commit before"s, you may want to specify foo^1 or foo^2. Alas, I have no idea which is which.14:48
← opow left14:48
cousteau_ I suppose ^1 will be the branch into which the merge was done, and ^2 the merged branch.14:49
← rkta left14:50
Marmotte cousteau_: there is an illustration of that in the manpage but... not really useful IMO :D14:51
← cvmn left14:52
Marmotte (in the "git revisions" manpage)14:52
→ rkta_ joined14:52
rkta_ → rkta14:52
matthewcroughan_ how do you ignore all files below the root, by a certain name? Is that possible?14:52
I want to ban the file "foo" from being anywhere other than the root14:52
"foo" is only allowed at the root.14:52
cousteau_ foo !/foo14:54
→ rgrinberg joined14:54
cousteau_ (in two separate lines in .gitignore)14:54
I.e., "ignore all files/folders named 'foo', but don't ignore files/folders named 'foo' in root"14:55
→ kenanmarasli joined14:56
cousteau_ Or... Maybe you can do just /*/**/foo14:56
"ignore foo any number of levels below any subfolder of root"14:57
cambrian_invader is it possible to disable submodule.recurse only for particular submodules?14:57
→ jokerface joined15:01
jokerface Please join to my new channel #stockmarkets15:01
← jokerface left15:01
→ summercampusr01 joined15:05
summercampusr01 looking for summer camps for elementary grade kids, Is there any git related learning summer camps for kids or materials available?15:06
→ sickdyd joined15:07
cousteau_ now feels ashamed for only learning git in the last years of college15:07
← sickdyd left15:12
← fillx left15:18
← rgrinberg left15:22
← ice9 left15:25
→ KnoP joined15:27
← vladoski left15:29
→ dimi1947 joined15:32
← OnkelTem left15:33
← mitrokov left15:35
← theoceaniscool left15:35
← lilgopher left15:35
→ OnkelTem joined15:36
→ theoceaniscool joined15:38
← dtux left15:40
→ dtux joined15:40
← mseidl left15:41
→ szkl joined15:41
→ vitali64 joined15:41
← dtux left15:41
→ haise01 joined15:42
← gast0n left15:42
→ iamtheranger joined15:44
→ t0mm13b_ joined15:45
→ gh34 joined15:45
→ dtux joined15:46
← t0mm13b left15:46
→ ws2k3 joined15:46
→ iffraff joined15:47
→ wakeup joined15:47
← madewokherd left15:48
← dtux left15:49
→ kaartic joined15:52
→ dtux joined15:52
→ jim87 joined15:54
← rsx left15:54
← kaartic left15:56
← junktext left15:56
→ bertvvvs joined15:57
→ opow joined15:58
← Visor left15:59
→ Visor joined15:59
← peterhull90 left16:02
← jim87 left16:05
← opow left16:08
→ machaddr joined16:08
← machaddr left16:09
→ hstct joined16:11
← odoood left16:13
→ rgrinberg joined16:16
← rgrinberg left16:20
→ great_taste joined16:23
← zeenk left16:24
→ dos_ joined16:26
→ vicfred joined16:26
← drogas left16:29
← carl--- left16:30
→ slaughter joined16:31
← theoceaniscool left16:32
← micah left16:33
→ Guest8417 joined16:35
← pflanze left16:38
← tyson2 left16:39
← rfuentess left16:40
→ rkta__ joined16:41
← rkta__ left16:42
← tulpa_ left16:42
← dos_ left16:43
← slaughter left16:44
→ rkta__ joined16:46
← atrigent left16:47
→ atrigent joined16:48
← YuGiOhJCJ left16:50
→ howdoi joined16:51
← cousteau_ left16:51
→ madewokherd joined16:54
← rkta__ left16:58
→ rkta__ joined16:59
← coot left17:00
→ dos_ joined17:00
← dos_ left17:01
→ dos_ joined17:01
→ Sasazuka joined17:05
← ano left17:14
→ skapata joined17:14
← skapata left17:14
→ skapata joined17:14
→ ano joined17:16
→ Anarchic joined17:19
→ megamus_prime_ joined17:19
→ rgrinberg joined17:19
← Anarchic` left17:20
← yeirr left17:23
→ jinsun__ joined17:27
← GNUmoon left17:29
→ GNUmoon joined17:30
← jinsun left17:30
→ Sasazuka__ joined17:30
→ tyson2 joined17:32
← Sasazuka left17:32
← dimi1947 left17:33
← Sasazuka__ left17:35
→ Sasazuka joined17:36
← blaklistd left17:36
→ sickdyd joined17:36
→ blaklistd joined17:36
← sickdyd left17:41
→ sobkas joined17:42
→ Betal joined17:43
→ mseidl joined17:45
← dionysus69 left17:47
← atrigent left17:48
← mseidl left17:49
→ atrigent joined17:49
→ AriESQ joined17:54
AriESQ does anyone have a .gitconfig that uses an `includeif` directive to load different git config profiles?17:54
ikke yes18:00
← OnkelTem left18:06
→ justsomeguy joined18:06
← GNUmoon left18:07
→ OnkelTem joined18:08
→ bambanxx joined18:13
→ carl--- joined18:13
AriESQ could I ask you to throw up a gist/pastebin (anonymized)? I've been working on this for ~2 hours and I can't get it to work18:16
ikke https://tpaste.us/oODY18:18
→ murii joined18:19
→ coot joined18:19
→ GNUmoon joined18:20
← mexen left18:21
← bambanxx left18:22
← dtux left18:22
← murii_ left18:23
AriESQ Hrm. mine fails even if I omit your second line. And I made sure the dir `gitdir` references 1) exists and 2) has a repo in it. IDK, I think i've run into a macos bug :/ Next step is to try it on linux18:24
← rgrinberg left18:31
→ teut joined18:33
← jiffe1 left18:34
→ jiffe1 joined18:36
← coot left18:37
← locrian9 left18:38
→ bambanxx joined18:39
→ ramblebamble joined18:40
→ XV8 joined18:42
← adanwan left18:42
→ adanwan joined18:42
→ molt joined18:48
→ leon joined18:48
→ ackyshake joined18:49
← Guest8417 left18:49
→ odoood joined18:49
← atrigent left18:49
→ atrigent joined18:56
→ Jong joined18:57
← iomari891 left18:58
← Murr left18:58
→ Murr joined18:58
→ zer0bitz joined18:58
→ fillx joined18:59
← zebrag left19:01
→ rgrinberg joined19:05
→ ice9 joined19:09
← t0mm13b_ left19:10
→ ice99 joined19:12
← ramblebamble left19:12
→ jazzy joined19:13
← ice9 left19:14
→ ice9 joined19:15
← DNH left19:16
← ice99 left19:17
← odoood left19:17
→ causasui joined19:20
← TomyWork left19:20
← XV8 left19:22
→ XV8 joined19:23
← Jck_true left19:23
→ Jck_true joined19:23
← rkta__ left19:24
→ rkta__ joined19:24
← rkta__ left19:25
→ wpcarro joined19:28
wpcarro someone committed sensitive data, and I used `git rebase` to change it to "REDACTED". gitleaks still reports a commit as having that info, but `git show-ref` returns nothing... how can I further purge this from my repo?19:30
→ lukedashjr joined19:32
wpcarro I tried expiring the reflog and garbage-collecting, but it's sticking around (zombie commit!)19:33
how can I dig deeper to understand what's referencing this commit?19:33
← luke-jr left19:33
lukedashjr → luke-jr19:33
ikke wpcarro: can you try git prune --expire now19:35
← justsomeguy left19:36
wpcarro trying19:36
wpcarro should I gc after?19:36
← kenanmarasli left19:36
ikke No, git prune is part of git gc19:36
wpcarro hmm okay - commit still exists :(19:37
← tyson2 left19:37
wpcarro git show confirms the sensitive data still therein19:37
← bkircher left19:38
ikke wpcarro: can you find the commit with `git log --oneline --no-walk --source --all`?19:39
selckin my script to remove everything has unreachable is 'git reflog expire --expire=now --all && git gc --prune=now' but ikke probably knows better19:40
wpcarro git branch -a --contains commit doesn't report anything either19:40
← teut left19:42
← foul_owl left19:42
→ pflanze joined19:43
wpcarro not sure why `git show-ref $commit` exits non-zero but `git show $commit` shows the diff19:45
ikke a commit is not a ref19:46
wpcarro ah okay :facepalm:19:46
I assumed it showed references to the commit19:46
← KlungelSmurf left19:47
→ KlungelSmurf joined19:47
wpcarro `git for-each-ref --contains $commit` seems to report a few things19:47
← rgrinberg left19:49
← john_johnk left19:51
→ john_johnk joined19:51
→ kaartic joined19:52
← molt left19:53
← dos_ left19:53
→ foul_owl joined19:56
← kaartic left19:57
→ junktext joined19:58
← summercampusr01 left19:59
← ___nick___ left20:04
→ NeilRG joined20:06
NeilRG how do I revert a file in a branch to the version from main?20:06
(without using checkout)20:06
git reset doesn't seem to work?20:06
ikke NeilRG: What is wrong with checkout?20:06
NeilRG ah n20:06
nm20:06
ikke, I disabled it20:06
I'm trying to learn to do everythign with git switch and git reset20:07
→ teut joined20:07
ikke you want restore, not reset20:07
→ sickdyd joined20:07
NeilRG sorry I meant git restore and git switch20:07
but in this cas,e I had to use reset?20:07
git reset main -- path-to-file20:07
ikke That would not update the file in your working tree20:08
→ machaddr joined20:08
ikke git checkout <commit> <file> or git restore -s <commit> -SW <file>20:09
NeilRG ikke, yeah it's confusing me20:09
ikke, I disabled checkout20:09
ah -s20:09
okay thanks20:09
grs -s main -SW file?20:10
ikke ?20:11
← han-solo left20:13
← sickdyd left20:14
→ t0mm13b joined20:17
→ locrian9 joined20:17
→ Shentino_ joined20:24
← Shentino_ left20:25
← Shentino left20:26
← machaddr left20:29
← Vonter left20:33
→ coot joined20:35
← hoochmonger left20:39
→ Sulky__ joined20:45
→ nate1 joined20:46
← Sulky_ left20:47
← ano left20:49
← fling left20:49
← chexum left20:49
→ ano joined20:50
→ chexum joined20:50
→ fling joined20:50
wpcarro I think all of the references are in refs/replace... does git-filter-repo create those maybe?20:51
← txtsd1 left20:51
→ moldorcoder7 joined20:52
→ txtsd1 joined20:53
wpcarro is there a danger is deleting all replace refs?20:55
← sobkas left20:55
← coot left20:57
← atrigent left20:58
→ atrigent joined20:58
→ odoood joined20:58
← odoood left20:59
← ano left21:00
→ ano joined21:01
wpcarro solution - `git replace -d $(git for-each-ref --contains $commit | awk '{print $3}' | sed 's/refs\/replace\///')`21:01
→ midnight joined21:02
midnight I have ancient mirrors of git repositories which are long-ago labelled private now, or otherwise defunct on github. Now, when I attempt to git fetch --all, it sits there waiting for me to key in a user/pass. I would like to just short-circuit fail this. Is there some setting that I can't find, like --batch or something which will skip that and just fail?21:03
← LuxuryMode left21:03
← madewokherd left21:04
← feriman left21:05
← romesrf left21:08
← Tabmow left21:08
midnight nvm, found GIT_ASKPASS and I have a small script just output nonsense vars. Thanks!21:09
← midnight left21:09
← bertvvvs left21:09
→ Tabmow joined21:10
← szkl left21:10
← ethrl left21:13
← bambanxx left21:14
→ zebrag joined21:14
→ tyson2 joined21:15
← crabbedhaloablut left21:21
→ crabbedhaloablut joined21:22
← vitali64 left21:23
← gh34 left21:23
← NeilRG left21:27
→ Guest9018 joined21:29
→ madewokherd joined21:33
← causasui left21:33
← Guest9018 left21:34
← fillx left21:38
← zer0bitz left21:38
← OnkelTem left21:38
→ blahboybaz joined21:39
← blahboybaz left21:39
→ blahboybaz joined21:39
→ OnkelTem joined21:41
→ bambanxx joined21:48
← nate1 left21:48
→ queue- joined21:50
← wakeup left21:51
← great_taste left21:56
← adanwan left21:56
→ adanwan joined21:57
← atrigent left21:59
→ atrigent joined22:00
← palasso left22:03
← teut left22:04
→ teut joined22:04
→ Echoz joined22:08
→ vancz joined22:14
← john_johnk left22:18
wpcarro any reason `git-filter-repo --path 'path/to/__pycache__' --invert-paths` wouldn't delete path/to/__pycache__ from a repo?22:20
I've even tried `git-filter-repo --path-regex '.*__pycache__.*' --invert-path`... is there special behavior with directories? Help page says dir or file22:20
← derfj left22:25
← ice9 left22:29
→ derfj joined22:29
← Sulky__ left22:30
← crabbedhaloablut left22:32
→ crabbedhaloablut joined22:33
← crabbedhaloablut left22:33
→ crabbedhaloablut joined22:33
← murii left22:37
→ sickdyd joined22:38
← riposte left22:38
← bambanxx left22:41
← sickdyd left22:43
← locrian9 left22:44
→ rgrinberg joined22:48
→ bambanxx joined22:52
← bambanxx left22:52
← m0viefreak left22:53
→ mw_ joined22:55
→ riposte joined22:57
→ wolfshappen joined23:00
→ fillx joined23:03
← teut left23:04
← fillx left23:08
← sa0 left23:09
← FinnElija left23:10
→ Azem joined23:13
→ Shentino joined23:13
→ ferdna joined23:15
← haise01 left23:15
→ sickdyd joined23:16
← ferdna left23:25
→ ferdna_ joined23:25
→ sa0 joined23:29
← onizu left23:29
← OnlineCop left23:32
→ FinnElija joined23:32
← sa0 left23:33
← carl--- left23:34
→ drew joined23:37
← Azem left23:38
← LuKaRo left23:40
→ LuKaRo joined23:45
← ferdna_ left23:48
← wolfshappen left23:48
→ ferdna joined23:48
→ szkl joined23:50
→ piwu joined23:51
← blahboybaz left23:53

Logs Search ←Prev date Next date→ Channels Documentation