IRCloggy #git 2023-06-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.

2023-06-20

← dmc left00:00
→ LiENUS joined00:02
← rama left00:02
→ rama joined00:06
→ Celeo joined00:06
← xFFC left00:12
← verslyfr left00:14
← cyberworm54 left00:14
→ versly joined00:17
← rama left00:20
← SuperLag left00:22
→ SuperLag joined00:22
← SuperLag left00:22
→ SuperLag joined00:22
← elkalamar left00:24
→ gsi joined00:25
← nyah left00:26
← gsi_ left00:27
→ roadie joined00:28
→ rama joined00:29
← rama left00:34
← roadie left00:38
→ jdek joined00:40
← moldorcoder7 left00:45
← sudoforge left00:52
← bywaterloo left00:52
← Suchiman left00:55
→ punksprite joined00:58
→ sudoforge joined00:58
← theoceaniscool left00:59
← squirrel left01:00
→ dmc joined01:01
← sudoforge left01:03
← tirnanog left01:05
← rustyshackleford left01:07
← dmc left01:12
→ ghost43_ joined01:14
← Bardon left01:14
← ghost43 left01:15
← jklfds_ left01:17
← goldfish left01:18
→ goldfish joined01:19
← Koeniz left01:20
→ Koeniz joined01:20
→ rama joined01:21
→ nate2 joined01:23
← goldfish left01:23
← juanmamian left01:26
← nate2 left01:27
← rama left01:30
→ roadie joined01:34
→ jklfds_ joined01:35
→ jkatnight joined01:37
← jkatnight left01:42
← roadie left01:42
← szkl left01:43
← versly left01:44
→ rama joined01:50
→ Xenguy joined01:51
→ hbautista joined01:55
→ roadie joined01:55
← rama left01:57
→ dmc joined01:58
← gildasio left01:58
← Jck_true left02:03
← roadie left02:03
→ Jck_true0 joined02:04
→ rama joined02:04
← rama left02:11
→ rama joined02:11
← Gary_Sinise left02:14
→ nate2 joined02:18
← rama left02:19
← k-man left02:19
← FinnElija left02:21
→ finn_elija joined02:21
finn_elija → FinnElija02:21
← ghost43_ left02:22
← thiago left02:23
→ thiago joined02:24
→ ghost43 joined02:24
← cafkafk left02:24
→ rama joined02:26
→ jkatnight joined02:26
→ roadie joined02:28
← rama left02:30
← jkatnight left02:31
→ k-man joined02:33
← peas left02:35
← roadie left02:36
← jklfds_ left02:48
← Geronimo left02:49
→ maryo joined02:51
→ cafkafk joined02:53
→ jklfds_ joined02:56
← jklfds_ left03:01
→ rustyshackleford joined03:02
← eroux left03:05
→ eroux joined03:06
→ Gary_Sinise joined03:09
→ jklfds_ joined03:13
→ Geronimo joined03:17
← jklfds_ left03:17
← Argorok left03:18
← nate2 left03:18
→ rama joined03:19
→ jklfds_ joined03:20
← Celeo left03:23
← jklfds_ left03:25
→ THE_HF joined03:26
THE_HF hello :)03:27
→ bywaterloo joined03:28
← Xenguy left03:28
← rama left03:31
→ Xenguy joined03:31
→ fstd_ joined03:32
→ dsdxtech joined03:33
← fstd left03:35
fstd_ → fstd03:35
← gast0n left03:36
→ roadie joined03:40
← THE_HF left03:45
← bn_work left03:46
→ jklfds_ joined03:46
← samiamsam left03:49
← robo left03:50
← militantorc left03:50
← roadie left03:51
← jklfds_ left03:51
← ElKowar left03:51
← caverton left03:51
← chimbosonic11 left03:51
→ pikapika joined03:51
→ chimbosonic11 joined03:51
→ ElKowar joined03:52
→ blaklistd7 joined03:52
→ caverton joined03:52
→ rishi joined03:52
→ robo joined03:52
← blaklistd left03:52
blaklistd7 → blaklistd03:52
→ jklfds_ joined03:52
← thiago left03:53
← crabbedhaloablut left03:53
→ thiago joined03:55
← jklfds_ left03:57
→ jklfds_ joined03:57
→ Celelibi joined03:59
→ crabbedhaloablut joined04:01
← jklfds_ left04:02
→ rama joined04:03
→ jklfds_ joined04:05
← rama left04:08
→ rama joined04:08
← jklfds_ left04:10
→ jklfds_ joined04:11
← rama left04:13
← jklfds_ left04:16
→ xFFC joined04:17
→ rama joined04:17
→ wagle joined04:17
→ duderonomy joined04:18
← cafkafk left04:18
→ jklfds_ joined04:19
← rama left04:21
← jklfds_ left04:23
→ cafkafk joined04:23
→ rama joined04:25
→ q3lont joined04:28
← maryo left04:30
← bloody left04:34
→ c0dehu1k joined04:36
← dmc left04:39
← rama left04:40
→ jklfds_ joined04:40
→ dmc joined04:42
→ terminalpusher joined04:43
← jklfds_ left04:44
→ jklfds_ joined04:47
← jklfds_ left04:51
← ghost43 left04:54
← pikapika left04:54
→ ghost43 joined04:55
← robo left04:55
← lina left04:58
→ jmd joined04:59
→ lina joined04:59
→ robo joined04:59
← robo left05:00
→ robo joined05:01
→ rama joined05:03
← TimWolla left05:04
→ TimWolla joined05:05
← Aryan left05:05
→ gep joined05:06
→ JTL joined05:06
→ Nixx joined05:06
→ gitinfo joined05:06
ChanServ set mode: +o05:06
← q3lont left05:12
→ pikapika joined05:12
← rama left05:18
→ rama joined05:19
→ jklfds_ joined05:19
→ Aryan joined05:20
→ YuGiOhJCJ joined05:23
← jklfds_ left05:24
← terminalpusher left05:27
← thiago left05:27
→ terminalpusher joined05:27
← rama left05:27
→ roadie joined05:30
→ _sa0sin_ joined05:34
→ jklfds_ joined05:35
← sa0 left05:37
→ keypusher joined05:39
← roadie left05:40
← terminalpusher left05:40
→ rama joined05:40
→ terminalpusher joined05:41
← jklfds_ left05:42
← rama left05:45
→ jklfds_ joined05:45
← jklfds_ left05:51
← rainn92675560720 left05:52
→ rfuentess joined05:57
→ jklfds_ joined06:03
→ blaklistd5 joined06:04
← blaklistd left06:06
blaklistd5 → blaklistd06:06
← dvanloon3 left06:07
← terminalpusher left06:09
→ terminalpusher joined06:09
← memset left06:11
→ roadie joined06:11
→ memset joined06:11
→ dvanloon3 joined06:12
← jklfds_ left06:12
→ jklfds_ joined06:18
→ han-solo joined06:19
← c0dehu1k left06:23
← jklfds_ left06:26
→ jklfds_ joined06:27
← Guest6743 left06:30
← skapata left06:31
← jklfds_ left06:32
→ rama joined06:33
← gep left06:33
→ nuala2 joined06:36
→ jklfds_ joined06:37
→ gep joined06:37
← rama left06:37
← jklfds_ left06:42
→ samiamsam joined06:43
← roadie left06:44
→ ramblebamble joined06:45
← ramblebamble left06:46
← feriman left06:46
→ ovo joined06:47
ovo → Guest129606:47
← shailangsa left06:48
→ weedmic joined06:50
→ randm joined06:50
→ ramblebamble joined06:50
← reset left06:51
← Guest1296 left06:51
← stenno left06:54
→ Inline joined06:57
← Inline left06:58
→ jklfds_ joined07:00
→ q3lont joined07:01
→ versly joined07:03
← ChmEarl left07:05
→ filePeter joined07:06
← jklfds_ left07:07
→ vlado_ joined07:09
→ jklfds_ joined07:09
→ feriman joined07:11
← jklfds_ left07:14
→ theoceaniscool joined07:14
→ jklfds_ joined07:15
→ nate2 joined07:16
← hbautista left07:18
→ ChmEarl joined07:18
→ coot joined07:20
→ ovo joined07:20
ovo → Guest247607:20
← nate2 left07:20
← q3lont left07:21
→ q3lont joined07:22
→ rama joined07:24
weedmic Cheers! I am creating some user documentation. Which phrase is best when describing "git status" command: 1-lists files available for commital 2-lists files that can be committed07:25
← rama left07:28
huf how about "Show the working tree status"?07:30
weedmic nice - using that07:32
← Guest2476 left07:32
osse heh07:33
weedmic cheers07:33
← jmd left07:33
→ jmd joined07:34
← xFFC left07:36
← versly left07:37
→ iomari891 joined07:37
Jck_true0 → Jck_true07:40
← Leonarbro left07:42
→ cami||e joined07:44
→ ovo_ joined07:45
→ kjetilho joined07:45
weedmic Perhaps this is a kde issue, but it only happens for my git documents. If I am in firefox, and tell it to open file:///home/weedmic/Documents/GIT-docsite/project.git/index.md, it then opens in okular.07:46
← leftyfb left07:48
→ leftyfb joined07:49
← piwu left07:52
→ piwu1 joined07:52
osse that sounds very unrelated to git07:52
there is no such thing as a "git document"07:52
← duderonomy left07:53
← iomari891 left07:56
weedmic md format then, and I'll take care of it if it is linux related -ty07:57
kjetilho so - I have diff.noprefix=true, but that breaks `git send-email`. is it possible to configure an exception, or do I have to remember to add `-c diff.noprefix=false`?07:57
oh, I guess I could simply make an alias. nvm07:57
jast definitely the easiest option07:58
← ovo_ left07:59
kjetilho hmm, no. "send-email = send-email -c diff.noprefix=false" doesn't have effect, -c must come before it?07:59
osse kjetilho: you cannot "shadow" commands with aliases07:59
it sounds very strange that send-mail respects that setting. does format-path+08:00
format-patch?08:00
kjetilho osse: yes it does08:01
and yeah, with "send-diff = send-email -c diff.noprefix=false" the -c is in the wrong position.08:01
→ iomari891 joined08:02
kjetilho so... I need a bash level alias/function?08:02
← terminalpusher left08:02
→ terminalpusher joined08:03
→ rama joined08:03
osse kjetilho: you can also upgrade to 2.41 :p08:04
kjetilho oh really? I am at 2.40.108:05
→ duderonomy joined08:05
osse https://public-inbox.org/git/ZAlPtxZ%2F0Z28r5tF@coredump.intra.peff.net/08:06
kjetilho haha, excellent08:06
osse This is one of those things I thought was fixed two years ago and you had a three year old version or something :p08:06
← bartman` left08:07
→ bartman` joined08:07
← rama left08:08
→ bird_ joined08:08
← duderonomy left08:08
osse kjetilho: alias send-diff = send-email --src-prefix=a/ --dst-prefix=b/ should do the needful I think08:09
→ amosbird joined08:09
→ Bardon joined08:10
kjetilho yep, it does. thanks!08:11
← Jck_true left08:13
→ Jck_true joined08:13
→ ovo joined08:13
← ramblebamble left08:13
ovo → Guest283308:13
→ kapil joined08:16
← Guest2833 left08:17
→ duderonomy joined08:20
← q3lont left08:25
→ BSaboia joined08:30
jast for future reference, aliases can use arbitrary commands so you could work around the -c issue: "send-diff = !git -c diff.noprefix=false send-email"08:34
kjetilho ahhh, thanks for that tip, too08:35
weedmic what is the proper room to get help with this "https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax"?08:36
→ ham joined08:38
→ mexen joined08:42
jast weedmic: it's technically not a git topic but we're not super picky here, so you might as well ask your question here :)08:44
→ ovo joined08:45
ovo → Guest981508:46
weedmic when I make a code block starting with `` and the code ```, i see it is courier 10, but I don't see a box around the text. is that normal? if yes, how do I make a box that is black with white text?08:46
→ clime joined08:46
← R2robot left08:48
← yuljk left08:49
← Guest9815 left08:50
→ majors joined08:50
osse see it where?08:50
→ q3lont joined08:51
→ R2robot joined08:51
→ yuljk joined08:52
→ versly joined08:52
jast how exactly the rendered markdown appears depends on the website on which it's shown08:52
for instance, github applies its own styling with a light grey background and black text (plus maybe syntax highlighting if you specify a file type)08:54
← liefer396 left08:54
→ MajorBiscuit joined08:54
← terminalpusher left08:54
→ terminalpusher joined08:54
weedmic I'm wondering if it is working, but I cannot physically see the colour around the box - going to see if a collegue can see it. it might be too light grey.08:55
→ iamsleepy joined08:55
weedmic it looks beuatiful in kate with ```bash - anyway, tks08:55
← duderonomy left08:57
→ liefer396 joined08:59
← Gary_Sinise left08:59
→ batrick joined08:59
→ pzxcv joined09:00
→ rama joined09:00
← vlado_ left09:01
→ xFFC joined09:02
← yuljk left09:03
→ ovo joined09:04
ovo → Guest278109:04
← rama left09:04
→ yuljk joined09:05
← Guest2781 left09:08
→ Lord_of_Life_ joined09:13
← Lord_of_Life left09:14
Lord_of_Life_ → Lord_of_Life09:14
pzxcv Hello, if I "git pull origin mylocalbranch" and there are conflicts, does it automatically prompt an editor for resolving conflicts ?^09:15
→ Square3 joined09:18
jast pzxcv: no. you get status output telling you that there are conflicts (and in which files), and you can then edit them yourself or use 'git mergetool' (which may need some configuration so that it launches your editor of choice)09:19
you can also review the list of conflicted files using "git status" but conflicts will no longer show on files that you've marked as resolved (using e.g. "git add")09:19
→ ovo joined09:20
ovo → Guest319209:21
← Square2 left09:21
pzxcv jast: thanks.09:21
← memset left09:23
pzxcv another question. If I'm locally into somebranch, does "git pull origin somebranch" pull remote somebranch into local somebranch ?09:23
→ memset joined09:23
← versly left09:26
← Guest3192 left09:31
jast pzxcv: no... pull (or rather, its "merge" step) always targets the currently checked out branch. you have to switch branches if you want to merge into something else. this is because merges can involve conflicts and then the files have to be touched so you can resolve the conflicts09:33
← jacobk left09:35
jast in some limited cases you can do something similar without switching branches... but it's a bit arcane :)09:35
pzxcv jast: so, I can simply use "git pull origin", right?09:39
(when I'm in somebranch)09:39
← Pixi__ left09:40
→ esc joined09:42
→ ovo joined09:45
ovo → Guest60909:45
→ bookworm joined09:47
kjetilho yes, usually. sometimes git is picky since upstream branch has not been set for your branch.09:51
but you'll get a "helpful" message about what to do09:51
← Guest609 left09:53
← terminalpusher left09:53
→ terminalpusher joined09:54
← MajorBiscuit left09:55
→ MajorBiscuit joined09:57
← dvanloon3 left10:03
→ selckin joined10:04
→ dvanloon3 joined10:05
→ ovo joined10:07
ovo → Guest810310:07
→ gildasio joined10:09
← Guest8103 left10:11
← clime left10:16
jast pzxcv: whoops, I misread part of your question. yes, if you're in the right target branch, pulling Just Works™ (and in the common case where you have only one remote and upstream info is set up properly, just "git pull" with no args will do the trick)10:17
in fact you can even have multiple remotes if upstream info is correct (which it usually is, unless you created your local branch in a slightly more unusual way)10:18
pzxcv jast: np, thanks10:19
→ DrowningElysium joined10:19
→ nyah joined10:20
→ ovo_ joined10:23
→ redbool joined10:26
→ lucasta joined10:27
← ovo_ left10:28
→ TomyWork joined10:28
→ swistak joined10:28
← yaymukun1 left10:28
→ f_ joined10:28
→ Quack joined10:29
→ yaymukund joined10:29
→ blaklistd4 joined10:31
← blaklistd left10:32
blaklistd4 → blaklistd10:32
← memset left10:37
→ memset joined10:37
← foul_owl left10:38
← vysn left10:39
← SleePy left10:43
→ SleePy joined10:44
→ vysn joined10:45
← vysn left10:46
→ vysn joined10:48
→ foul_owl joined10:52
← YuGiOhJCJ left10:53
← gep left10:55
← dvanloon3 left11:03
← jfsimon1981 left11:03
→ shailangsa joined11:05
→ dvanloon3 joined11:06
← memset left11:11
→ memset joined11:12
→ no_gravity joined11:16
no_gravity Just noticed that "git reset --hard" does not always reverts all changes done since the last commit11:16
→ nate2 joined11:17
← CalimeroTeknik left11:18
no_gravity New files will not be deleted11:18
That can result in a whole lot of chaos.11:18
For example when you did "rm -r dir1; mv dir2 dir1;" in between.11:19
And then you try to revert it with "git reset --hard"11:19
Now all the files in dir2 are still in dir1.11:19
← terminalpusher left11:20
ikke no_gravity: git clean is meant to remove untracked files11:20
selckin git clean11:20
Bombe Of course, it will not touch files that it doesn’t know anything about.11:20
→ terminalpusher joined11:20
no_gravity ikke: "git clean" gives me "fatal: clean.requireForce defaults to true and neither -i, -n, nor -f given; refusing to clean"11:21
Bombe It reverts all changes done to files it controls.11:21
weedmic and I'm very happy for that Bombe11:21
selckin how come people can read on irc but not in the terminal11:21
ikke no_gravity: read man git-clean11:22
gitinfo no_gravity: the git-clean manpage is available at https://gitirc.eu/git-clean.html11:22
→ CalimeroTeknik joined11:22
← nate2 left11:22
no_gravity One thing I also still find strange is that git does not track empty directories.11:22
weedmic I am trying to create a markdown document that shows certain git commands. Here is my code "https://pastebin.pl/view/fd05d32b", but the output wraps as if there are no elf (functions) \n\r - I tried adding them manually, but then they show and it still wraps around. Anyway to fix this?11:23
no_gravity weedmic: #markdown?11:24
weedmic correct11:26
oic, there is no room :D11:27
no_gravity weedmic: #programming?11:27
weedmic: #webdev?11:27
weedmic don't worry - i'll figure it out - just figured since it was reocmmended by git, ppl might know about it. (https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax)11:28
← terminalpusher left11:29
no_gravity weedmic: Git is a software. It does not recommend anything about markdown.11:30
→ terminalpusher joined11:30
→ roadie joined11:35
← f_ left11:37
← no_gravity left11:39
← terminalpusher left11:42
← cami||e left11:43
→ Leonarbro joined11:46
→ hdbbdh joined11:50
→ duderonomy joined11:51
→ bn_work joined11:53
→ terminalpusher joined11:54
← memset left11:55
→ memset joined11:56
← [mct] left11:56
Square3 → Square11:57
→ jaykelly450 joined12:01
← dvanloon3 left12:03
→ dvanloon3 joined12:06
← cafkafk left12:08
→ cafkafk joined12:10
→ Suchiman joined12:11
→ mobidrop joined12:15
→ blaklistd1 joined12:22
← blaklistd left12:24
blaklistd1 → blaklistd12:24
→ ovo joined12:25
ovo → Guest178212:25
← coot left12:25
→ cami||e joined12:26
← kilobyte_ch left12:26
← q3lont left12:27
→ wgrant joined12:28
← Guest1782 left12:29
→ bloody joined12:32
→ ovo joined12:34
ovo → Guest913312:35
← Guest9133 left12:38
→ kilobyte_ch joined12:41
← bertiger left12:41
→ sa0 joined12:43
→ bertiger joined12:44
→ rama joined12:45
← _sa0sin_ left12:46
→ lgc joined12:47
← mobidrop left12:49
← rama left12:49
→ mobidrop joined12:50
→ Rashad joined12:50
→ m4r35n357 joined12:53
← cafkafk left12:53
→ moviuro joined12:53
→ cafkafk joined12:54
← lgc left12:54
→ q3lont joined12:55
← Rashad left12:57
← Leonarbro left12:57
→ aspirin joined13:00
weedmic fyi - this is extremely close, the only draw back is the black background only is where characters are, but the background, foreground, and non-wrap are correct - <span style="white-space: pre; overflow-x: auto; color: white; background-color: black;">13:00
→ rama joined13:00
→ stenno joined13:03
← andypandy left13:03
← q3lont left13:03
← dvanloon3 left13:04
← jaykelly450 left13:04
→ andypandy joined13:04
← rama left13:04
→ Gary_Sinise joined13:05
→ acetakwas joined13:06
← stenno left13:07
→ dvanloon3 joined13:09
→ stenno joined13:12
← Gary_Sinise left13:14
→ maret joined13:16
← Xenguy left13:17
→ andreas303 joined13:19
← dodo left13:22
→ dodo joined13:22
→ coot joined13:24
← chexum left13:25
→ chexum joined13:26
→ thomas25 joined13:28
→ liang joined13:30
→ f_ joined13:36
← liang left13:37
→ Rashad joined13:38
→ [mct] joined13:39
→ raffaele__ joined13:42
← bywaterloo left13:45
← iamsleepy left13:52
← cafkafk left13:53
→ polyrob joined13:54
→ cafkafk joined13:57
← Square left13:58
→ Square joined13:59
→ thiago joined13:59
← thiago left14:00
→ thiago joined14:00
← bookworm left14:00
→ rama joined14:02
← dvanloon3 left14:04
← weedmic left14:04
← thiago left14:05
→ dvanloon3 joined14:05
→ stengah joined14:05
← jmd left14:07
→ jmd joined14:07
← hdbbdh left14:08
→ skapata joined14:10
→ thiago joined14:12
← rama left14:12
→ hwpplayer1 joined14:20
→ bookworm joined14:22
← stengah left14:25
← eroux left14:28
→ Gaboradon joined14:29
→ c0dehu1k joined14:31
relipse how do i php -l each file that is modified in git status14:35
that's a lint check14:35
stenno just lint all the stuff?14:35
→ ovo joined14:35
relipse yes14:35
only the modified files14:36
ovo → Guest504614:36
← maret left14:37
stenno i meant, wouldn't it be easier to just lint all the stuff instead of just the modified ones14:37
even thought it'd take longer14:37
→ rama joined14:39
relipse lol14:39
I already have a script to lint the whole directory recursively14:40
stenno just exclude vendor stuff14:40
← Guest5046 left14:40
← rama left14:43
→ thuna` joined14:44
← hwpplayer1 left14:45
← Rashad left14:47
← lucasta left14:48
→ stengah joined14:49
← maxel left14:50
→ maxel joined14:50
← mobidrop left14:54
→ maret joined14:55
→ Rashad joined14:55
→ duxsco joined14:56
→ causa_sui joined14:57
→ moldorcoder7 joined14:57
→ gast0n joined15:03
← dvanloon3 left15:04
→ iamsleepy joined15:04
→ dvanloon3 joined15:05
jast relipse: if you don't have filenames with whitespace, something like this should do the trick: git ls-files -m | xargs php -l15:05
otherwise I believe this should work: git ls-files -m -z | xargs -0 php -l15:06
(that's a zero)15:06
relipse thanks but that only did the first file15:07
I am on macos15:07
bash15:07
← Rashad left15:08
relipse ❯ git ls-files -m -z | xargs -0 php -l15:08
No syntax errors detected in app/code/Core/Application/User/Helpers/Controllers/User/Data.php15:08
→ rama joined15:09
→ so-offish joined15:09
bookworm you need to tell xargs to only pass a single arg15:10
← theoceaniscool left15:10
bookworm it expands to up to $max_args otherwise on the same cmd line15:10
(assuming your linter only takes a single file)15:10
jast yeah, I guess if php accepts only one arg...15:11
→ liang joined15:11
→ Rashad joined15:11
jast ... | xargs -0 -L 1 php -l15:11
ikke -n115:11
jast hmm, or -n instead of -L15:11
→ hwpplayer1 joined15:12
liang can I use git upload-pack get packfile?15:12
jast actually I'm not sure how -L works exactly in -z mode15:12
so probably -n is the better choice15:12
→ ovo joined15:13
ovo → Guest693015:13
jast liang: can you explain a little more what you want to do? upload-pack is typically run internally on the remote side during a fetch, with the local side being handled by fetch-pack15:14
liang #git upload-pack --stateless-rpc data/build-your-own-x/.git15:15
0032want 8e628eb428a55ea4909de4af9a82e99db346ed8315:15
000015:15
run like this locally15:16
← mexen left15:16
→ mexen joined15:16
→ otisolsen70 joined15:18
→ nate2 joined15:19
liang I expect output get the want packfile15:22
← nate2 left15:23
→ EvgenyK joined15:25
→ hbautista joined15:29
← stenno left15:29
← Bilge left15:29
→ countach202020 joined15:29
→ Bilge joined15:29
relipse ok jast, this works git ls-files -m -z | xargs -0 -L 1 php -l except how do I limit it to only *.php files?15:31
← Rashad left15:31
jast liang: you're missing the final part of the protocol where the client says it's done. instead of a "0000" line, try a "00000009done" line15:32
ikke git ls-files -m -z '*.php'15:32
jast (that's 0000 followed by 0009done)15:32
I might have a zero too many in my first line there :) seven zeroes15:33
nah, it's fine, I just can't count15:33
the upload-pack process will send a "0008NAK\n" in response, followed by the pack file15:33
relipse ok great, thanks ikke: git ls-files -m -z '*.php' | xargs -0 -L 1 php -l15:34
that works15:34
← duxsco left15:34
← kjetilho left15:34
→ Guest92 joined15:34
relipse is it possible to make that work with "git lint" ?15:34
jast assuming that that's not a third party tool I've never heard of, you can define an alias called 'lint'15:35
git config alias.lint='!git ls-files -m -z | ......'15:36
might want to do it with double quotes instead, so it doesn't collide with the single quotes in your command15:37
but some shells are picky about the ! so that may need escaping15:37
... or you can edit your .git/config and add an [alias] section with a `lint = ...` line15:37
liang thanks, jast15:40
← cafkafk left15:40
→ bambanxx joined15:40
← c0dehu1k left15:41
→ cafkafk joined15:42
← Guest92 left15:42
← pzxcv left15:43
← cami||e left15:44
→ reset joined15:51
hexology has there ever been a feature request to teach `git checkout` and `git reset --hard` to not clobber untracked/modified files in the work tree without a `--force` option or similar?15:53
← DrowningElysium left15:54
jmd hexology: I thought that was the behaviour.15:54
← Noisytoot left15:54
hexology not last i checked, and it always makes me nervous15:54
jmd: i'm talking about checking out paths, not switching branches15:54
→ Noisytoot joined15:55
hexology imo they should outright deprecate using `git checkout` to move HEAD around and make `git switch` the only accepted method for doing so, but that's another story :)15:55
jast switch/restore are still marked experimental :)15:55
hexology fair15:55
and i suppose you're supposed to use `git restore` instead of `git checkout` anyway for pulling individual files out of the index or a commit15:56
jast personally I think the new commands aren't so great anyway, the split of responsibilities is better but not good (by my standards)15:56
ikke Yeah, I don't really like the new commands15:56
jast which might contribute to them not being moved forward more aggressively15:57
hexology i feel the opposite, i hate checkout, i think anything is an improvement, and i think the split is exactly the right split15:57
i'm curious why you don't like them15:57
checkout is too scary and dangerous15:57
jast I think it doesn't go far enough15:57
ikke I have to constant look up all the flags15:57
→ blaklistd9 joined15:57
jast all of checkout and reset should be refactored into new commands15:57
→ gh34 joined15:58
hexology fair, i'd agree with that15:58
jast there is some overlap between the two, and having switch/restore/reset doesn't fully remove the overlap15:58
and ideally the flags should be closer to the original ones15:58
pikapika → militantorc15:58
jast _anyway_, back to the original topic :)15:58
I agree that that would be a useful addition to checkout etc.15:59
hexology i've thought about if we had `restore` and `restore-index` we could probably deprecate `reset` altogether15:59
jast: i agree but if it doesn't exist by now i'm tempted to assume there's a reason for it15:59
jast lack of tuits™15:59
← blaklistd left15:59
blaklistd9 → blaklistd15:59
ikke How would you 'reset' a branch / index / working tree to another commit?16:00
jast: especially the round variaty16:00
jast I made an overview of all the modes of checkout/reset at some point: !checkout-reset16:00
gitinfo Having trouble keeping all of the various forms of "git checkout" and "git reset" apart? Here's an overview: https://gitirc.eu/help/checkout-reset.html16:00
ikke checkout and reset are orthogonal, but they do cross16:01
← countach202020 left16:01
jast yeah, and ideally there would be a design that uncrosses things16:01
ikke But how would you do that without needing to execute a bunch of commands to achieve the same?16:02
← bambanxx left16:02
ikke switching to another branch requires checking out files in the worktree16:02
resetting a branch to another commit requires the same16:02
jast personally I'd consider "git switch" okay to transition to stable16:03
ikke That's overlap16:03
(reset --hard, that is)16:03
jast IMO it's semantically different enough from all the other operations to make it a separate command16:03
e.g. it has all of the "don't clobber modified files" logic16:04
← dvanloon3 left16:04
← [mct] left16:04
jast from my POV that makes it feel more like "switch to a different view" than "change my files"16:05
all of the other combinations are about overwriting various things16:05
→ dvanloon3 joined16:05
→ [mct] joined16:06
ikke unless you specify -f :P16:07
jast but that's redundant with reset --hard16:07
and in fact 'git switch' doesn't have a force flag16:07
oh, it does, just missing from the synopsis16:07
personally I'd change it so -f triggers an error if you don't pass a branch arg, since "git switch -f" is a corner case and IMO violates the principle of least surprise: it does not actually switch anything16:09
← CrtxReavr left16:13
→ CrtxReavr joined16:13
← Guest6930 left16:15
← MajorBiscuit left16:15
→ MajorBiscuit joined16:15
← coot left16:16
← rfuentess left16:16
→ coot joined16:17
← gast0n left16:18
← Arokh left16:19
→ Arokh joined16:19
← stengah left16:22
→ jacobk joined16:23
hexology ikke: it's a destructive operation and not something most people do frequently, so i'm ok making it more complicated to run16:24
→ EvgenyK_ joined16:25
← EvgenyK left16:25
hexology i guess what i'd like is for the commands to more directly reflect the operations they imply. the general operation is "copy files from [tree-ish|index] to [index|worktree]" right? so we should expose that somewhat directly in the cli imo16:26
→ ovo joined16:27
← GNUmoon left16:27
jast ikke: here's a rough design: https://gist.github.com/jast/90cec0cf38fb9d6f4d9ee5e96c7e146716:28
ovo → Guest983816:28
hexology heck, `git move-head [ref]` and `git copy-files --from [tree-ish|index] --to [index|worktree]` might even be nice as lower-level primitives. then you can define switch, reset, and restore in terms of those two. (as far as i understand switch, reset, and restore anyway...)16:29
krumelmonster I just wanted to do two pull requests for two completely unrelated fixes on github. They are each a single commit and committed both on my forks master branch. I've already created the PR for the older commit. Is it even possible to pr only the more recent commit? Or do I first have to move it to its own branch?16:29
jast hm, I made some boo-boos there16:29
hexology krumelmonster: you can merge the 2nd PR and ignore/close the 1st, but the 2nd PR will include both commits because github PRs don't support cherry-picking arbitrary commit ranges. the best option to split them would be to rebase the 2nd PR branch onto master, so both PR branches are 1 commit based on master16:31
← Nothaveld left16:31
← liang left16:31
← Guest9838 left16:32
krumelmonster I was afraid I'd have to do that because I have no idea how16:32
hexology krumelmonster: you're in rebase territory :) fortunately it sounds like this is perhaps the easiest case. your commit history is like this, right? `A (master) <- B (branch1) <- C (branch2)`16:32
that is, master points to A, branch1 points to B, and branch2 points to C. and A is the sole parent of B, and B is the sole parent of C.16:33
you can do this without rebase too but it's a good thing to know how to do16:33
dzho krumelmonster: this might take more time than you want to do up front, but I have found it really helpful and a big confidence booster to make small, separate repositories to test these sorts of things out and to practice on.16:33
hexology that too dzho, it's not just a confidence booster but it's useful practice when you're about to run potentially destructive commands16:34
dzho like, just text files with a few lines that you change in different ways but that are very easy to see and read and reason about.16:34
→ EvgenyK joined16:34
→ ^3^ joined16:34
krumelmonster I committed all to master unfortunately: https://github.com/andrewrk/libsoundio/compare/master...krumelmonster:libsoundio:master16:34
→ GNUmoon joined16:34
← EvgenyK_ left16:34
hexology krumelmonster: that's fine. do you understand what i mean about the history?16:35
it looks like the answer is yes more or less, but it's really important to understand what i mean because it's the difference between being mystified and knowing what you're doing, imo16:35
← Arokh left16:36
← xFFC left16:36
krumelmonster I understand that you want to know whether my commit history is linear which it is. I don't understand what you mean with branch1 and branch2. I don't have them... But I want them.16:36
dzho krumelmonster: how comfortable are you working across different local branches? the reason I ask is because you asked earlier "do I have to first move it to its own branch?" and I thought it sounded like you are reluctant to use branches.16:36
hah, ok, that sort of answered the question as I was writing it.16:37
krumelmonster I'm ok with working with branches locally and if I'd have to do this again, I'd know how to use different branches without looking16:37
dzho ah, ok16:37
krumelmonster commiting this to origin is an afterthought16:37
errm pull requesting16:37
hexology krumelmonster: yes, the first place to start is to create new branches "pointing to" the correct locations in your git history16:38
krumelmonster so that's checkout, switch -c, switch, checkout, switch -c and I have two branches originating at the respective commits?16:38
hexology branches are a lot like sticky notes attached to specific commits in history. git moves the sticky notes for your when you make new commits :)16:38
you can do `git branch <name> <commit>` krumelmonster16:39
krumelmonster fancy :)16:39
hexology so if you want your 1st and 3rd commits to be new branches, you can do `git branch feature1 'HEAD~2'` to put the feature1 branch 2 commits behind HEAD, and `git branch feature2` to put the feature2 branch at HEAD16:40
→ Arokh joined16:40
hexology and here's a script to set you up in a fresh test repo so you can expermient without breaking things: https://bpa.st/7EPPK16:40
← hwpplayer1 left16:41
hexology of course you can also use the actual commit hashes from `git log` instead of using relative references like HEAD~216:41
← igemnace left16:44
krumelmonster oh and github even added my new commit to the existing pr oh no :( https://github.com/andrewrk/libsoundio/pull/27916:44
→ ovo joined16:44
→ hwpplayer1 joined16:45
ovo → Guest69816:45
krumelmonster Sorry for offtopic but do I have any other option than to close the PR and open another one once I've rebased successfully?16:45
I'll have to afk for now but you helped me a lot16:47
→ cami||e joined16:47
← MajorBiscuit left16:48
← Guest698 left16:49
jast ikke, hexology: https://gist.github.com/jast/90cec0cf38fb9d6f4d9ee5e96c7e1467 now updated to cover all cases, I think. also contains more examples and comparisons to old commands16:53
hexology krumelmonster no, if you do it right, you can keep your existing commit and make a new one for the new commits. however you'll need to force-push both of them16:54
ideally however you'd just close it and make two new ones, it's a good idea to work off of non-main/trunk branches anyway16:55
→ ovo joined16:55
hexology github doesn't let you "move" a PR to a different branch unfortunately16:55
ovo → Guest937716:55
jast bit of an arbitrary restriction tbh, it does let you change the base/target branch...16:57
← TomyWork left16:58
→ clime joined16:59
→ bambanxx joined17:02
← terminalpusher left17:04
← dvanloon3 left17:04
→ dvanloon3 joined17:05
→ jkatnight joined17:06
← peirik left17:08
← Square left17:09
→ masber joined17:12
→ terminalpusher joined17:12
← masber left17:13
← bambanxx left17:14
→ stenno joined17:15
→ bywaterloo joined17:21
→ Gary_Sinise joined17:22
← m4r35n357 left17:28
← jacobk left17:29
→ DaTa joined17:31
→ goldfish joined17:31
← hbautista left17:34
→ bambanxx joined17:36
← wavesong left17:37
← maret left17:39
← iamsleepy left17:39
→ maret joined17:40
← bambanxx left17:42
→ rosco joined17:43
→ bambanxx joined17:43
← stenno left17:43
→ gareppa joined17:44
← coot left17:45
→ wavesong joined17:46
← gareppa left17:51
→ iamsleepy joined17:52
→ Betal joined17:52
← bambanxx left17:54
← dmvrtx left18:00
→ dmvrtx joined18:02
→ masber joined18:04
← dvanloon3 left18:05
→ redbool_ joined18:07
→ xFFC joined18:09
← Tabmow left18:09
← cluelessperson left18:09
→ cluelessperson joined18:09
→ dvanloon3 joined18:10
← redbool left18:10
→ Tabmow joined18:11
→ jinsun__ joined18:16
← jinsun left18:16
jinsun__ → jinsun18:16
→ cycoder_ joined18:17
→ Gaboradon_ joined18:17
→ duderonomy_ joined18:18
→ chrfle_ joined18:18
→ Shinzon1 joined18:18
← han-solo left18:19
→ caverton2 joined18:19
→ MiguelX4138 joined18:19
→ themill_ joined18:19
→ Bitflux joined18:19
→ tofran2 joined18:19
→ bingos_ joined18:20
→ AndrewYu joined18:20
→ Yorick- joined18:20
← geko86 left18:21
← Byteflux left18:21
← riposte left18:21
← chrfle left18:21
← duderonomy left18:21
← dskull left18:21
← weyhmueller left18:21
← m1dnight left18:21
← filePeter left18:21
← Ekho left18:21
← hyperair left18:21
← Andrew left18:21
← bond left18:21
← causasui left18:21
← mags left18:21
← harv left18:21
← avar left18:21
← tmz left18:21
← antto left18:21
chrfle_ → chrfle18:21
← liefer396 left18:21
← tykling left18:21
← omnigoat left18:21
← MiguelX413 left18:21
← cycoder left18:21
← atrus left18:21
← cweiss0765321241 left18:21
← Yorick_ left18:21
← tomboy64 left18:21
← jiffe left18:21
← foo left18:21
← koo5 left18:21
← Spydar007 left18:21
← reverse left18:21
← gh34 left18:21
← Gaboradon left18:21
← caverton left18:21
← weko left18:21
← oskie left18:21
← mdh left18:21
← glik22 left18:21
← gvg left18:21
← Teacup left18:21
← eN_Joy left18:21
← tofran left18:21
← bingos left18:21
← EdFletcher left18:21
← BrianBlaze left18:21
← themill left18:21
← ingy left18:21
← Shinzon left18:21
MiguelX4138 → MiguelX41318:21
tofran2 → tofran18:21
Shinzon1 → Shinzon18:21
caverton2 → caverton18:21
→ tmz_ joined18:21
→ oskie joined18:21
→ filePeter joined18:21
→ reverse joined18:21
→ harv joined18:21
← bket left18:21
→ geko86 joined18:21
→ mdh joined18:21
→ m1dnight joined18:21
→ riposte joined18:21
→ avar joined18:21
→ hyperair joined18:21
→ bond joined18:21
→ Spydar007 joined18:21
→ atrus joined18:21
→ foo joined18:21
→ et09 joined18:21
→ liefer396 joined18:21
→ gvg joined18:21
→ mags joined18:22
→ jiffe joined18:22
→ weko joined18:22
→ dskull joined18:22
et09 i have two remotes defined, "origin" and "real-origin" (i branched a github repo). i'm on origin/main, how do i diff against real-origin/main18:22
→ gh34 joined18:22
→ koo5 joined18:22
→ eN_Joy joined18:22
← Pingue left18:22
→ antto joined18:22
→ Pingue joined18:22
→ omnigoat joined18:23
→ BrianBlaze joined18:23
→ Teacup joined18:23
tmz_ → tmz18:23
→ bket joined18:23
→ EdFletcher joined18:24
→ tykling joined18:24
← roadie left18:25
→ weyhmueller joined18:25
→ roadie joined18:27
← jmd left18:29
→ Ekho joined18:31
→ glik22 joined18:33
→ tomboy64 joined18:33
→ ingy joined18:35
← f_ left18:37
← jkatnight left18:38
← terminalpusher left18:38
→ terminalpusher joined18:38
→ rama_ joined18:46
← rama left18:50
← maret left18:53
bingos_ → BinGOs18:55
← BinGOs left18:56
→ BinGOs joined18:56
→ maret joined18:58
← mohit left19:01
→ mohit joined19:02
← iamsleepy left19:02
→ squirrel joined19:03
← dvanloon3 left19:05
→ bambanxx joined19:07
→ krushia joined19:07
← terminalpusher left19:10
← masber left19:10
→ dvanloon3 joined19:10
← dvanloon3 left19:15
→ stenno joined19:19
→ dvanloon3 joined19:19
→ nate2 joined19:20
← iomari891 left19:21
← Nokurn left19:22
→ masber joined19:22
→ gast0n joined19:24
← nate2 left19:25
← foul_owl left19:27
→ Notgnoshi joined19:34
← nots left19:35
→ iamsleepy joined19:35
← hwpplayer1 left19:36
→ jkatnight joined19:36
→ foul_owl joined19:41
← NightMonkey left19:43
→ hwpplayer1 joined19:44
→ NightMonkey joined19:45
→ sd5 joined19:48
→ jkatnight_ joined19:49
← jkatnight left19:52
→ m0viefreak joined19:53
← rama_ left19:53
→ rama joined19:54
← iamsleepy left19:55
← rama left19:56
→ rama joined19:56
← jkatnight_ left19:57
→ jkatnight joined19:59
→ gas51627 joined20:00
→ yuckey2d joined20:02
← dvanloon3 left20:05
→ Argorok joined20:07
← theobjectivedad left20:07
→ theobjectivedad joined20:08
→ coot joined20:08
→ dvanloon3 joined20:10
← jmer left20:11
→ jmer joined20:11
← xFFC left20:18
← luckman212 left20:20
→ luckman212 joined20:20
← gxt__ left20:21
→ gxt__ joined20:22
→ Atque_ joined20:23
← derpydoo left20:25
→ jmd joined20:26
← Atque left20:26
← jmd left20:27
← bambanxx left20:32
→ xFFC joined20:32
→ arescorpio joined20:39
→ bambanxx joined20:39
→ jmd joined20:41
← jmd left20:41
← bambanxx left20:44
→ jmd joined20:44
← jkatnight left20:44
← jmd left20:46
→ bambanxx joined20:47
→ iomari891 joined20:47
osse et09: you can git diff X Y where X and Y can be just about anything20:51
e.g. git diff HEAD real-origin/main or whatever20:51
← masber left20:52
← bn_work left20:53
← ThiefMaster left20:56
→ ThiefMaster joined20:56
phogg thebbb: a server change could occur after the fetch, but the log and merge will work on the same fetched information (until the next fetch). To your other question, I don't know.20:57
→ jkatnight joined20:59
← maret left21:02
← otisolsen70 left21:03
← Gaboradon_ left21:04
← jkatnight left21:04
← gtkgtkgtk left21:04
← dvanloon3 left21:05
→ KnoP joined21:06
← filePeter left21:06
→ dvanloon3 joined21:09
→ gtkgtkgtk joined21:14
← gtkgtkgtk left21:18
← roadie left21:19
← bambanxx left21:19
→ jkatnight joined21:21
→ nate2 joined21:21
← Tabmow left21:23
← thekingofbandit left21:24
→ Tabmow joined21:25
← EdFletcher left21:25
← jkatnight left21:25
← nate2 left21:25
→ gtkgtkgtk joined21:27
← hwpplayer1 left21:27
→ EdFletcher joined21:28
→ derpydoo joined21:29
→ taupiqueur joined21:30
→ peas joined21:31
→ taupiqueur1 joined21:34
← taupiqueur left21:36
← taupiqueur1 left21:39
→ taupiqueur2 joined21:39
← sd5 left21:42
→ igemnace joined21:44
← gh34 left21:51
→ roadie joined21:56
← n-st left21:57
← igemnace left21:57
→ n-st joined21:57
← roadie left22:02
← aspirin left22:05
← coot left22:05
← Atque_ left22:06
→ Albrecht33 joined22:07
→ Atque joined22:09
← KnoP left22:09
← Albrecht33 left22:11
← Aryan left22:13
← feriman left22:14
→ bambanxx joined22:16
← causa_sui left22:16
→ versly joined22:17
← bambanxx left22:18
← cami||e left22:19
→ bambanxx joined22:21
← versly left22:22
→ roadie joined22:29
← soifou left22:29
→ soifou joined22:30
← [mct] left22:30
→ Xenguy joined22:36
← roadie left22:36
← olbat left22:42
→ olbat joined22:42
← olbat left22:42
→ olbat joined22:42
→ [mct] joined22:42
← liefer396 left22:46
← iomari891 left22:46
← m0viefreak left22:52
← rosco left22:53
→ roadie joined23:03
← bywaterloo left23:04
→ Aryan joined23:05
← peas left23:05
→ peas joined23:07
← ws2k3 left23:08
→ ws2k3 joined23:09
← roadie left23:09
← bambanxx left23:10
→ jkatnight joined23:14
← jklfds_ left23:16
→ nate2 joined23:22
← sa0 left23:22
← jkatnight left23:24
← nate2 left23:26
→ rama_ joined23:31
← rama left23:33
← nyah left23:35
← cafkafk left23:36
→ cafkafk joined23:42
→ bn_work joined23:43
← so-offish left23:47
← Atque left23:47
← fling left23:48
← [mct] left23:48
→ fling joined23:49
← rama_ left23:53
→ Atque joined23:54
→ rama joined23:54
→ jklfds_ joined23:54
→ YuGiOhJCJ joined23:57
← xFFC left23:58
← jklfds_ left23:59
→ jklfds_ joined23:59

Logs Search ←Prev date Next date→ Channels Documentation