IRCloggy #git 2021-03-30

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.

2021-03-30

← monk12 left00:01
→ gry joined00:04
← thisismo left00:04
gry can git push to a repo via sftp, without ssh?00:05
qpdb → Guest792800:09
← Guest7928 left00:09
→ qpdb joined00:09
← thebope left00:15
← tiin57 left00:16
← oriba left00:16
mackerman gry: Not natively. You could git bundle into an archive, upload that, then on the other host unbundle and fetch00:16
gry ok00:17
→ Dotz0cat_ joined00:17
← Dotz0cat left00:18
→ tiin57 joined00:19
→ arcatech joined00:19
→ redcaptrickster joined00:20
→ ferdna joined00:21
→ kiweun joined00:23
← arcatech left00:24
→ twb joined00:26
← rewrited left00:27
← fission6 left00:29
← SebastianFlyte left00:39
← gearnode left00:41
← luke-jr left00:42
→ krofe joined00:43
→ SebastianFlyte joined00:44
← redcaptrickster left00:45
← tiin57 left00:46
→ luke-jr joined00:47
← leprechau left00:47
→ arcatech joined00:47
← random_yanek left00:48
← kupi left00:48
→ tiin57 joined00:49
→ jstimm joined00:51
← arcatech left00:52
← shush left00:52
→ nabil__ joined00:55
→ leprechau joined00:55
← Xenguy left00:56
→ Xenguy joined00:57
← nabil_ left00:58
→ random_yanek joined00:59
← PJBoy left01:00
→ nabil joined01:00
← nabil__ left01:00
← cyrus_mc_ left01:01
← stats4647 left01:01
← gast0n left01:10
← blyat-73 left01:12
→ gast0n joined01:13
→ nabil_ joined01:13
← cdown left01:13
→ BSaboia joined01:16
← tiin57 left01:16
← nabil left01:16
→ hussam joined01:16
→ dka joined01:16
← nabil_ left01:17
← irc_user left01:18
→ nabil joined01:18
← mowcat left01:19
→ tiin57 joined01:19
← Seveas_ left01:22
→ Seveas joined01:23
← BSaboia left01:25
← crose left01:27
← jstimm left01:29
← fax left01:33
→ nsc_ joined01:39
← CryptoClub left01:39
← SebastianFlyte left01:40
→ CryptoClub joined01:41
← nsc left01:42
→ SebastianFlyte joined01:44
→ Muimi joined01:46
← tiin57 left01:46
→ tiin57 joined01:49
← jesusJesse left01:54
← mar77i left01:54
→ jesusJesse joined01:54
→ skyikot joined01:58
← Aquazi left01:59
← jstein left02:00
← zebrag left02:02
→ FinnElija joined02:05
finn_elija → Guest2605302:05
FinnElija → finn_elija02:05
→ vicfred_ joined02:06
← vicfred left02:06
→ hd1 joined02:07
hd1 can I run a pre-push hook only on a given remote?02:07
rather, how can I do this?02:07
← Guest26053 left02:08
← fercell left02:12
→ thomas_2_ joined02:12
→ fercell joined02:12
← thomas_25 left02:13
← tiin57 left02:16
→ tiin57 joined02:19
→ nabil_ joined02:19
→ drbean_ joined02:21
← nabil left02:22
← danielcg left02:24
→ danielcg joined02:28
→ nabil__ joined02:29
← nabil_ left02:32
← vicfred_ left02:33
← SebastianFlyte left02:39
→ SebastianFlyte joined02:44
← tiin57 left02:45
→ Goplat joined02:47
→ tiin57 joined02:49
← yrzr95508257854 left02:50
→ yrzr95508257854 joined02:51
← kjartan left02:52
← yrzr95508257854 left02:53
← pac1 left02:54
→ kjartan joined02:54
→ yrzr95508257854 joined02:55
← mindCrime_ left02:57
→ c4017 joined02:59
← AlpineLlama left03:00
→ AlpineLlama joined03:02
← shailangsa left03:02
← EvanCarroll left03:03
← hussam left03:03
← rustyshackleford left03:13
← causasui left03:15
← tiin57 left03:16
→ thisismo joined03:17
→ tiin57 joined03:19
→ shailangsa joined03:20
← lucasb left03:20
← Xenguy left03:24
← skyikot left03:24
← haritz left03:33
← n3wborn left03:33
→ mindCrime_ joined03:33
← AnAverageHuman left03:35
← vorona left03:38
← SebastianFlyte left03:39
→ AnAverageHuman joined03:42
← LuxuryMode left03:42
← leprechau left03:43
→ SebastianFlyte joined03:44
← hidedagger left03:45
← tiin57 left03:45
→ leprechau joined03:49
→ tiin57 joined03:49
← Wetmelon left03:51
→ Nitrousoxide joined03:55
→ fahadash joined03:59
→ LuxuryMode joined04:00
← mindCrime_ left04:02
→ arcatech joined04:13
→ Guest20 joined04:15
← tiin57 left04:16
← howdoi left04:16
→ tiin57 joined04:19
← arcatech left04:19
→ FH_thecat joined04:23
← yrzr95508257854 left04:27
→ yrzr95508257854 joined04:28
← SebastianFlyte left04:39
← long4mud left04:41
→ nabil_ joined04:43
→ long4mud joined04:43
← Dotz0cat_ left04:43
→ Dotz0cat joined04:44
→ SebastianFlyte joined04:44
← nabil__ left04:45
← tiin57 left04:45
→ mindCrime_ joined04:47
→ tiin57 joined04:49
← madewokherd left04:49
→ samjq893 joined04:49
← thiago left04:55
← mindCrime_ left04:58
→ thisismo1 joined04:59
→ ilmostro joined05:04
→ atharvaraykar joined05:06
eb0t_ → eblip05:08
← hd1 left05:08
← kiweun left05:10
← AnAverageHuman left05:15
← tiin57 left05:15
ikke I don't think there is a way05:18
oh,gone05:18
← samjq893 left05:19
→ samjq893 joined05:19
→ tiin57 joined05:19
← samjq893 left05:19
← xissburg left05:21
← gast0n left05:22
twb wouldn't you patch the hook script to test some variable05:23
if $destination != github; exit; fi05:23
ikke How to get $destination?05:24
you only get the local ref, the remote ref and the hash05:25
refs/heads/master 67890 refs/heads/foreign 1234505:25
oh, I missed05:26
it does get the name of the remote through args05:26
then yes05:26
twb ikke: last time I looked at hooks (a long time ago) there was a bunch of crap in environment05:29
← gry left05:29
twb ikke: never mind, you answered your own question :-)05:29
→ Metalsutton joined05:30
twb Is there something I can set in ~/.gitconfig so that all new git metadata is validated as being well-formed UTF-8?05:37
I am sick of crap like https://github.com/torvalds/linux/commit/12e66f6573be breaking my statistics scripts05:38
gigasu_shida → gigas_cedar05:38
← SebastianFlyte left05:39
twb Obviously I can't fix historical commits, but if I can catch commits early, I can go yell at people and make them fix their dotfiles before it's too late05:39
← cliluw left05:40
→ cliluw joined05:40
ikke what is wrong with that commit?05:43
→ SebastianFlyte joined05:44
→ jaziz joined05:45
← tiin57 left05:46
twb ikke: it's in ISO-8859-105:46
I don't mean the changes to the file, I mean the commit author05:47
← long4mud left05:47
twb a straightforward test is "git show 12e66f6573be | iconv" (or iconv --from utf-8 --to utf-8, if your environment is weird)05:48
→ sord937 joined05:49
→ long4mud joined05:49
→ tiin57 joined05:49
→ n3wborn joined05:50
← durham_ left05:51
← Guest20 left05:52
← cliluw left05:54
→ cliluw joined05:54
← cliluw left06:00
→ cliluw joined06:00
← jesusJesse left06:02
← dmvrtx left06:08
→ dmvrtx joined06:09
→ rcoote joined06:13
→ rfuentess joined06:15
← tiin57 left06:16
→ tiin57 joined06:19
→ nabil__ joined06:21
→ Repox joined06:21
→ shabius joined06:22
← nabil_ left06:24
→ Marvin75 joined06:24
← thisismo1 left06:26
← thisismo left06:26
← Hello71 left06:29
← hololeap left06:29
→ Hello71 joined06:30
→ LetoThe2nd joined06:30
← Goplat left06:33
→ meropyri- joined06:36
→ wgrant joined06:37
← meropyri left06:37
meropyri- → meropyri06:37
← SebastianFlyte left06:39
→ rsx joined06:42
→ SebastianFlyte joined06:44
← tiin57 left06:45
← Repox left06:48
→ tiin57 joined06:49
→ kiweun joined06:50
← cliluw left06:54
← kiweun left06:55
→ KnoP joined06:55
← LuxuryMode left07:02
← unluckyshrubbery left07:03
→ chele joined07:12
→ olx69 joined07:15
← tiin57 left07:15
← alex88 left07:17
→ alex88 joined07:17
→ kadoban__ joined07:17
→ noidea joined07:19
→ tiin57 joined07:19
→ Lord_of_Life joined07:22
→ Guest20 joined07:24
← pcarphin left07:24
→ sebas057 joined07:24
→ mr_francois3 joined07:24
→ sagagnon40 joined07:24
→ pcarphin joined07:24
← krofe left07:24
→ oxymoron93 joined07:25
← mr_francois left07:25
← sagagnon4 left07:25
← sebas05 left07:25
→ amahl joined07:31
→ TomyWork joined07:33
← nsh left07:36
→ Haohmaru joined07:36
→ nsh joined07:38
← SebastianFlyte left07:39
← nsh left07:40
→ jarodit joined07:40
→ elSueco3 joined07:42
→ tgunr_ joined07:43
→ nashimus_ joined07:43
→ chrisml` joined07:43
→ dpl- joined07:43
→ canton7_ joined07:44
← Xiti left07:44
→ shored1 joined07:44
→ kshockey joined07:44
← kshockey left07:44
→ kshockey joined07:44
→ SebastianFlyte joined07:44
→ ddevault_ joined07:45
→ waveclaw_ joined07:45
→ test joined07:45
← tiin57 left07:45
test → Guest9447007:46
← nashimus left07:46
← tgunr left07:46
→ nsh joined07:47
← nsh left07:47
← cbreak left07:47
canton7_ → canton707:47
← ddevault left07:47
← fibo_mach left07:47
← meLon left07:47
← elSueco left07:47
← kevr left07:47
← mu left07:47
elSueco3 → elSueco07:47
ddevault_ → ddevault07:47
→ kevr` joined07:47
→ cbreak joined07:47
→ meLon joined07:47
→ fibo_mach joined07:48
← anddam left07:48
← wgrant left07:49
→ tiin57 joined07:49
→ nsh joined07:49
→ mu joined07:50
← jarodit left07:51
→ manjaroi3 joined07:51
← pcarphin left07:56
← sebas057 left07:56
← sagagnon40 left07:56
← mr_francois3 left07:56
→ sagagnon40 joined07:56
→ sebas057 joined07:56
→ pcarphin joined07:56
← Guest20 left07:56
→ mr_francois3 joined07:56
kevr` → kevr07:57
→ mobidrop_ joined08:01
→ mar77i joined08:01
→ nabil_ joined08:02
← mobidrop left08:03
← nabil__ left08:04
← mar77i left08:05
← cd left08:06
→ _flow_ joined08:06
→ vingel joined08:06
← vingel left08:07
← k3yp left08:08
→ Guest20 joined08:09
→ jarodit joined08:10
← jarodit left08:12
→ jarodit joined08:12
← manjaroi3 left08:13
← jarodit left08:13
→ jarodit joined08:13
← nsh left08:14
→ hinderaker joined08:14
→ haymawk joined08:14
← cbreak left08:14
→ cbreak joined08:14
← jarodit left08:14
← natechan left08:14
→ jarodit joined08:14
→ anddam joined08:15
← tiin57 left08:16
→ natechan joined08:16
→ agio joined08:17
→ jaroditi joined08:17
← jarodit left08:17
← jaroditi left08:17
→ z8z joined08:18
→ Muimi_ joined08:18
← Muimi_ left08:18
→ nsh joined08:18
→ jesseTree joined08:18
→ Muimi_ joined08:18
← Muimi_ left08:18
→ tiin57 joined08:19
← Muimi left08:21
→ nabil__ joined08:26
→ Aquazi joined08:27
← nabil_ left08:29
→ nabil_ joined08:29
← nabil_ left08:30
→ nabil_ joined08:30
← mat001 left08:32
← nabil__ left08:32
← rfuentess left08:35
→ wgrant joined08:38
← SebastianFlyte left08:39
← drbean_ left08:41
← ferdna left08:42
← terabyte left08:42
→ nabil joined08:43
← Metalsutton left08:43
→ SebastianFlyte joined08:45
← nabil_ left08:45
← tiin57 left08:45
→ gearnode joined08:48
→ unluckyshrubbery joined08:51
← z8z left08:51
→ tiin57 joined08:51
→ jaggz joined08:53
jaggz can I have git sudo when it gets to a remote host to clone/pull?08:53
I have a repo owned by root but need to ssh in as a normal user first08:54
← Marvin75 left08:54
→ z8z joined08:55
henk maybe you can do something with ssh’s -J/ProxyJump08:58
→ PJBoy joined09:01
twb -J can't run sudo, although in principle ProxyCommand could09:07
What you want is the equivalent of rsync --rsync-path='sudo nice rsync'09:08
You could also do this with a force command, if you're prepared to use a separate certificate for git's SSH09:09
← gigas_cedar left09:10
twb "man git remote-helpers" looks relevant, if you want something like ssh+sudo://alice@example.com/etc/.git09:11
gitinfo the git-remote-helpers manpage is available at https://gitirc.eu/git-remote-helpers.html09:11
← danielcg left09:12
→ john_johnk joined09:12
jaggz hmm09:14
I'd want to keep the setup simple. I think I should just move that repo into the user's dir and have root access that one09:15
← tiin57 left09:15
jaggz (it's my server setup scripts, in a repo, which need to be run by root.. so I just created the repo as root.. but I can do it as a normal user and root use it, or the normal user sudo to run the scripts)09:15
← hnOsmium0001 left09:15
jaggz thanks homies09:15
someone teach me the new slang09:16
twb jaggz: is this for etckeeper?09:16
oh it's reinvented ansible09:16
← Rhonda left09:19
→ tiin57 joined09:19
→ Rhonda joined09:20
← Nitrousoxide left09:21
← atharvaraykar left09:23
→ nee joined09:24
jaggz twb, hm? nah, unfortunately I'm not familiar with any of that stuff yet09:25
← dsrt^ left09:25
jaggz so it was just some bash scripts09:25
twb jaggz: if you do a nontrivial amoutn of that I recommend ansible, or puppet, or salt09:25
← mobidrop_ left09:26
→ onizu joined09:26
jaggz twb, trying to get there, yeah. would like to be able to set up nodes in an automated (or at least turnkey) way09:28
looking into those options now, thanks a bunch09:28
← z8z left09:30
← jetchisel left09:33
← zdravko61 left09:33
→ bolovanos joined09:35
→ atharvaraykar joined09:36
→ calcul0n_ joined09:39
← SebastianFlyte left09:39
← atharvaraykar left09:41
→ SebastianFlyte joined09:44
← tiin57 left09:46
→ macaronus joined09:48
→ tiin57 joined09:48
→ lungaro_ joined09:53
→ flying_sausages joined09:53
← lungaro left09:54
→ atharvaraykar joined09:55
← FH_thecat left09:58
→ FH_thecat joined09:59
← atharvaraykar left09:59
→ theoceaniscool joined09:59
← CryptoClub left10:01
→ CryptoClub joined10:02
← Guest98829 left10:03
→ atharvaraykar joined10:03
→ TheMeltdown joined10:03
TheMeltdown → Guest8439510:03
← igemnace left10:07
← FH_thecat left10:08
→ calcul0n__ joined10:10
← calcul0n_ left10:12
← tiin57 left10:16
→ wallacer joined10:17
← wallacer left10:17
→ wallacer joined10:17
← wallacer left10:17
← macaronus left10:19
→ pastucci joined10:19
→ tiin57 joined10:19
← pastucci left10:23
← Betal left10:24
→ macaronus joined10:25
→ pastucci joined10:26
← macaronus left10:26
← twb left10:31
→ jimmiehansson joined10:34
← SebastianFlyte left10:39
→ royal_screwup21 joined10:40
→ SebastianFlyte joined10:45
← tiin57 left10:45
→ tiin57 joined10:48
← sudoforge left10:49
← shailangsa left10:50
← royal_screwup21 left10:56
→ royal_screwup21 joined10:56
← john_johnk left10:57
← fling left11:00
← royal_screwup21 left11:01
→ computeiro joined11:04
→ royal_screwup21 joined11:05
→ eb0t joined11:15
→ eb0t_ joined11:15
← tiin57 left11:15
← def_jam left11:15
← eblip left11:16
→ shailangsa joined11:18
← jesseTree left11:19
→ michele| joined11:19
→ tiin57 joined11:19
→ jesseTree joined11:19
← kevr left11:20
← oxymoron93 left11:21
→ Gustavo6046_ joined11:21
→ kevr joined11:21
← Gustavo6046 left11:21
→ teut joined11:21
← rook_flo1 left11:22
← michele left11:22
→ sven^ joined11:22
Gustavo6046_ → Gustavo604611:23
→ rook_flo1 joined11:23
teut https://dpaste.org/eUg4 I had to try out some features and thus switched to a new branch, now I need to merge few commits out of these into the master11:24
can I get some help?11:24
https://dpaste.org/eUg4#L2,4 I just want to keep these 2 commits11:24
I was not able to integrate the scrollbar in this version11:25
I tried to use git rebase -i but I was getting lots of merge conflicts11:26
whats the way out?11:26
→ solarjoe4 joined11:28
→ raven-au_ joined11:28
← raven-au left11:29
raven-au_ → raven-au11:29
OMGOMG !cherry-pick > teut11:33
!cherrypick > teut11:33
teut ok let me check11:33
OMGOMG man git-cherry-pick11:33
gitinfo the git-cherry-pick manpage is available at https://gitirc.eu/git-cherry-pick.html11:33
→ bolovanos_ joined11:35
← Guest20 left11:35
→ Repox joined11:37
teut $ git cherry-pick 6cbc84e11:38
Auto-merging mailer/mailer.kv11:38
CONFLICT (content): Merge conflict in mailer/mailer.kv11:38
error: could not apply 6cbc84e... added scrollbar11:38
← bolovanos left11:38
← royal_screwup21 left11:38
→ royal_screwup21 joined11:39
← SebastianFlyte left11:39
teut what does merge conflict mean here?11:41
OMGOMG run git mergetool and see11:42
teut this command afaik picks the files in some new folder with a hash code11:42
→ Guest20 joined11:42
teut This message is displayed because 'merge.tool' is not configured.11:43
← royal_screwup21 left11:43
→ SebastianFlyte joined11:45
← tiin57 left11:45
teut Uploaded file: https://uploads.kiwiirc.com/files/6adaa2bd4226e7ed7b1cd80878a4bb72/image.png11:45
how to interpret this?11:46
I remember I did Accept Incoming changes last time and it deleted a lot of code11:48
OMGOMG !book > teut11:49
gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable11:49
→ tiin57 joined11:49
teut docs are better than book11:49
you got any youtube video?11:50
like the jsconf, or pythonconf?11:50
← wgrant left11:52
teut I actually read that book couple of months ago but it didnt help much11:53
→ wgrant joined11:53
← wgrant left11:56
OMGOMG you're asking basic questions about conflicts that are answered in that book11:56
→ wgrant joined11:56
← jaggz left11:57
← kjartan left11:57
teut cherry-pick section was in the last few chapters11:57
along with filter command11:58
it cant be basic11:58
→ kjartan joined11:59
osse !eek11:59
gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II11:59
← ghoti left11:59
mackerman !backup first before trying some kind of tool, mergetool in this case12:00
gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups12:00
← Guest20 left12:00
→ john_johnk joined12:01
← teut left12:02
→ ghoti joined12:02
→ haritz joined12:02
← haritz left12:02
→ haritz joined12:02
→ fling joined12:02
OMGOMG worries occasionally about trying too hard to teach someone to fish12:06
selckin gotta sell those fishing rods12:06
osse "what does merge conflict mean here?" indicates that the person doesn't really know what fishing means12:06
gotta take another step back12:07
← atharvaraykar left12:08
→ enoq joined12:08
→ atharvaraykar joined12:11
→ bolovanos__ joined12:11
nee → mobidrop12:14
← bolovanos_ left12:15
← tiin57 left12:15
→ tiin57 joined12:19
→ thebope joined12:19
→ cfoch joined12:21
← bamdad left12:21
→ bamdad joined12:23
→ SerialSmile joined12:23
→ fercell- joined12:26
← fercell left12:26
← magpi left12:29
← sweatsuit left12:30
→ magpi joined12:31
→ dengbojing joined12:31
→ samjq893 joined12:34
← samjq893 left12:35
→ gareppa joined12:36
→ samjq893 joined12:37
← thebope left12:38
→ thebope joined12:39
← SebastianFlyte left12:39
→ rewrited joined12:41
→ fission6 joined12:41
← thebope left12:42
→ thebope joined12:43
→ SebastianFlyte joined12:45
← tiin57 left12:45
→ kalin_ joined12:46
← gareppa left12:48
← thebope left12:48
→ tiin57 joined12:49
→ teut joined12:49
→ sweatsuit joined12:53
← fission6 left12:54
← samjq893 left12:56
← n3wborn left12:56
→ n3wborn joined12:58
→ thebope joined12:59
← thebope left12:59
→ thebope joined13:00
← solarjoe4 left13:00
← thebope left13:01
→ thebope joined13:01
→ CodeSlingerPaul joined13:02
← atharvaraykar left13:05
→ nabil_ joined13:09
→ royal_screwup21 joined13:10
← nabil left13:12
→ aliss joined13:12
← tiin57 left13:15
← Tobbi_ left13:16
→ atharvaraykar joined13:16
→ Tobbi_ joined13:19
→ tiin57 joined13:19
← teut left13:20
← ghoti left13:25
fuchstronaut Is it safe to just follow the instructions and rune git prune?13:26
→ Vadrigar_ joined13:27
selckin usually13:27
→ ghoti joined13:27
→ hussam joined13:29
→ drbean_ joined13:29
→ mat001 joined13:31
→ gast0n joined13:33
← royal_screwup21 left13:33
→ fission6 joined13:34
→ royal_screwup21 joined13:34
← mattt_ left13:37
← royal_screwup21 left13:38
← SebastianFlyte left13:39
Kobaz i'm trying to get a speciifc file from a specific commit... git checkout <hash> <file> isn't working... i also tried <hash>:<file> and <hash> -- <file>13:42
selckin latter should work13:42
→ causasui joined13:42
→ nrh^ joined13:43
ikke Does git ls-tree -r <commit> return that file?13:43
Kobaz oh13:44
i need to go one commit back13:44
that was the commit it was deleted in13:44
ikke I suspected as much13:44
→ SebastianFlyte joined13:45
← TomyWork left13:45
← tiin57 left13:45
→ TomyWork joined13:45
→ royal_screwup21 joined13:46
← rcoote left13:47
→ pmcnabb8 joined13:49
→ tiin57 joined13:49
fuchstronaut selckin: ty13:50
→ daysun joined13:50
→ rcoote joined13:50
← SerialSmile left13:50
daysun doesn't pull ruin your progress? What if you work on something, and decide to pull before you commit+push to be up to date before pushing? Could that potentially ruin your work?13:50
← pmcnabb left13:51
pmcnabb8 → pmcnabb13:51
← drbean_ left13:52
→ airgap joined13:52
mackerman Conflicts would need to be resolved, like any other merge.13:53
→ Guest20 joined13:53
← atharvaraykar left13:54
→ AnAverageHuman joined13:57
→ thiago joined13:59
→ mowcat joined13:59
→ xissburg joined13:59
← fission6 left13:59
→ BrunoSpr joined14:00
Kobaz okay next question14:05
git in windows cygwin... when i do a git commit -v... it's showing me all the ^M endings... how do I hide that?14:05
→ madewokherd joined14:07
Kobaz git config --global core.autocrlf true does not do it14:08
← gearnode left14:12
← Vadrigar_ left14:13
← CryptoClub left14:13
Noisytoot → noisytoot[x]14:13
noisytoot[x] → Noisytoot14:13
← Repox left14:14
→ gearnode joined14:15
← tiin57 left14:15
→ CryptoClub joined14:16
← BrunoSpr left14:16
→ BrunoSpr joined14:17
→ tiin57 joined14:19
← royal_screwup21 left14:19
→ royal_screwup21 joined14:19
→ kiltzman joined14:19
← haritz left14:21
← royal_screwup21 left14:22
→ royal_screwup21 joined14:22
← andreas31 left14:22
→ andreas31 joined14:26
← BrunoSpr left14:28
→ whitefly joined14:31
→ atharvaraykar joined14:35
← causasui left14:36
← royal_screwup21 left14:38
→ royal_screwup21 joined14:38
→ wrobinson joined14:39
← SebastianFlyte left14:39
← wrobinso1 left14:41
daysun Kobaz: I don't want to be that guy, but if you can, get ubuntu for windows (from the windows app store) and run that in another window.14:43
← royal_screwup21 left14:43
daysun most prefer to use an editor on ubuntu as well when they're forced to dev on windows.14:43
→ BrunoSpr joined14:44
← hussam left14:44
daysun it tends to solve half (not all) of your problems.14:44
← atharvaraykar left14:44
→ SebastianFlyte joined14:45
→ dimi1947 joined14:45
← tiin57 left14:45
← long4mud left14:45
→ haritz joined14:46
← haritz left14:46
→ haritz joined14:46
→ cousteau joined14:48
← haritz left14:48
→ FH_thecat joined14:48
← FH_thecat left14:48
→ tiin57 joined14:49
davve dos2unix is a good tool for cleaning them up. i would set up a pre-commit hook which does it- not sure if its available with cygwin14:49
Noisytoot Just install GNU/Linux!14:49
cousteau Huh, funny, I think you're talking exactly about the question I was about to make14:50
← cfoch left14:51
→ AppleGaming joined14:51
→ haritz joined14:51
← haritz left14:51
→ haritz joined14:51
cousteau If I've globally disabled autocrlf, can I clone a repository enabling it? Or how would I do that?14:52
← haritz left14:52
→ haritz joined14:52
← haritz left14:52
→ haritz joined14:52
cousteau Clone the repository, set autocrlf locally to my clone, delete all files and check them out again?14:52
→ rustyshackleford joined14:59
← rcoote left15:01
Hello71 should work in theory but terribly inefficient15:02
→ crose joined15:03
Hello71 if nothing else than git -c core.autocrlf clone should work15:03
← mowcat left15:03
→ mowcat joined15:03
Hello71 or you can use that feature for setting different options based on directory tree15:03
← mobidrop left15:03
Hello71 normally used for user.name/email but could be applicable here too15:04
← mowcat left15:05
← dimi1947 left15:06
→ k3yp joined15:07
← tiin57 left15:15
→ mowcat joined15:16
→ jinsun joined15:17
→ tiin57 joined15:19
← foul_owl left15:21
← xrisovalantis left15:23
→ mozgalom joined15:25
→ themayor joined15:26
← fling left15:28
← tgunr_ left15:29
→ tgunr joined15:29
→ durham joined15:30
← chele left15:35
← john_johnk left15:37
← jinsun left15:39
← SebastianFlyte left15:39
→ tgunr_ joined15:40
← tgunr left15:40
→ SebastianFlyte joined15:45
← tiin57 left15:45
→ jetchisel joined15:46
← jas4711 left15:48
← whitefly left15:49
→ tiin57 joined15:49
← BrunoSpr left15:50
← fflam left15:50
← durham left15:50
→ durham joined15:51
→ blyat-73 joined15:51
← AppleGaming left15:52
→ AppleGaming joined15:53
→ sudoforge joined15:55
→ CIAZ joined16:00
← CIAZ left16:00
→ thisismo joined16:04
→ fflam joined16:04
→ hnOsmium0001 joined16:04
← mowcat left16:05
→ nyxyn joined16:06
← mozgalom left16:08
← blyat-73 left16:13
→ blyat-73 joined16:15
← tiin57 left16:15
→ samjq893 joined16:15
→ irrgit joined16:16
→ fling joined16:16
← aliss left16:16
→ causasui joined16:17
→ mindCrime_ joined16:18
→ tiin57 joined16:19
← jaziz left16:19
→ Raja joined16:20
→ Xiti joined16:21
← Raja left16:22
→ raman_vaidya joined16:23
← raman_vaidya left16:24
← Haohmaru left16:29
← causasui left16:37
← SebastianFlyte left16:39
← gothicserpent left16:41
→ Betal joined16:41
← samjq893 left16:42
→ gothicserpent joined16:44
→ SebastianFlyte joined16:45
→ vicfred joined16:45
← PJBoy left16:45
← gothicserpent left16:45
← tiin57 left16:45
→ supercoven joined16:47
← rsx left16:47
→ PJBoy joined16:48
→ tiin57 joined16:49
← nyxyn left16:52
→ stats4647 joined16:52
→ royal_screwup21 joined16:53
→ mowcat joined16:54
→ butter_ joined16:54
→ howdoi joined16:54
butter_ Hi. Is there an option for this: https://stackoverflow.com/q/66875169/463201916:55
→ krofe joined16:59
j416 butter_: git show17:00
→ shush joined17:00
j416 for that exact syntax, look at format options for git-log, or use git rev-list -1 HEAD for just a hash17:01
→ nyxyn joined17:01
→ cousteau_ joined17:01
→ atharvaraykar joined17:02
→ jas4711 joined17:02
→ dpl joined17:02
→ xelxebar joined17:03
← cousteau left17:04
← butter_ left17:04
→ Newami joined17:07
← Newami left17:08
→ butter_ joined17:08
butter_ j416 thank you17:09
← butter_ left17:09
← TomyWork left17:09
→ chuseman joined17:09
→ TomyWork joined17:10
← TomyWork left17:11
→ TomyWork joined17:12
→ hussam joined17:14
← tiin57 left17:15
← royal_screwup21 left17:16
→ royal_screwup21 joined17:16
← thisismo left17:17
j416 perhaps misunderstood the question. but, he left.17:18
← DevAntoine left17:19
→ tiin57 joined17:19
→ DevAntoine joined17:19
← TomyWork left17:21
← dengbojing left17:21
→ TomyWork joined17:21
← royal_screwup21 left17:21
← TomyWork left17:23
← DevAntoine left17:24
→ TomyWork joined17:25
→ DevAntoine joined17:29
← mowcat left17:30
← TomyWork left17:30
→ TomyWork joined17:31
→ cousteau joined17:32
cousteau → Guest5954817:32
← nyxyn left17:33
← cousteau_ left17:34
← DevAntoine left17:34
→ bolovanos_ joined17:35
→ john_johnk joined17:36
← bolovanos__ left17:38
← LetoThe2nd left17:39
→ DevAntoine joined17:39
← SebastianFlyte left17:40
→ causasui joined17:43
→ arcatech joined17:43
← DevAntoine left17:44
← Guest59548 left17:44
→ SebastianFlyte joined17:45
← tiin57 left17:45
← Guest20 left17:46
→ Guest20 joined17:47
← causasui left17:48
→ tiin57 joined17:49
→ causasui joined17:50
→ cliluw joined17:52
→ royal_screwup21 joined17:52
→ viko joined17:52
→ rond_ joined17:57
→ gothicserpent joined18:00
← gothicserpent left18:01
→ jarodit joined18:01
→ oriba joined18:03
← olx69 left18:03
← atharvaraykar left18:07
← arcatech left18:07
→ DevAntoine joined18:09
→ Vadrigar_ joined18:09
rangergord I'm about to use git-filter-repo to rewrite my repo's history to apply the linter/beautifier script on all history, so I never have cosmetic changes show up in diff. I also insert a .editorconfig, and going forward add clang-format for future commits, Any recommendations before I dive in?18:10
← DevAntoine left18:13
← Vadrigar_ left18:13
j416 rangergord: !backup18:15
gitinfo rangergord: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups18:15
→ thisismo joined18:15
→ BSaboia joined18:15
→ jaggz joined18:15
← tiin57 left18:15
← BSaboia left18:16
→ FH_thecat joined18:16
rangergord oh for sure18:16
← FH_thecat left18:16
rangergord I meant more for the linting task18:16
and rewriting history18:17
→ tiin57 joined18:18
→ DevAntoine joined18:19
← DevAntoine left18:23
← Guest20 left18:23
← CryptoClub left18:25
→ samjq893 joined18:26
eb0t_ → eblip18:27
← TomyWork left18:27
→ CryptoClub joined18:28
← fabs left18:28
→ royal_screwup216 joined18:28
← jas4711 left18:29
→ fabs joined18:29
→ is_null joined18:37
→ arcatech joined18:37
→ muhaha joined18:38
→ mozgalom joined18:39
← royal_screwup21 left18:39
← royal_screwup216 left18:39
→ royal_screwup21 joined18:39
← SebastianFlyte left18:40
← cliluw left18:44
→ cdown joined18:44
← royal_screwup21 left18:44
→ SebastianFlyte joined18:45
→ royal_screwup21 joined18:45
← tiin57 left18:45
→ tiin57 joined18:48
→ long4mud joined18:49
→ m0viefreak joined18:50
← n3wborn left18:51
→ n3wborn joined18:53
→ foul_owl joined18:58
← rond_ left19:00
→ smartsirius joined19:04
→ cd joined19:05
→ BSaboia joined19:07
← tiin57 left19:15
← noidea left19:17
← cambrian_invader left19:17
← BSaboia left19:18
→ tiin57 joined19:19
← muhaha left19:20
→ mowcat joined19:20
→ BSaboia joined19:21
→ muhaha joined19:24
← arcatech left19:25
→ fax joined19:30
← supercoven left19:31
← SebastianFlyte left19:39
← onizu left19:42
→ Lord_of_Life_ joined19:43
→ gigasu_shida joined19:43
← Lord_of_Life left19:43
Lord_of_Life_ → Lord_of_Life19:44
→ SebastianFlyte joined19:45
← tiin57 left19:45
← thisismo left19:47
→ iffraff joined19:49
→ tiin57 joined19:49
← cdown left19:49
← muhaha left20:09
→ dviola joined20:10
← dviola left20:13
→ dviola joined20:13
→ teut joined20:14
← tiin57 left20:15
teut Uploaded file: https://uploads.kiwiirc.com/files/f04bc800d575a71cc245f467df6950d1/image.png20:18
how to remove that dashed portion of master?20:18
→ tiin57 joined20:19
ikke git checkout master && git reset --hard $(git merge-base master other-branch)20:21
teut && , is that to be written?20:22
ok , its something20:22
oops that did not happen as expected, can I undo it?20:25
← KnoP left20:25
teut https://dpaste.org/cjQr#L12 I want this commit to be on the head of master20:25
I can check it out, maybe I can cherry-pick it20:27
have you used the "Accept incoming changes" in git rebase in vscode?20:30
← sord937 left20:30
teut it gives unobvious results?20:30
results.*20:30
← Nokurn left20:30
ikke I haved not20:31
teut then how to you remove merge conflicts?20:32
I like the console20:32
← mozgalom left20:32
← daysun left20:32
teut gui is too tough to work with20:32
ikke in my editor, sometimes I use a mergetool20:34
teut I opened that today but is it any good?20:34
→ Nokurn joined20:35
teut in vscode I tried to merge , but actually I had nested a folder into another folder on some other branch and modified few files, when I clicked "Accept incoming changes" it actually kept that old folder.it's amess20:36
a mess20:36
I can show you can you help then?20:36
ikke it's hard to help with merge conflicts if you don't know the context20:37
teut I will need to show my dir structure first20:38
hey, half of my files are gone fk20:38
i need to fox that first now sorry20:38
fix20:38
← SebastianFlyte left20:39
teut https://dpaste.org/qRP5 this is current output20:40
Uploaded file: https://uploads.kiwiirc.com/files/713e3a0d79766653148c5384d039afcb/image.png20:40
this is current dir structure20:40
2 files are lost, they had all the code, rest is packaging material20:41
ikke did you commit them?20:41
teut https://dpaste.org/wmrk#L41 earlier when I shared this link, during this I actually ctrl+C the whole repo20:42
ofcourse20:42
ikke then you added those files in the commits that you tried to get rid of?20:42
teut Uploaded file: https://uploads.kiwiirc.com/files/ff996526bc1934b0bebebe1e93442d8f/image.png20:42
this is the actual commit20:42
→ mozgalom joined20:43
teut but its lost, what I did was cherry picked that commit20:43
in line 4120:44
→ codehotter joined20:44
teut in that git pro book there was written git doesnt follow tactics what other tools use20:44
it duplicates all your files20:44
it doesnt seems to be doing that20:45
→ SebastianFlyte joined20:45
← krofe left20:45
teut it rather seem to be storing the modifications only20:45
← tiin57 left20:45
ikke initially, git stores the entire content of each version of each file20:46
but, git can and will pack together objects in a way to reduce space (delta compression)20:46
← Nokurn left20:47
teut file, but how are folders managed?20:48
→ Nokurn joined20:48
→ tiin57 joined20:48
teut Uploaded file: https://uploads.kiwiirc.com/files/8a4370c04e6246ae3956d6c5b24ee718/image.png20:49
in all my earlier commits, there ware no src/ directory20:49
but it is somehow on `HEAD is now at cd58162 installing plyer`20:49
its completely messed up20:50
setup.py was not there . so that is correct that it is deleted20:50
oh, is it due to the pycache that confusing is coming to me? *pycache is in gitignore20:51
← oriba left20:52
→ arcatech joined20:54
← Graypup_ left20:57
← Nokurn left20:57
← royal_screwup21 left20:57
→ royal_screwup21 joined20:58
→ danielcg joined20:59
← arcatech left20:59
teut thanks ikke , for now I m starting a fresh which that duplicated folder21:00
→ Nokurn joined21:00
teut with*21:01
← royal_screwup21 left21:02
← hussam left21:06
→ gusgg joined21:07
→ imaginos joined21:10
gusgg Preambe: I have a repository. I have it cloned as a submodule. I also have it `git clone --mirror` as a bare repository. In that repository I ran `bfg --convert-to-git-lfs [...]` and push forced to the remote. Things didn't work as expected. Then I tried to use `git lfs migrate` instead. Also some weirdness ensued.21:10
← imaginos left21:11
← enoq left21:12
gusgg I am looking at `.git/objects` of my repository and trying to understand some internals. But that directory only has `pack` and `info`, and nothing else. Where would the object files for my repository be?21:12
← Lord_of_Life left21:12
ikke in the packfile21:13
packed21:13
→ arcatech joined21:13
← viko left21:13
← tiin57 left21:15
gusgg ikke: I see! Thank you21:16
→ tiin57 joined21:19
← arcatech left21:22
gusgg I believe I should use `git rev-parse HEAD:path/to/file.txt` to get the content hash of a file, which then corresponds to the object id. For a given object id, how can I see if it's tracked my `git lfs` or not?21:23
I thought `git cat-file -p $object_id` might show me either the file contents, or the lfs pointer. But I am not sure. I'm getting file contents right now, and I'm trying to debug whether files are tracked by lfs or not.21:24
→ audiofreeze joined21:24
audiofreeze I'm in the branch called `dev`. I just pulled the newest changes from my remote repo, there were a lot. I started making more changes, but now I just want ONLY my newest changes in a new branch. How can I create a branch that will ONLY carry my newest changes, and not the changes I pulled from the remote repo?21:25
gusgg audiofreeze: have you made commits with your "newest changes" yet?21:27
audiofreeze gusgg, no21:27
gusgg, if i did, it would also commit the changes i pulled form the remote repo21:28
which is what i'm trying to avoid21:28
gusgg I would 1. `git stash -p` to interactively "stash" those changes. 2. `git checkout $base_branch` for whatever branch you want to work off. 3. `git checkout -b $new_branch_name`. Finally, 4. `git stash pop`21:29
The changes you pulled from the remote repo necessarily are already committed, to be clear. Do you mean that you have some changes in your working directory due to merge conflicts or something like that?21:31
audiofreeze no21:32
one time, when i did git checkout -b mybranch after pulling newest changes from remote repo, and then made changes and committed, mybranch contained EVERYTHING pulled from the remote repo pulled. which is undesirable gusgg21:33
gusgg, will your solution for sure work for me?21:33
gusgg audiofreeze: I cannot guarantee that.21:34
→ royal_screwup21 joined21:34
gusgg I had asked if you had made commits with your newest changes, and you responded no. Now you just said you "made changes and committed". So, which one is it?21:34
← smartsirius left21:35
audiofreeze gusgg, "one time" means that something had happened in the past21:35
gusgg, i still have not committed21:35
i have my changes and i'm ready to do something21:36
don't know what to do21:36
← jimmiehansson left21:36
audiofreeze i don't want to mess things up21:36
i refered to this "one time" because you asked why i was doing what i was doing21:36
i don't want what happened to happen again21:37
← teut left21:38
gusgg If you wanted to "move" a handful of commits from one branch to another, you can use `git cherry-pick`. That would have applied in the "one time" scenario you were in.21:38
← dpl left21:38
audiofreeze thats the opposite of what i want to do21:38
→ dpl joined21:39
← SebastianFlyte left21:39
audiofreeze i'll just git checkout -b and hope for the best21:39
gusgg Good luck21:39
← royal_screwup21 left21:40
audiofreeze huh, that worked21:40
wonder what happened last time21:40
→ royal_screwup21 joined21:44
→ SebastianFlyte joined21:45
← tiin57 left21:45
← m0viefreak left21:47
→ tiin57 joined21:49
← shabius left21:49
← amahl left21:50
← HumanG33k left21:50
→ HumanG33k joined21:51
gusgg To answer my previous question, `git cat-file -p $object_id` shows the lfs pointer when the object corresponds to a file tracked by lfs21:52
→ shabius joined21:53
→ arcatech joined21:59
← arcatech left21:59
← airgap left22:07
→ airgap joined22:08
→ Vadrigar_ joined22:10
→ nyxyn joined22:14
← Vadrigar_ left22:14
← jarodit left22:15
← tiin57 left22:15
← CodeSlingerPaul left22:16
← gusgg left22:17
→ tiin57 joined22:18
→ krofe joined22:18
← Hello71 left22:19
← nyxyn left22:20
← tang^ left22:21
→ macaronus joined22:27
← fax left22:28
← pastucci left22:30
→ Hello71 joined22:34
← rkta left22:35
← c4017w_ left22:36
→ rkta joined22:36
→ c4017w_ joined22:36
→ finnb5 joined22:37
→ Duckle0 joined22:38
→ riksu-raksu joined22:38
→ codingquark_ joined22:38
→ Shentino_ joined22:38
→ dslegend1 joined22:38
→ Anthaas_ joined22:38
→ egos_ joined22:39
→ cyberanger_ joined22:39
← jetchisel left22:39
→ bdeferme_ joined22:39
← SebastianFlyte left22:39
→ Lunatrius` joined22:39
← AppleGaming left22:39
→ cim2094 joined22:39
→ L1Cafe9 joined22:39
→ yourfate_ joined22:40
→ AppleGaming joined22:40
→ Live_ joined22:40
→ LiENUX joined22:40
→ av0idr joined22:40
→ apragmatist_ joined22:40
→ qgTG_ joined22:40
→ gildarts joined22:40
→ seanBE_ joined22:40
→ ntnn_ joined22:40
→ joako_ joined22:40
→ rigid- joined22:40
→ holdsworth_ joined22:40
→ n001g joined22:41
→ getha joined22:41
← finnb left22:41
← riksteri left22:41
← qgTG left22:41
← ablackack left22:41
← ericnoan left22:41
← a3Dman left22:41
← LiENUS left22:41
← apragmatist left22:41
← Lunatrius left22:41
← seanBE left22:41
← mjh4386 left22:41
← bond left22:41
← synthmeat left22:41
← joako left22:41
Lunatrius` → Lunatrius22:41
joako_ → joako22:41
← crmaurei left22:41
→ jetchisel joined22:41
→ DuClare_ joined22:41
← fingercomp left22:41
→ bond joined22:41
← Cork left22:41
→ qsx` joined22:41
← Anthaas left22:41
← qsx left22:41
← holdsworth left22:41
← codingquark left22:41
→ kantlive- joined22:41
→ crmaurei joined22:41
bond → Guest3330222:41
→ ablackack joined22:42
→ ericnoan joined22:42
← cybrNaut left22:42
→ ColdKeyb- joined22:42
→ Ekho- joined22:42
← n000g left22:42
← cim209 left22:42
← Techcable left22:42
← Shentino left22:42
← SuperLag left22:42
← Ekho left22:42
← lrvick left22:42
cim2094 → cim20922:42
n001g → n000g22:42
kantlive- → kantlivelong22:42
→ YellowSu1 joined22:42
→ jarodit joined22:42
← av0idr left22:42
→ av0idr joined22:42
→ tureba_ joined22:42
→ axisys_ joined22:42
→ cybrNaut joined22:42
← cybrNaut left22:42
→ cybrNaut joined22:42
→ pandem1 joined22:42
→ cxreg joined22:42
→ foo___ joined22:43
→ Chetique joined22:43
→ sgn1 joined22:43
→ SuperLag joined22:43
→ deltab_ joined22:43
→ stfn1 joined22:43
← Live left22:43
← rigid left22:43
← alip left22:43
← axisys left22:43
← L1Cafe left22:43
← sgn left22:43
← YellowSuB left22:43
← gildarts_ left22:43
→ alip joined22:43
← avoidr left22:43
← dslegends left22:43
← stfn left22:43
← alip left22:43
→ alip joined22:43
Duckle0 → Duckle22:43
yourfate_ → yourfate22:43
L1Cafe9 → L1Cafe22:43
rigid- → rigid22:43
← audiofreeze left22:43
av0idr → avoidr22:43
→ Squarism joined22:43
← Squarism left22:43
→ Squarism joined22:43
→ goodburner joined22:43
→ caffeinatedcode joined22:43
→ Techcable joined22:43
← caffeinatedcode left22:43
→ caffeinatedcode joined22:43
→ Whiskey joined22:43
→ roger_raymond joined22:43
→ Cork joined22:43
→ lrvick joined22:43
→ energizer joined22:44
→ badeball joined22:44
→ mjh4386 joined22:44
→ SebastianFlyte joined22:45
← tiin57 left22:45
→ fingercomp joined22:46
→ a3Dman_ joined22:46
Ekho- → Ekho22:47
← lawid left22:48
→ fax joined22:49
→ tiin57 joined22:49
← macaronus left22:49
← raven-au left22:49
→ raven-au joined22:51
→ macaronus joined22:51
→ cliluw joined22:52
→ lawid joined22:53
→ nyxyn joined22:57
← perrier-jouet left22:58
→ perrier-jouet joined23:00
→ Xenguy joined23:02
→ synthmeat joined23:08
← teward left23:09
← tiin57 left23:15
→ tiin57 joined23:18
← BSaboia left23:19
→ teward joined23:20
← teward left23:21
→ teward joined23:23
← fax left23:25
← jarodit left23:26
← royal_screwup21 left23:26
→ royal_screwup21 joined23:27
→ arcatech joined23:29
← nyxyn left23:30
← Xenguy left23:31
← royal_screwup21 left23:32
← arcatech left23:32
← teward left23:34
← tureba_ left23:35
→ arcatech joined23:35
→ tureba joined23:35
← SebastianFlyte left23:39
deltab_ → deltab23:40
→ thisismo joined23:40
← mat001 left23:42
→ gothicserpent joined23:44
→ mat001 joined23:45
→ SebastianFlyte joined23:45
← thisismo left23:45
← tiin57 left23:45
→ ferdna joined23:46
→ tiin57 joined23:49
← cliluw left23:57

Logs Search ←Prev date Next date→ Channels Documentation