IRCloggy #git 2024-03-01

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.

2024-03-01

→ ELFrederich joined00:00
← dnh left00:00
← fossdd left00:01
← miigotu left00:01
→ miigotu joined00:02
← cjoke left00:08
→ wgrant joined00:08
← bn_work left00:10
← V_ left00:16
← duuuude left00:21
← ELFrederich left00:28
→ fossdd joined00:32
← thuna` left00:35
← henry40408 left00:36
→ henry40408 joined00:36
← kurahaupo left00:48
→ kurahaupo joined00:49
← fossdd left00:54
← thiago left00:55
← navi left00:55
→ duuuude joined00:59
← cousteau left01:07
→ guru_ joined01:08
→ EvgenyK joined01:10
← guru__ left01:10
→ fossdd joined01:11
← EvgenyK left01:15
← mx08 left01:28
← commiejoke29 left01:30
← jim left01:32
← fossdd left01:34
→ jim joined01:35
→ gsi joined01:45
← duuuude left01:46
← gsi_ left01:47
← stewie925 left01:47
→ thiago joined01:48
→ stewie925 joined01:48
← stats4647 left01:48
→ stats4647 joined01:49
← stewie925 left01:49
← jacobk left01:50
→ fossdd joined01:52
← stats4647 left01:53
← Lord_of_Life left01:56
→ Lord_of_Life joined01:57
← davispuh left02:03
→ weko_ joined02:07
→ duuuude joined02:09
← weko left02:10
→ stats4647 joined02:10
← fossdd left02:12
→ jacobk joined02:14
← stats4647 left02:15
← hendry left02:19
→ fossdd joined02:22
→ stewie925 joined02:24
→ Gary_Sinise joined02:27
← jacobk left02:28
→ cluelessperson joined02:29
← cluelessperson left02:29
→ jacobk joined02:34
→ anakkucing joined02:39
→ stats4647 joined02:46
← firewyre- left02:46
← fossdd left02:47
→ fossdd joined02:48
← cpackham left02:48
→ Jaxef joined02:50
← defjam left02:50
← shabius left02:57
← fossdd left02:59
← anakkucing left03:01
← stewie925 left03:01
→ causasui joined03:03
→ fossdd joined03:07
→ stewie925 joined03:07
← causasui left03:07
← cdown left03:09
→ firewyre joined03:09
→ causasui joined03:13
→ YuGiOhJCJ joined03:15
→ Experimentalist joined03:17
← YuGiOhJCJ left03:17
→ YuGiOhJCJ joined03:18
→ defjam joined03:18
→ rgrinberg joined03:19
Experimentalist Can anyone tell me is there a way to trust a user as safe instead of each directory with dubious ownership in Git on Windows?03:21
Something like: git config --global --add safe.user 'S-1-5-21-nnnnnnnnnn-nnnnnnnnnn-nnnnnnnn-nnnnn' (User's SID)03:24
← defjam left03:25
← Jaxef left03:25
→ defjam joined03:37
← fossdd left03:40
← kushal__ left03:41
← defjam left03:42
→ fossdd joined03:45
← duuuude left03:50
← miigotu left03:50
→ miigotu joined03:51
← stats4647 left03:52
→ defjam joined03:56
← gast0n left03:58
← defjam left04:02
← jacobk left04:04
← rgrinberg left04:05
→ stats4647 joined04:08
→ duuuude joined04:08
→ Jaxef joined04:11
← fossdd left04:12
→ defjam joined04:13
← YuGiOhJCJ left04:14
→ YuGiOhJCJ joined04:14
← stats4647 left04:15
← mud left04:15
→ fossdd joined04:15
← stewie925 left04:18
← defjam left04:19
← fling left04:23
→ fling joined04:26
→ stats4647 joined04:28
→ defjam joined04:31
← stats4647 left04:33
→ rbatty joined04:34
→ stats4647 joined04:35
← dsrt^ left04:35
← defjam left04:37
← stats4647 left04:39
→ stats4647 joined04:40
→ jacobk joined04:40
← duuuude left04:41
← subopt left04:41
→ defjam joined04:43
← Traneptora_ left04:45
→ stuv joined04:46
← defjam left04:51
→ sahil_ joined04:52
← qqq left04:55
→ Traneptora_ joined04:59
→ defjam joined05:03
← defjam left05:09
→ ssserpent joined05:16
ikke Experimentalist: no05:20
← pedahzur left05:20
ikke you can only specify it by path, or '*' to trust all rpeos05:20
← Gary_Sinise left05:21
→ defjam joined05:21
b0nn hmm, is it possible to specify a root directory that has all the repositories in it?05:25
ikke afaict it's not recursive05:26
only '*' is a special value05:26
← skapata left05:27
b0nn gently screws that theory up and sends it to the waste paper basket05:27
← defjam left05:27
→ igemnace joined05:37
→ cycoder joined05:39
← JeffH left05:39
→ defjam joined05:40
← defjam left05:46
→ duuuude joined05:57
→ defjam joined05:59
→ Ox7C5 joined06:00
→ RiFo joined06:01
← defjam left06:05
← duuuude left06:08
→ duuuude joined06:09
← fossdd left06:09
← sahil_ left06:13
→ fossdd joined06:16
→ defjam joined06:17
← defjam left06:23
→ Nigthknight joined06:27
→ jmd joined06:27
→ zetef joined06:31
→ defjam joined06:36
← duuuude left06:37
→ larryv_ joined06:38
← larryv left06:41
← defjam left06:42
← fossdd left06:44
→ EvgenyK joined06:47
← jacobk left06:50
→ fossdd joined06:51
→ defjam joined06:54
← pickanick left06:56
→ duuuude joined06:58
→ FH_thecat joined06:58
→ doilferl joined07:00
← defjam left07:00
← CrunchyFlakes_ left07:03
→ CrunchyFlakes joined07:04
→ defjam joined07:11
← EvgenyK left07:11
← thiago left07:12
→ sahil_ joined07:12
← sahil_ left07:14
→ sahil_ joined07:14
→ PlasmaHH joined07:16
← defjam left07:16
→ cjoke joined07:21
← fossdd left07:22
← sahil_ left07:24
→ sahil_ joined07:24
→ trafficjam joined07:27
→ fossdd joined07:27
← sahil_ left07:27
→ sahil_1 joined07:27
larryv_ → larryv07:28
← sahil_1 left07:28
→ sahil_ joined07:28
→ EvgenyK joined07:28
→ defjam joined07:29
← stats4647 left07:29
← duuuude left07:29
→ stats4647 joined07:31
← trafficjam left07:32
← larryv left07:33
← defjam left07:36
← cmc_ left07:36
→ cmc_ joined07:38
← stats4647 left07:40
← plantroon left07:43
← hbautista left07:45
→ plantroon joined07:45
← axsuul left07:47
→ axsuul joined07:48
→ defjam joined07:48
← cmc_ left07:51
→ cmc_ joined07:52
← defjam left07:54
→ rfuentess joined07:55
← EvgenyK left07:56
← Jaxef left07:58
← warthog9 left07:58
→ xx joined07:59
→ warthog9 joined08:02
← Ox7C5 left08:02
→ Ox7C5 joined08:03
← fossdd left08:04
← hyperair left08:07
→ hyperair joined08:07
← Ox7C5 left08:08
→ defjam joined08:08
→ Ox7C5 joined08:08
→ fossdd joined08:10
← skered left08:12
→ Anu joined08:12
← mjt0k left08:12
→ arch_angel joined08:13
arch_angel → arch-angel08:13
→ vladoski joined08:16
← defjam left08:17
← doilferl left08:20
→ skered joined08:20
← rbatty left08:21
→ MGF_Fabio joined08:22
← MGF_Fabio left08:23
→ stenno joined08:26
→ MGF_Fabio joined08:27
← fossdd left08:29
→ defjam joined08:31
→ fossdd joined08:32
→ Nixkernal joined08:32
← alguien left08:33
← defjam left08:36
← sahil_ left08:39
→ sahil_ joined08:39
← sahil_ left08:42
→ sahil_ joined08:43
Experimentalist Thanks ikke08:43
→ rgrinberg joined08:45
→ defjam joined08:47
← MGF_Fabio left08:49
→ EvgenyK joined08:49
← fossdd left08:50
← rgrinberg left08:50
← miigotu left08:52
← defjam left08:53
→ rgrinberg joined08:54
→ fossdd joined08:54
← stenno left08:55
← EvgenyK left08:57
→ MGF_Fabio joined08:58
→ stats4647 joined08:58
→ KnoP joined08:58
→ aiena joined09:00
← defec7ed left09:00
→ defec7ed joined09:01
→ EvgenyK joined09:02
← stats4647 left09:02
→ defjam joined09:06
→ danse-nr3 joined09:08
→ fstd_ joined09:09
← fstd left09:11
fstd_ → fstd09:11
← defjam left09:11
← rgrinberg left09:14
← fossdd left09:18
→ vlado joined09:19
← vladoski left09:22
← Ishmael left09:22
→ fossdd joined09:24
→ defjam joined09:25
← aiena left09:26
→ humanface joined09:27
→ rbatty joined09:31
← EvgenyK left09:34
← defjam left09:36
← zetef left09:36
← FH_thecat left09:37
← Experimentalist left09:38
← bket left09:38
→ bket_ joined09:39
← fossdd left09:41
→ fossdd joined09:44
→ navi joined09:46
→ defjam joined09:49
→ FH_thecat joined09:51
← fossdd left09:58
→ fossdd joined10:03
← sahil_ left10:05
→ sahil_1 joined10:05
→ masber joined10:07
sahil_1 → sahil_10:07
masber hi, how can I tell git to sync tags to remote? I have a script in a pipeline which syncs 2 git repos, I sync the tags using `git push origin --tags` but this commands fails because remote already have some of those tags10:08
I get this message `hint: Updates were rejected because the tag already exists in the remote.`10:09
→ blatant joined10:09
osse force10:09
oh10:10
maybe not10:10
do the tags point somewhere else? or are they identical?10:10
← tirnanog left10:10
ikke I suspect they point to something different, otherwise git would not complain10:12
osse That's what I thought as well. Just didn't know10:13
← sahil_ left10:17
← fossdd left10:18
→ miigotu joined10:18
→ fossdd joined10:19
→ sahil_ joined10:21
← humanface left10:27
→ mjt0k joined10:29
masber I also do git push, shouldn't the SHA of all objects be the same?10:32
→ wyclif joined10:32
j416 never had a problem pushing tags using push --tags; it'll push any new tags and leave the matching ones be; I also suspect that the local tags point to different objects as compared to the remote tags10:34
→ stats4647 joined10:36
→ theoceaniscool joined10:37
← fossdd left10:37
← stats4647 left10:41
← masber left10:49
← ackyshake left10:51
→ davispuh joined10:56
→ fossdd joined10:57
← osc4rpt left10:58
→ osc4rpt joined11:00
→ lacrymology joined11:01
← wyclif left11:02
← sahil_ left11:02
→ sahil_ joined11:02
← rfuentess left11:03
← fossdd left11:13
→ fossdd joined11:20
← sefidel left11:24
→ sefidel joined11:25
← sahil_ left11:31
← dsimic left11:32
→ dsimic joined11:34
← fossdd left11:42
← danse-nr3 left11:44
→ humanface joined11:44
← blatant left11:44
→ hendry joined11:46
→ fossdd joined11:50
→ dnh joined11:55
← fossdd left11:58
→ sahil_ joined11:58
→ sahil_1 joined12:03
→ fossdd joined12:04
← sahil_ left12:05
sahil_1 → sahil_12:05
→ warmana joined12:08
← igemnace left12:11
→ igemnace joined12:11
← weko_ left12:11
→ distant joined12:14
→ Ishmael joined12:15
← sahil_ left12:16
→ sahil_ joined12:17
← sentriz left12:17
→ weko joined12:18
← Ox7C5 left12:21
← fossdd left12:22
← defjam left12:24
← jed left12:25
→ sentriz joined12:26
← Nixkernal left12:29
→ fossdd joined12:31
→ Nixkernal joined12:36
← ju left12:36
→ danse-nr3 joined12:36
→ defjam joined12:36
→ ju joined12:36
← Nixkernal left12:43
→ Nixkernal joined12:45
← Nixkernal left12:45
← Ishmael left12:46
← fossdd left12:46
← dharrigan left12:47
→ Achylles joined12:47
→ Nixkernal joined12:47
← Nixkernal left12:47
→ dharrigan joined12:48
→ Ishmael joined12:49
→ Nixkernal joined12:50
← Nixkernal left12:50
← rustyshackleford left12:52
→ fossdd joined12:53
→ Nixkernal joined12:54
→ pickanick joined12:56
← defjam left12:58
← pickanick left12:59
← davispuh left12:59
→ pickanick joined13:03
→ wootehfoot joined13:03
→ davispuh joined13:04
← pickanick left13:05
→ pickanick joined13:07
→ cdown joined13:08
← pickanick left13:09
→ hbautista joined13:10
→ defjam joined13:10
← fossdd left13:12
→ pickanick joined13:12
← Oblomov left13:14
← humanface left13:15
← weko left13:17
→ wavesong joined13:18
→ weko joined13:19
→ stats4647 joined13:22
→ fossdd joined13:25
← stats4647 left13:27
→ igemnace_ joined13:29
← hbautista left13:30
← pickanick left13:30
← igemnace left13:30
← sahil_ left13:33
→ rgrinberg joined13:34
→ jiffe2 joined13:35
→ sahil_ joined13:35
← arch-angel left13:38
← rgrinberg left13:39
← Nixkernal left13:42
← infernix left13:43
← defjam left13:43
→ Nixkernal joined13:44
← Nixkernal left13:44
← Aminda left13:46
← JanC left13:46
← fossdd left13:48
→ Aminda joined13:48
→ Nixkernal joined13:50
← distant left13:50
← Nixkernal left13:50
→ Fischmiep joined13:51
→ Nixkernal joined13:54
← Nixkernal left13:54
← fstd left13:57
→ fstd joined13:57
→ rgrinberg joined13:58
→ fossdd joined13:59
→ infernix joined14:01
→ Nixkernal joined14:02
← Fischmiep left14:03
← Nixkernal left14:03
← kurahaupo left14:05
→ Nixkernal joined14:05
→ JanC joined14:05
← Nixkernal left14:09
→ jfsimon1981 joined14:10
→ skapata joined14:10
← ssserpent left14:12
→ defjam joined14:12
← eyJhb left14:13
→ donofrio__ joined14:13
← rgrinberg left14:14
← fossdd left14:15
→ Nixkernal joined14:16
→ Oblomov joined14:16
→ Ox7C5 joined14:16
← Nigthknight left14:18
← sahil_ left14:19
→ sahil_ joined14:20
← sahil_ left14:21
→ rgrinberg joined14:21
→ sahil_ joined14:23
← sahil_ left14:24
→ sahil_ joined14:24
← sahil_ left14:24
→ sahil_ joined14:25
→ kristian_on_linu joined14:26
kristian_on_linu cheers14:26
okay, I hope this is not too OT ... I am trying to use a jekyll template (locally), that requires me to run an a script, and the script gives me the output "Error: Commit unstaged files first, and then run this tool again."14:28
https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/tools/init <-- this is the script14:28
→ subopt joined14:29
→ fossdd joined14:31
← sahil_ left14:35
→ sahil_ joined14:35
← sahil_ left14:36
→ sahil_ joined14:36
← sahil_ left14:37
← YuGiOhJCJ left14:39
→ duuuude joined14:39
→ gast0n joined14:42
← RiFo left14:43
← fossdd left14:47
→ aiena joined14:56
→ dionys joined14:57
→ fossdd joined14:57
→ no_gravity joined14:58
no_gravity "git diff --color-moved" shows me moved code in 3 different colors. I wonder what the idea behind that is.14:58
→ kurahaupo joined14:59
→ sahil_ joined14:59
osse If two chunks of code are detected as moved, the colors tell which chunk ended up where15:01
Should be only two colors, though? Hmm15:01
← rgrinberg left15:01
no_gravity It's a mistery to me.15:02
← danse-nr3 left15:03
← Lockesmith left15:03
→ Lockesmith joined15:03
→ danse-nr3 joined15:03
← wootehfoot left15:04
← Traneptora_ left15:04
no_gravity Purple seems to mean "This moved away from here". Green seems to mean "This moved to here".15:05
→ stats4647 joined15:05
no_gravity And then there is orange.15:06
I don't know what orange means :)15:06
It seems to be used when green would be appropriate.15:08
→ a51 joined15:09
← stats4647 left15:09
→ rgrinberg joined15:09
← dnh left15:16
← fossdd left15:18
→ alguien joined15:21
← rgrinberg left15:24
→ dsrt^ joined15:27
→ thiago joined15:30
→ fossdd joined15:36
← hyperair left15:37
→ hyperair joined15:38
→ rgrinberg joined15:43
→ mitrokov joined15:44
→ dnh joined15:44
← no_gravity left15:47
← miigotu left15:53
→ miigotu joined15:53
← fossdd left15:56
← kristian_on_linu left15:58
← igemnace_ left15:59
← danse-nr3 left16:04
→ rustyshackleford joined16:05
→ fossdd joined16:08
→ bn_work joined16:14
← PlasmaHH left16:22
→ stats4647 joined16:24
← Cienisty left16:28
← theoceaniscool left16:30
← stats4647 left16:30
← JanC left16:30
→ Cienisty joined16:31
Soni has anyone tried using LLMs to solve merge conflicts? as in "Please apply this patch: ... To this file: ... Given these patches as context: ..." or something?16:32
→ JanC joined16:32
selckin you're fired16:33
ikke and hope it does not hallucinate any code or remove anything important16:33
j416 eek16:33
← duuuude left16:33
j416 sounds like it _could_ do that successfully, but with a high risk of it being wrong16:33
and so the work would be undone anyway16:34
jmd Soni: WTF are LLMs ?16:34
→ OnkelTem joined16:34
j416 jmd: AI16:34
selckin jmd lives under a rock16:34
jmd Nah. I just thing TLAs are LOR16:35
← fossdd left16:35
selckin its not an obscure hting, biggest tech news last year(s)16:35
→ PlasmaHH joined16:35
jmd right. Flavour of the month, never to be heard of again.16:35
A bit like the transputer.16:36
← PlasmaHH left16:40
→ stats4647 joined16:48
→ fossdd joined16:49
← alguien left16:49
→ Leonarbro joined16:52
← Aminda left16:53
→ Aminda joined16:54
← vlado left16:54
Soni j416: more thinking about how it can be used to sneak in some malware16:54
nedbat jmd: Large Language Models are not likely to disappear anytime soon16:54
(for some good reasons, and a lot of bad reasons)16:55
selckin think the last bit was a joke16:55
nedbat hard to say16:55
selckin Soni: why would that depend on conflict resolving16:55
mefistofeles I think the excessive hype will cease next year16:55
over LLMs16:55
and it will go somewhere else, of course16:56
Soni train the model to recognize a few specific files and output malware, get someone to merge some changes to said files using your LLMerge, boom backdoored!16:56
selckin Soni: if you have automated merging of untrusted sources ...16:56
Soni selckin: the sources are trusted :)16:57
selckin well if you run compromised software you are always screwed16:57
jmd Noam Chomsky tried to solve this problem 50 years ago. His seminal conclusion was there is no solution.16:57
nedbat Soni: how is this any different than me trusting a person, and then that person inserting malware into my project?16:57
← FinnElija left16:58
→ FinnElija joined16:58
Soni nedbat: it isn't. but it's your merge tooling that's malicious. and it's a 20GB black box, so how would you find out about the malware.16:58
nedbat Soni: i'm not using an LLM to merge pull requests. if people start doing that, they will learn the hard way how LLMs can let them down.16:59
mefistofeles now, it could be interesting to do some kind of "dry run" and let the human decide from that17:00
could get some percent of the tedious work done17:00
→ daviid` joined17:02
← daviid left17:04
jmd How can I get a list of files which differ between two branches?17:05
cbreak jmd: git diff has options such as --status and --name-only17:05
jmd cbreak: thanks17:06
← MGF_Fabio left17:07
cbreak (the first one would be --name-status)17:07
← donofrio left17:11
← warmana left17:12
← fossdd left17:13
→ EvgenyK joined17:19
← defjam left17:23
→ duuuude joined17:26
← EvgenyK left17:29
→ fossdd joined17:33
→ defjam joined17:36
← Achylles left17:37
← causasui left17:40
← aiena left17:48
→ lucasta joined17:53
← fossdd left17:55
→ skapate joined17:59
← mkosmo26 left18:01
← skapata left18:02
→ mkosmo26 joined18:13
→ fossdd joined18:13
← opal left18:19
→ opal joined18:19
← dnh left18:27
← wavesong left18:29
kurahaupo jmd: Some parts of the transputer architecture are very much alive, except now they're inside one die instead of spread across a circuit board.18:31
← gxt_ left18:32
→ gxt_ joined18:33
kurahaupo nedbat: there's a rate limit on how fast one person can insert malware into projects; with an LLM it could infect thousands of projects at the click of a button. Also, humans fear incarceration and death, while LLMs have no instinct for self preservation.18:34
nedbat kurahaupo: this is why i won't be using an llm to merge pull requests. I advise others to also avoid it.18:35
kurahaupo has been re-watching "person of interest". It was supposed to be fiction, not a future documentary.18:36
← fossdd left18:36
kurahaupo nedbat: nor will I18:37
← Leonarbro left18:39
→ RiFo joined18:40
→ pedahzur joined18:43
daviid` → daviid18:49
→ dnh joined18:51
→ fossdd joined18:55
← skapate left18:58
← t0mm13b left19:01
← OnkelTem left19:05
← rbatty left19:05
→ sa0 joined19:08
→ PantelicGR joined19:09
→ ackyshake joined19:11
← KnoP left19:12
b0nn oh come onnnn, an llm reviewing PRs will be hilarious19:14
it'll send teams into a tailspin with out of date comments that are irrelevant and frankly wrong19:14
jb1277976 How do i force clone, i tried but getting errrors https://dpaste.org/WQo7119:15
← duuuude left19:16
ikke jb1277976: git clone will not overwrite an existing directory19:16
b0nn that's saying that your zsh custom plugins directory exists and cannot be deleted, what are you doing?19:16
jb1277976 trying to get the history of a command that i typed before like it show what i typed19:17
b0nn ok, but that's not happened19:18
← osc4rpt left19:19
→ osc4rpt joined19:20
→ duuuude joined19:22
jb1277976 nope let me restart19:22
→ larryv joined19:23
→ jpw joined19:23
← fossdd left19:26
← lucasta left19:28
← rgrinberg left19:43
← duuuude left19:44
← peirik left19:51
← defjam left19:52
→ rgrinberg joined19:53
← Rhonda left19:53
← dionisis left19:55
Kobaz heh19:56
→ blatant joined19:57
→ duuuude joined19:59
Gamah i made it 149 days at the new job before succumbing to self approving to merge something to main quickly19:59
→ defjam joined20:03
← subopt left20:05
→ subopt joined20:06
← subopt left20:07
← defjam left20:08
← miigotu left20:10
→ skapata joined20:16
→ fossdd joined20:17
← sfenik left20:17
← dviola left20:17
→ sfenik joined20:17
→ defjam joined20:20
← RiFo left20:23
← defjam left20:26
← sfenik left20:27
→ sfenik9 joined20:27
→ zetef joined20:27
→ duxsco joined20:27
→ _sa0sin_ joined20:28
→ kjartan_ joined20:30
← sa0 left20:31
← duxsco left20:33
→ miigotu joined20:35
← sfenik9 left20:35
← zetef left20:36
→ sfenik joined20:36
← fossdd left20:36
→ defjam joined20:36
→ cabazon36 joined20:41
→ Weesh joined20:43
→ t0mm13b joined20:45
← makara1 left20:46
→ subopt joined20:46
← makara left20:46
← a51 left20:49
← blatant left20:53
← duuuude left20:53
← Ishmael left20:54
← sahil_ left20:55
→ mud joined20:58
→ Ishmael joined20:58
→ fossdd joined21:00
→ a51 joined21:00
← gry left21:03
← Weesh left21:06
→ jacobk joined21:10
→ notna joined21:12
← Coop left21:13
← notna left21:16
← donofrio__ left21:18
intelfx hi! is there any way to make "git cherry-pick" silently skip empty (i. e. made empty by virtue of being already included in HEAD) commits?21:18
← donofrio_ left21:18
intelfx i. e. I want "git cherry-pick REV && git cherry-pick REV" to have exactly the same effect as just one "git cherry-pick REV", without exiting with rc=1 and asking me to do "git cherry-pick --skip"21:19
→ donofrio joined21:20
→ donofrio_ joined21:20
→ duuuude joined21:23
← fossdd left21:27
← rgrinberg left21:28
← cabazon36 left21:28
→ wootehfoot joined21:30
← Ishmael left21:31
← elastic_dog left21:31
← defjam left21:32
skered I have three commits not yet pushed (c1, c2, c3 in that order where c1 is the oldest) c1 has three files A, B, C.. I want to remove C from c1 and have its own commit. Is there a simple way to get that out of c1 outside of git-reset and just redoing it all21:32
git-rebase -i HEAD~3... e(dit) c1...?21:34
intelfx skered: "git rebase -i c1~", "edit" c1, then "git reset HEAD~ -- C", "git commit --amend", "git add C", "git commit -m my-new-commit", "git rebase --continue"?21:34
skered intelfx: Sounds like were both thinking the same.. I'll try that.21:34
j416 intelfx: checkout, not reset21:34
intelfx j416: won't checkout affect both working tree and index?21:35
we want to only reset it in the index21:35
and leave the working tree copy intact21:35
j416 intelfx: ah, my bad.21:35
I didn't read properly.21:36
what you write looks correct to me.21:37
← jacobk left21:38
skered intelfx: That worked perfectly. Thanks21:38
intelfx I had to do that particular dance way too many times :D21:39
hexology is there a way to see which commits are --ours and --theirs during a merge?21:40
→ Leonarbro joined21:41
j416 I'm not sure I've ever used reset like that; I always use checkout, hence my quick trigger21:41
thanks; that saves a step for me in this dance, too21:42
→ rgrinberg joined21:42
← Ox7C5 left21:43
→ cabazon63 joined21:43
→ elastic_dog joined21:43
→ defjam joined21:43
j416 hexology: during a conflict you mean?21:43
hexology j416: i just realized that maybe they don't exist if there was no conflict21:44
skered intelfx: I wonder if that can be aliased to something simple like `git myalias commit file` and the magic happens21:44
hexology i found that stages 1, 2, and 3 appeared empty21:44
j416 well if there's no conflict then the merge is done, no?21:44
hexology well no, i needed to do some manual cleanup21:44
j416 so you're merging with --no-commit?21:44
hexology yes21:45
i should have clarified, sorry21:45
intelfx skered: well, if you start the alias with "!", everything is possible :-)21:45
j416 hexology: so, you're merging into HEAD, that'll be 'ours'21:46
hexology: and I believe 'theirs' will be MERGE_HEAD21:46
hexology right. let's say i've just been hacking away at a hairy merge for 20 minutes, running unit tests etc, and i realized that i forgot what --theirs was21:46
ah okay, MERGE_HEAD will be visible via rev-parse etc?21:46
→ Ishmael joined21:47
j416 yes, but only during the merge21:47
hexology ah yes that works, thanks!21:47
← defjam left21:48
j416 man git-merge mentions MERGE_HEAD, and also other refs created during merge21:48
gitinfo the git-merge manpage is available at https://gitirc.eu/git-merge.html21:48
← rgrinberg left21:48
j416 skered: not having all that as an alias/script will help you not forget it ;)21:49
→ alguien joined21:49
hexology maybe the thing about stages 1, 2, and 3 is a separate question. `git show :2:myfile` says that myfile "is in the index, but not at stage 2" even though i know for a fact that the file was changed in "--theirs" and also is clearly marked as staged in `git status`21:49
→ Jaxef joined21:49
intelfx skered: totally untested, but "target="$1"; files=( "${@:2}" ); head="$(git symbolic-ref --short HEAD 2>/dev/null || git rev-parse HEAD)"; git checkout "$target"; git reset HEAD~ -- "${files[@]}"; git add "${files[@]}"; git commit; git rebase --onto HEAD "$target" "$head""21:51
oops, forgot a git commit --amend --no-edit after the reset21:51
→ fossdd joined21:59
→ CutieMelo joined22:06
← duuuude left22:07
→ defjam joined22:09
→ skapate joined22:11
→ Betal joined22:11
→ tirnanog joined22:12
← skapata left22:13
← cabazon63 left22:15
osse hexology: I don't know, but I think that only applies when there's a conflict22:18
if it's staged then there are no conflicts anymore (or never were)22:18
→ duuuude joined22:20
← wootehfoot left22:21
← CutieMelo left22:21
← kjartan_ left22:25
← miigotu left22:29
→ miigotu joined22:30
→ rgrinberg joined22:35
← duuuude left22:35
← fossdd left22:43
→ Kaedenn joined22:44
Kaedenn How do I do a "dry run merge" between two branches? I want to list the changes that would be applied with a `git merge` but without actually pulling in those changes. `git diff` includes all changes made to the target after the branch was created, which are difficult to filter out22:45
j416 Kaedenn: the only way is to actually do the merge22:48
Kaedenn hrm22:48
j416 Kaedenn: you can merge and then undo the merge if it was not what you wanted22:48
Kaedenn: another way is to detach HEAD and merge, then checkout your branch to get back22:48
Kaedenn: just merging might be the easiest; if it was what you wanted then no more work22:49
Kaedenn the thing is, merges to qa and prod require pull requests, but I want to view the changes before logging into github.com and doing that22:49
j416 good thing Git is local then22:49
Kaedenn so I can probably just merge to qa locally, examine the changes against origin, and then either discard the merge or delete+re-checkout the branch22:50
what's the command to abort a merge?22:50
wait, detached HEAD might actually be the way to go22:50
← sfenik left22:51
j416 if you never intend to keep the merge, using a throwaway branch or detached HEAD would be easy22:51
Kaedenn git checkout origin/qa, get merge, abort the merge, git checkout qa22:51
→ sfenik joined22:51
Kaedenn oh wait a throwaway branch, duh22:51
nullie you can do merge --no-commit22:51
Kaedenn ^ that's EXACTLY what I want22:51
thank you kindly22:51
j416 you'd still need to get rid of whatever --no-commit left though22:52
nullie it's only a working copy22:52
j416 (files in your work tree)22:52
nullie yep22:52
Kaedenn that's perfectly fine; I can do that22:52
j416 if the merge goes through cleanly, doing a regular merge and then checking out your other branch needs no further cleanup22:53
← bn_work left22:53
← donofrio left22:53
Kaedenn thank you :)22:54
j416 if HEAD is detached, there's no branch to delete even22:54
Kaedenn this is true22:54
j416 git checkout --detach && git merge otherbranch && (examine result) && git checkout yourbranch22:54
← cbreak left23:04
→ cbreak joined23:08
← sfenik left23:08
→ sfenik joined23:08
Kaedenn alright, I made note of all of this, thank you both23:09
← defjam left23:10
→ defjam joined23:23
← slackwear left23:24
← defjam left23:25
→ defjam joined23:26
→ duuuude joined23:26
← dnh left23:27
← sfenik left23:28
→ sfenik joined23:28
→ fossdd joined23:28
→ user1____ joined23:28
user1____ hello, i followed https://git-scm.com/book/en/v2/Git-on-the-Server-Git-Daemon and restarted the service but still i cannot "git clone 192.168.8.200:/pro1" and have to "git clone 192.168.8.200:/var/git/pro1" instead; what am i doing wrong?23:30
← miigotu left23:31
→ miigotu joined23:32
← PantelicGR left23:33
← whatsupdoc left23:38
← Kaedenn left23:45
← sfenik left23:46
→ sfenik joined23:47
← miigotu left23:48
→ miigotu joined23:49
← miigotu left23:51
→ miigotu joined23:51
← miigotu left23:51
→ miigotu joined23:51
← miigotu left23:53
→ miigotu joined23:55
← sfenik left23:56
→ sfenik joined23:56

Logs Search ←Prev date Next date→ Channels Documentation