IRCloggy #git 2024-01-26

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-01-26

← tirnanog left00:03
← miigotu left00:04
→ miigotu joined00:04
→ tirnanog joined00:04
← Nixkernal left00:07
← sa0 left00:10
→ sa0 joined00:10
jb1277976 I don't think i saw this on the book but when i do a get fetch and everything is just waiting for me to merge it. what can i do with the stuff thats waiting? do i have to merge will it go away ?00:10
← SleePy left00:15
→ SleePy joined00:15
← SleePy left00:15
rewt git fetch just gets any commits/branches from the remote that you don't already have... what you do with it is up to you00:15
weaksauc_ it just exists in the repository00:16
← sa0 left00:16
weaksauc_ it might be helpful to look at git from the ground up00:16
fetch brings in all blobs(files/commits) that don't exist in your repository00:16
→ SleePy joined00:17
weaksauc_ and also branches (literally just a file with a hash in it put into a special directory)00:18
← miigotu left00:20
→ miigotu joined00:20
→ raffaele joined00:23
← raffaele__ left00:25
→ stuv joined00:30
b0nn Isn't this the argument for "topic branches" so that changes to the main branch don't affect work in motion, until you rebase the topic branch to catch up with the tip of the main00:37
← PantelicGR left00:47
← innegatives_ left00:47
→ sa0 joined00:49
→ nivag joined00:49
→ Guest64 joined00:50
← gast0n left01:07
← ferdna left01:08
← rustyshackleford left01:08
← fflam left01:10
→ fflam joined01:12
← ossifrage left01:13
jb1277976 I got to look closer at this tip stuff. i did a rebase. then pushed and it got an error about the tip.01:18
→ zloi_user joined01:22
← navi left01:22
← sa0 left01:25
← nivag left01:29
← tirnanog left01:32
← Lord_of_Life left01:34
→ Lord_of_Life joined01:34
→ sa0 joined01:38
← yuljk left01:38
← sa0 left01:43
→ yuljk joined01:54
← nyah left01:56
← xx left01:56
→ sa0 joined01:56
← aristaware443 left02:00
← Gary_Sinise left02:00
→ aristaware4439 joined02:01
← gchound left02:02
← hbautista_ left02:02
→ epony joined02:03
→ Gary_Sinise joined02:03
→ hbautista_ joined02:03
← Gary_Sinise left02:03
← nulixes left02:04
→ gast0n joined02:09
← miigotu left02:09
→ miigotu joined02:10
→ TonyStone joined02:11
← gast0n left02:16
← Ragnor left02:18
→ Ragnor joined02:20
→ gast0n joined02:20
← kurahaupo left02:20
→ Gary_Sinise joined02:21
→ kurahaupo joined02:24
← fflam left02:24
→ fflam joined02:27
← denysonique left02:27
← sa0 left02:29
→ denysonique joined02:30
← zloi_user left02:30
→ Pikk3wyn joined02:33
← stutz left02:33
→ nivag_2c joined02:36
→ stutz joined02:38
← stutz left02:38
→ stutz joined02:38
← xandris left02:39
← mobivme left02:43
→ sa0 joined02:43
→ mobivme joined02:46
jb1277976 is there a reason why on my local repo i can do a rebase do some stuff then when im done wantt to push it to my remote repo but something about the tip not matching then i have to pull then push ?02:50
← fflam left02:53
→ gsi_ joined02:54
→ fflam joined02:55
← Betal left02:56
← gsi left02:58
b0nn when you rebase you change history, when you try to push to a remote repo that repos version of history is different to yours03:00
So, you have a choice, get that repos version of history (pull) or push your version (with a force)03:01
← stuv left03:03
← skapata left03:06
← mobivme left03:08
→ Jck_true5 joined03:13
← Jck_true left03:13
Jck_true5 → Jck_true03:13
← rigid left03:14
← sa0 left03:17
→ skapata joined03:19
← Guest64 left03:20
jb1277976 wow that is dangerous espeically if your in a group or organization03:23
b0nn it depends on the nature of the rebase - most groups will prevent you from rebasing main itself, but allow you to rebase your branch, and to rebase your branches position in main03:24
jb1277976 aw03:25
→ sa0 joined03:30
← gast0n left03:33
← sa0 left03:35
← nivag_2c left03:36
→ cappy joined03:40
→ nivag_2c joined03:42
→ sa0 joined03:49
← kurahaupo left03:52
→ Vonter joined03:55
← cpackham left03:57
→ igemnace joined04:11
← very_sneaky_ left04:15
← igemnace left04:18
→ very_sneaky joined04:20
← sa0 left04:22
← akibageek left04:22
← nivag_2c left04:25
→ rustyshackleford joined04:27
← Pikk3wyn left04:30
→ Pikk3wyn joined04:30
→ bket_ joined04:36
→ sa0 joined04:37
← bket left04:38
→ nivag_2c joined04:38
← bindu left04:41
→ EvgenyK joined04:41
← sa0 left04:42
← cappy left04:45
→ bindu joined04:46
← EvgenyK left04:47
→ mexen joined04:49
← cdown left04:53
→ sa0 joined04:55
← miigotu left04:59
→ EvgenyK joined05:00
← epony left05:01
→ epony joined05:02
← EvgenyK left05:05
→ EvgenyK joined05:17
→ miigotu joined05:18
← EvgenyK left05:22
← nivag_2c left05:26
→ dustisim joined05:27
→ EvgenyK joined05:28
← sa0 left05:28
→ akibageek joined05:30
→ YuGiOhJCJ joined05:31
→ xandris joined05:32
← EvgenyK left05:33
← koo5 left05:37
→ AAIM01 joined05:38
← dustisim left05:40
→ sa0 joined05:42
← thiago left05:44
→ EvgenyK joined05:44
← omero_o1 left05:47
← sa0 left05:48
→ omero joined05:49
→ Ox7C5_ joined05:51
← EvgenyK left05:52
← hbautista_ left05:54
→ sa0 joined06:01
→ ssserpent joined06:09
← astlep5504018 left06:11
→ astlep5504018 joined06:13
→ Rashad joined06:13
← skapata left06:13
← akibageek left06:14
→ akibageek joined06:14
← akibageek left06:26
→ xx joined06:26
← FinnElija left06:32
← reset left06:33
→ FinnElija joined06:33
← sa0 left06:34
→ TomyWork joined06:35
→ rosco joined06:39
→ sa0 joined06:49
← sa0 left06:53
← gnoo left06:54
→ gnoo joined06:55
← larryv left06:56
→ sa0 joined07:02
→ zloi_user joined07:07
← sa0 left07:07
→ PlasmaHH joined07:15
→ rigid joined07:18
→ sreve joined07:18
→ sa0 joined07:21
→ igemnace joined07:23
← Vonter left07:24
→ ipynb joined07:24
→ Vonter joined07:30
← jb1277976 left07:30
→ john_johnk joined07:34
← john_johnk left07:43
← zloi_user left07:43
→ zloi_user joined07:44
← Gary_Sinise left07:47
→ RiFo joined07:52
← FH_thecat left07:52
← sa0 left07:53
→ rfuentess joined08:00
→ coot joined08:02
→ iomari891 joined08:03
→ sa0 joined08:03
← chexum left08:06
→ chexum joined08:07
← osc4rpt left08:08
← sa0 left08:08
→ EvgenyK joined08:08
← jas-maelstrom left08:11
← gryffus left08:12
→ rainystorm joined08:12
→ danse-nr3 joined08:14
← theobjectivedad left08:17
← Furai left08:18
→ theobjectivedad joined08:19
→ theoceaniscool joined08:23
→ sa0 joined08:23
← bkircher left08:25
→ Furai joined08:26
← sa0 left08:28
→ zloi_user_ joined08:29
← zloi_user left08:33
→ bkircher joined08:39
← EvgenyK left08:41
→ akibageek joined08:42
→ sa0 joined08:42
→ nulixes joined08:43
← sreve left08:46
j416 there's no need to use force push unless you actually want to destroy history on the remote08:49
← rfuentess left08:50
→ rfuentess joined08:51
bookworm your replacement for a rebased feature branch being what then?08:52
branch_v2beta4 ?08:52
just add more branches and push em all up /s ?08:52
osse I think that's a case where you actually want to destroy history on the remote08:54
but "destroy history"... it's more like "rewrite a tiny bit of the history"08:55
← FinnElija left08:55
← rainystorm left08:55
→ FinnElija joined08:56
→ EvgenyK joined08:58
← ipynb left09:00
b0nn osse: it depends on how much of the branch is affected by the rebase, so can be anything from the whole lot to nothing09:01
robo- → roboirc09:01
PlasmaHH its also a matter of project culture09:02
← FinnElija left09:04
→ FinnElija joined09:04
← danse-nr3 left09:08
→ danse-nr3 joined09:08
→ EvgenyK_ joined09:09
osse b0nn: I was thinking of the rebase feature branch case that bookworm brought up09:09
bookworm well, that was the topic right? I didn't bring it up as such09:10
osse (yes, technically you can start a feature branch from the root commit ... :P)09:10
← EvgenyK left09:11
osse I was just trying to say that the rebase feature branch scenario is a case where there is a need to use force push09:11
so I don't think j416 needs to come up with an alternative strategy09:12
→ jas-maelstrom joined09:12
b0nn hmm, that's more "once the branch is complete"09:12
→ FH_thecat joined09:13
b0nn I mean, if it's been pushed and changed, then you're going to have to force push09:13
← sa0 left09:14
b0nn So it depends on the context :)09:15
→ benni joined09:17
→ zerox2a joined09:19
zerox2a can I resolve merge conflicts with several commits?09:20
bookworm I don't think so?09:20
← liana left09:20
bookworm the merge is a single commit after all, why do you want to introduce more than one commit?09:21
← chexum left09:21
→ chexum joined09:21
zerox2a the conflicts concern many different things so I thought it might be better to have different commits to better understand how I foxed the merge conflicts. but maybe I am over complicating things.09:22
b0nn you can take the merge commit and change it into several commits09:23
→ schne1der joined09:24
b0nn As far as I know it would be a retroactive change, the merge commit would take place, then you'd unset it and break it up09:24
bookworm that will overwrite the merge commit no?09:24
meaning you loose the tracking?09:24
b0nn restrospective*09:24
→ Jaxef joined09:24
→ raffaele__ joined09:24
osse I think then you're better off creating regular commits in each branch where you make changes needed to reduce conflicts, and write a commit message explaining that09:25
PlasmaHH hm, seems like sourcetree doesn't support commit templates... * sigh *09:25
→ liana joined09:25
zerox2a I will make one merge commit to be on the safe side... thanks for your feedback!09:26
bookworm while we are there, what's your opinion on back merges? Aka merge master into feature?09:26
PlasmaHH bookworm: here it is a necessary step to get anything done and put the burden of merge conflicts mostly onto the feature branch09:26
bookworm I find criss cross merges annoying, personally and prefer rebase09:27
why would it be necessary, the merge flow should be one way, not two09:27
← raffaele left09:27
→ sa0 joined09:27
PlasmaHH bookworm: because here the golden rule of rebasing is to only do it if nobody else has touched the branch, and like half of the branches are shared between multiple developers09:28
so that leaves merge into the feature branch as the only way to get up to date with any other mainline branch09:28
osse I don't mind merging master into feature if it's a long running branch except for one thing, and I really hate that: When the last thing in the feature branch is a merge from master and then the feature branch is merged into master as a fast forward09:28
Then the graph looks weird09:29
selckin it has to be long living and worked on by multiple people09:29
bookworm and first does the "wrong" thing yeah09:29
first parent*09:29
PlasmaHH osse: I rarely enough look at the graph to find everything weird there ;)09:29
bookworm it's my default view when I look at commits....09:30
→ gandhibobandhi joined09:30
PlasmaHH when I am intrested in commits, its usually just one branch and I go through them only09:30
← sa0 left09:33
← chexum left09:34
→ chexum joined09:34
← reprazent left09:36
→ reprazent joined09:37
PlasmaHH seems like only the mac version of sourcetree supports commit templates, why would one even do that...09:44
← danse-nr3 left09:45
→ sa0 joined09:46
→ sreve joined09:49
→ gryffus joined09:51
→ danse-nr3 joined09:54
→ weaksauce joined09:54
osse Atlassian don't like people09:56
→ bin101_ joined09:57
← bin101 left09:57
← weaksauc_ left09:57
→ ham2 joined09:58
← hamster left10:00
→ bin101 joined10:08
← bin101_ left10:09
← Rashad left10:11
← sa0 left10:11
→ sa0 joined10:12
PlasmaHH well, who does...10:15
bookworm it's mutual :P10:21
→ teut joined10:22
→ szkl joined10:22
→ JanC_ joined10:23
JanC → Guest265510:23
← Guest2655 left10:23
JanC_ → JanC10:23
→ nyah joined10:24
→ Rashad joined10:26
→ Nixkernal joined10:27
→ ggGuest2 joined10:28
← ggGuest left10:29
← Rashad left10:34
osse PlasmaHH: but commit templates are a git thing. Does Sourcetree override it somehow?10:34
PlasmaHH osse: well, the gui tools seem to work a bit different and use -m because they have like a dialogue where you enter the stuff and then hit commit... its usually not hitting commit, then a dialogue pops up to enter/edit the message10:35
→ rahl joined10:36
PlasmaHH not sure how it works on the mac version of sourcetree which seems to support that for a long time now... though maybe its their own templates, not the git ones10:38
on the command line I have pre and post commit message stuff, would have been nice if that worked there too ^^10:38
→ rainystorm joined10:52
osse I wanted to test it myself since I have Sourcetree installed. But it doesn't start...11:03
PlasmaHH thats a nice start ;)11:03
osse Now I don't have Sourcetree installed.11:05
At least the uninstaller worked11:05
→ Guest64 joined11:05
PlasmaHH maybe you need to reinstall for every usage...11:09
jast yeah, embrace the shittiness :)11:11
I love it when software just randomly doesn't launch and ideally doesn't even display any message that would let you know what's going on11:12
PlasmaHH thats the windows motto... make clear there is an error, but be not at all helpful whatesoever in what the error means or was caused by11:18
→ lucasta_ joined11:19
← lucasta_ left11:19
jast Error opening file: Success11:19
→ osc4rpt joined11:26
← dsimic left11:29
→ bambanxx joined11:30
→ dsimic joined11:30
→ Non-ICE joined11:31
→ Guest44 joined11:32
← Guest44 left11:33
← Nixkernal left11:33
→ wavesong joined11:34
→ bloody_ joined11:35
← bloody left11:37
← bin101 left11:38
→ reset joined11:40
PlasmaHH hm, whats the proper treatment of people that want pre commit hooks to change the code... tar and feather?11:42
jast tar and gzip11:50
← weko left11:50
→ weko joined11:52
← zerox2a left11:55
→ bin101 joined12:01
← akibageek left12:04
← teut left12:09
← Ox7C5_ left12:11
← ju left12:12
→ ju joined12:12
→ nivag_2c joined12:13
← danse-nr3 left12:16
← benni left12:17
→ Rashad joined12:17
← miigotu left12:17
→ miigotu joined12:18
→ navi joined12:28
← Guest64 left12:29
← bambanxx left12:31
← donofrio left12:33
→ Ox7C5_ joined12:45
→ a51 joined12:45
→ danse-nr3 joined12:46
→ tirnanog joined12:49
← nulixes left12:52
← xcpep left12:55
→ xcpep joined12:55
← nivag_2c left12:56
→ bindu_ joined13:00
← xcpep left13:01
→ xcpep joined13:01
j416 to clarify what I said re: force push above, what I wanted to try to convey is that one should not assume force push to be the solution to any "your branches have divered" issue. Of course force push has its place, but use it when you _know_ it's correct.13:01
← bindu left13:03
j416 mainly as a reaction to the comment right before it, which I thought may be easily misinterpreted to mean that force push is the only solution13:03
PlasmaHH j416: the main problem is that 98% of the people who say they know don't ;)13:04
→ duxsco joined13:04
j416 PlasmaHH: you don't know that13:05
← xcpep left13:05
→ xcpep joined13:06
→ nivag joined13:08
→ bambanxx joined13:09
→ humanface joined13:10
j416 98% sure.13:11
← duxsco left13:13
← nivag left13:13
PlasmaHH they say 87% of statistics on the internet are made up on the spot13:15
← bindu_ left13:17
→ flower_ joined13:21
→ gast0n joined13:24
→ masber joined13:25
→ nivag joined13:27
← a51 left13:27
← szkl left13:28
→ ferdna joined13:31
← Celelibi left13:32
flower_ I want to revert back to a previous state/ commit, but want to keep all my commits. I want to jump to a other state at any time. What is the best way to do this? Reset does rm commits, checkout commit switches branches... Hm13:33
selckin just to look around, or to keep that state13:34
flower_ or should I use tags for this?13:34
selckin not clear why/what you want to do exactly13:35
→ Celelibi joined13:39
osse flower_: do you mean you want to browse around some old code? Or do you mean you want make it so that the current state becomes equal to an old one?13:40
→ donofrio joined13:43
flower_ I think I want to go to a state and commit that change to the current branch.13:43
selckin git checkout commit -- .13:44
flower_ that gives me a detached HEAD right?13:44
selckin no, updates workdir to state of that commit13:45
flower_ ah13:45
→ lucasta joined13:46
osse Note that it won't remove any newly added files.13:46
flower_ hm13:47
j416 use --no-overlay13:48
→ bindu joined13:48
← haritz left13:48
→ haritz joined13:48
selckin oh nice didn't know that existed13:49
← haritz left13:49
→ haritz joined13:49
j416 git-read-tree is another option13:50
← bambanxx left13:50
osse j416: TIL overlay13:51
does read-tree also remove by default?13:51
j416 read-tree updates the index to match a different tree13:51
osse ah'13:52
j416 it does some more thing as well with extra flags but I haven't looked into that13:52
the way I (very rarely) use it is something like, git read-tree <oldcommit> && git commit -m 'Restore state from <commit>'13:54
flower_ git checkout --no-overlay commit -- .13:56
seems to do what I want13:57
j416 flower_: that'd work.13:57
flower_ cool, now let me read about read-tree13:57
j416 flower_: just make sure you're in the repo root when running checkout, otherwise you might miss files.13:58
→ alexherbo2 joined13:58
osse The disappointed face got your back13:58
→ raffaele joined13:58
osse git checkout --no-overlay commit -- :/13:58
j416 flower_: an easy way to verify is of course to diff your new state against the commit you are attempting to restore to.13:58
osse: haha13:58
til :/13:59
flower_ j416: repo root, you mean not in detached state?13:59
j416 flower_: no, I mean that your pwd should be the root of your repo if you use "." (current dir)14:00
flower_ I see14:00
j416 cwd, is it14:00
what's p14:00
osse cd() { if [[ $1 = :/* ]]; then builtin cd "$(git rev-parse --show-toplevel)${1#:}"; else builtin cd "$@"; fi; } # You're welcome14:00
j416 I thought disappointed face only referred to the index or a commit, didn't know it could refer to the work treee14:01
treeee14:01
flower_ what is builtin?14:01
← raffaele__ left14:02
j416 til builtin14:02
← nivag left14:02
j416 flower_: I assume it's a shell cmd to avoid any aliasing14:02
osse correct14:02
flower_ ok14:02
j416 (or functions, in this case)14:03
osse if you override a builtin with a function or alias tou can use the "builtin" builtin to invoke the actual builtin14:03
Buffalo buffalo buffalo buffalo14:03
j416 alias builtin=cd14:04
osse there's also "command" for external commands14:04
j416 help14:04
osse function ls() { command ls; }14:04
j416 in case you didn't know, you can also prefix with backslash14:04
osse that works for aliases, not functions14:05
j416 oh.14:05
osse also zsh (and bash I believe) lets you define functions that run when something is pasted in14:07
so I have one that strips a/ and b/ from paths, and resolves from the root14:07
it can haz useful ness14:07
j416 wow, didn't know that14:08
sounds a bit scary14:08
what do you use that for? is it for diffing?14:08
osse typically opening a file or cd'ing to a path which I can just copy paste from e.g. git log -p output14:09
← mitrokov left14:10
osse the usefulnicity is that I can double click on the path, which typically selects the whole thing with a/ and b/ included, instead of fiddling around to get it exactly right,14:11
Cool kids probably use some sort of fuzzy finder integration or whatever to do the same thing just as quickly. But alas I am a bit constrained (grr windoze)14:13
"the same thing" = opening a file or cding to a path the can see in front of them14:13
→ nivag joined14:16
← xx left14:16
← igemnace left14:18
→ xx joined14:18
← iomari891 left14:18
← CovertDuck left14:18
← masber left14:19
→ CovertDuck joined14:19
osse It's really dead simple: https://raw.githubusercontent.com/Osse/dotfiles/master/.zfunctions/makegitrelative and zstyle ':bracketed-paste-magic' paste-finish makegitrelative That's it14:21
← CovertDuck left14:22
→ skapata joined14:22
→ cdown joined14:23
→ CovertDuck joined14:24
← Ox7C5_ left14:24
← EvgenyK_ left14:24
→ cdown_ joined14:30
j416 zsh magic14:30
interesting. I guess I haven't really had this use-case.14:31
how do you go from the diff output to the editor?14:31
osse Maybe you misunderstood me14:32
I copy the thing, then I type cd or vim or whatever then paste14:33
← Rashad left14:33
← cdown left14:33
osse or less or cat or14:33
cdown_ → cdown14:33
j416 ah14:33
osse I don't use it to go to a file in an open editor/IDE14:33
j416 I never made use of the fact that I can double-click to select like that; neat14:34
like, I knew I could, but I just never made use of it14:34
→ igemnace joined14:35
j416 osse: there's also the git-jump contrib, in case you don't know about it14:35
osse Yes, I've been meaning to use it14:35
I managed to write one or two such things before I learned git-jump exists, heh.14:35
j416 me too, since 10 months14:35
>.>14:36
osse I have my "git unmerged" that serves me well enough14:36
(Which I am reading the docs right is the same as git jump merge)14:38
j416 nice. I don't use that, yet.14:44
I just tend to look through the status output and then I search for conflict markers14:44
it actually works quite well14:45
osse what do you do once you've found them?14:45
j416 what do you mean?14:45
I fix them14:45
← danse-nr3 left14:45
osse ah I think we're back to the "exiting editor/IDE" thing. You mean you search for conflict markers in your already open editor?14:46
j416 like, I'll run 'git status' after a failed merge and that'll show me say 2 files conflicting, I'll open those in vim and /<<<<< to find the conflicting parts, then fix one by one14:46
osse: yes14:46
osse ah14:46
j416 I usually have the editor open so that's faster anyway14:47
osse I got tired of doing that, so I wrote git unmerged :p14:47
j416 heh14:47
I don't run into conflicts very often so it's not much of an issue14:47
← Vonter left14:47
← theoceaniscool left14:48
← aminvakil left14:49
← xx left14:50
→ xx joined14:50
→ aminvakil joined14:51
← ssserpent left14:52
← YuGiOhJCJ left14:53
→ Vonter joined14:53
osse I run into them all the time. Though usually just with myself since I reorder and fixup commits way to much14:53
→ ssserpent joined14:53
osse They say it's wise to think before you speak. I sometimes commit before I think.14:53
→ danse-nr3 joined14:54
→ thiago joined14:55
→ Rashad joined14:56
→ john_johnk joined15:07
← ferdna left15:08
→ joakimk joined15:09
→ a51 joined15:09
j416 I guess I just tend to roughly keep track of what might conflict and avoid the situation in the first place :D15:13
→ szkl joined15:14
j416 but come to think of it, I actually do run into conflicts more than I realised, but smaller ones from rebase, just never from regular merge15:14
for the reasons you mention15:14
← alexherbo2 left15:15
→ jfsimon1981 joined15:16
← sreve left15:29
← PlasmaHH left15:31
→ nulixes joined15:31
→ sahil_ joined15:32
← Gooberpatrol66 left15:33
→ limon joined15:38
← TomyWork left15:41
→ alexherbo2 joined15:41
→ PlasmaHH joined15:44
← john_johnk left15:51
→ akibageek joined15:51
← a51 left15:53
duszek how did people collaborate on open-source projects before git?15:54
huf using other version control tools15:55
duszek huf: i know that people used CVS since 198615:58
but then how would you send an update over a 300 baud modem?15:58
bookworm patch bombs via email15:58
→ a51 joined15:58
huf duszek: patiently15:59
duszek: also, there was RCS before CVS15:59
duszek huf: it was a local-only system15:59
huf and it's possible to do all this without any tool, and people did that too15:59
selckin pretty much how linux kernel collaborate today15:59
duszek meaning that it hardly scaled when you had people on another computers contributing16:00
bookworm calling the linux kernel "hardly scaled" is a fun one16:00
it's one of the largest open source projects out there16:00
← gryffus left16:01
duszek bookworm: it uses git16:01
← Pikk3wyn left16:01
duszek RCS required you to do development on a single computer16:02
or at least connecting to it every time you wanted to update16:02
huf you could always share stuff over floppy16:02
and people did that too16:02
they made do.16:02
selckin there was only a single computer for the whole school16:02
→ gryffus joined16:03
← rfuentess left16:03
duszek selckin: a PDP-11 with several terminals16:03
but too often there was just a single one16:03
ikke Like mentioned, contributing meant sending patches, you would often not directly interact with the VCS16:12
← mven97 left16:12
← rosco left16:13
huf patch(1) didnt appear until 1985 so i dunno what people did before that16:14
ed maybe?16:14
← Jaxef left16:15
← epony left16:18
kjetilho huf: diff has ed output16:19
← jas-maelstrom left16:19
kjetilho but it is a pain since it has no context, so it requires applying on an exact copy16:19
huf yeah so they used diff and ed after those were available16:20
j416 duszek: well _nowadays_, but not so much before 2005 did it :D16:20
huf and probably did it by hand and mouth in the dark before that :D16:20
→ epony joined16:20
← sahil_ left16:23
→ Gooberpatrol66 joined16:25
← axsuul left16:29
← RiFo left16:29
→ axsuul joined16:29
→ masber joined16:32
← danse-nr3 left16:36
← liana left16:38
← nivag left16:39
← hvxgr left16:43
← joakimk left16:44
← davidsenk left16:45
→ bambanxx joined16:45
→ davidsenk joined16:45
← causasui left16:47
← gandhibobandhi left16:48
→ causasui joined16:51
→ hvxgr joined16:53
← humanface left16:54
← Szilva left16:56
→ Szilva joined16:57
→ humanface joined16:59
← PlasmaHH left17:03
→ nivag joined17:03
← alexherbo2 left17:06
→ alexherbo2 joined17:06
← BigShip left17:10
→ BigShip joined17:10
← flower_ left17:12
→ flower_ joined17:13
→ jmd joined17:14
→ m257 joined17:18
→ jas-maelstrom joined17:23
← nivag left17:23
→ texus joined17:24
← Dragoon left17:25
→ rosco joined17:25
→ Gary_Sinise joined17:27
← texus left17:28
← kushal__ left17:30
← rosco left17:32
← mingdao left17:39
→ mingdao joined17:39
← alexherbo2 left17:41
← ssserpent left17:46
← miigotu left17:48
→ miigotu joined17:48
← lucasta left17:53
← Rashad left17:59
← bambanxx left18:00
→ alexherbo2 joined18:02
← m257 left18:06
← davidsenk left18:09
→ davidsenk joined18:15
→ PiRATA joined18:19
→ user03 joined18:26
user03 → gchound18:27
← rainystorm left18:29
← weko left18:34
← zer0bitz left18:39
→ phoenixh joined18:41
← phoenixh left18:42
← Quaack left18:43
→ weko joined18:44
→ Quack joined18:47
→ xmoforf joined18:48
→ bambanxx joined18:48
xmoforf I have a gpg key for signing commits (i think) in .gitignore with [user] signingkey = "key"18:48
but not sure how to use that to make what is needed for github18:48
BtbN In gitignore?18:50
← joako left18:50
→ zer0bitz joined18:51
→ RiFo joined18:52
← foul_owl left18:53
← Quack left18:55
→ Quack joined18:55
← RiFo left18:57
← PiRATA left18:59
j416 xmoforf: .gitignore is not made to store signing keys; store it elsewhere19:01
xmoforf: .gitignore is for ignoring files19:01
← zloi_user_ left19:05
← masber left19:07
→ foul_owl joined19:07
→ joako joined19:07
← bambanxx left19:08
→ zloi_user joined19:09
→ nivag joined19:11
→ jb1277976 joined19:13
jb1277976 if i have a file i want to send over to another branch do i submit a pr in github or do i rebase to the other branch or merge ? i think i have to add the file then merge and it should only do that one file right ?19:15
← fossdd left19:15
← Quack left19:16
→ Guest19 joined19:17
← Guest19 left19:19
→ Quack joined19:20
jb1277976 looks complicated https://phoenixnap.com/kb/git-checkout-file-from-another-branch ill just cp the file19:21
← nivag left19:22
→ nivag_2c joined19:24
← nulixes left19:30
→ ___nick___ joined19:32
← ___nick___ left19:32
→ ___nick___ joined19:34
← ___nick___ left19:35
← thorsten` left19:36
→ anakimluke joined19:36
→ ___nick___ joined19:37
← flower_ left19:38
← Quack left19:38
→ flower_ joined19:39
→ g2anj joined19:39
→ Quack joined19:39
← nivag_2c left19:40
← humanface left19:44
→ larryv joined19:46
← Quack left19:49
← alexherbo2 left19:51
→ alexherbo2 joined19:51
← flower_ left19:52
→ flower_ joined19:52
BtbN Whatever fits your workflow really19:53
Copying a random file from another branch is not something git can easily do natively if there's unrelated stuff in the same commits19:53
→ Pikk3wyn joined19:56
→ Quack joined19:58
← Vonter left19:59
→ rosco joined19:59
→ nulixes joined20:00
→ Vonter joined20:01
← Quack left20:04
→ thorsten` joined20:06
→ Quack joined20:06
→ lucasta joined20:08
← rosco left20:09
→ bambanxx joined20:13
← zloi_user left20:15
← Quack left20:19
← umbramalison left20:25
→ umbramalison joined20:25
← umbramalison left20:27
→ umbramalison joined20:27
→ Quack joined20:28
→ wootehfoot joined20:32
← Quack left20:40
kjetilho if you want to do it "right" (ie. copy history, too) it is a lot of work with filter-repo20:48
→ Quack joined20:52
← reset left20:52
← miigotu left20:52
→ miigotu joined20:52
→ axisys joined21:03
← ___nick___ left21:04
← Quack left21:08
→ Quack joined21:11
→ newpy joined21:20
newpy hi, I had a precommit fail, and the offending file is now both A & M in `git status -s`21:20
what are the proper steps here? just commit --no-verify?21:21
→ otisolsen70 joined21:21
← Quack left21:21
newpy I manually unstaged and re-added, but not sure if that's necessary21:23
→ Quack joined21:25
→ PantelicGR joined21:27
→ kus joined21:29
← Quack left21:33
← JayBeeFOSS left21:36
→ JayBeeFOSS joined21:36
→ Quack joined21:37
j416 newpy: fix the error and try to commit again?21:38
newpy j416, it was auto fixed by the precommit hook21:39
→ ___nick___ joined21:39
j416 newpy: great, problem solved?21:39
newpy sort of, it didn't commit ofc, and the staging area showed all files as A, with the offending file as "AM" (A in green, M in red due to the changes made by the formatter)21:41
← gxt left21:41
j416 and what's the issue?21:41
→ gxt joined21:41
newpy I just manually restaged the AM file w/ git reset <file> and git add <file>, but wondering if that's more work than needed21:41
should I have just ran git commit again or?21:42
j416 yes, just git add <file> would have sufficed21:42
newpy ah k21:42
j416 must be annoying with a pre-commit hook that modifies your files21:42
newpy it should have automatically formatted on save, need to look into it21:43
← ghost43 left21:45
→ ghost43 joined21:46
← wyre left21:49
→ wyre joined21:50
← miigotu left21:51
→ miigotu joined21:52
← Quack left21:53
← coot left21:54
← SuperLag left21:57
→ SuperLag joined21:58
→ Quack joined21:58
← flower_ left21:58
← sentriz left22:00
→ sentriz joined22:01
→ zetef joined22:04
← zetef left22:06
→ Guest25 joined22:08
← Quack left22:09
→ Quack joined22:11
→ Guest40 joined22:11
BtbN Is there a way to retroactively do what --filter=blob:none would have done on clone?22:13
i.e. delete all blobs that aren't currently needed?22:13
← Guest40 left22:13
BtbN Background: build system insists on full history for versioning, but full history is several gigabytes which I don't want to cache locally22:13
And meanwhile they use bitbucket, which doesn't support filtering22:14
← Guest25 left22:14
← igemnace left22:15
→ fossdd joined22:22
← Quack left22:23
→ Quack joined22:25
← xandris left22:25
→ xandris joined22:27
← alexherbo2 left22:28
→ alexherbo2 joined22:29
← ___nick___ left22:29
Gooberpatrol66 git commit stops doing anything if i run "git config --global core.hooksPath ~/directory". anyone know what's happening?22:29
← otisolsen70 left22:29
→ kurahaupo_ joined22:30
kurahaupo_ → kurahaupo22:30
← cmc_ left22:31
→ igemnace joined22:33
← newpy left22:34
→ cmc_ joined22:37
← duszek left22:38
← Quack left22:38
→ duszek joined22:39
kurahaupo It seems unfortunate that “push --force” is shorter to type than “push --force-with-lease”; is there a way to make “--force-with-lease” the default on a per-branch basis?22:39
→ newpy joined22:41
← chiselfuse left22:42
← wootehfoot left22:42
kjetilho kurahaupo: TIL --force-with-lease, thanks!22:42
→ chiselfuse joined22:42
Gooberpatrol66 ok it specifically fails if the dir has a pre-commit hook in it22:42
it contains nothing but this rg --multiline '<{7} HEAD\p{any}*={7}\p{any}*>{7}' && echo -e 'Error: merge conflicts in working tree\n' && exit 122:43
j416 kurahaupo: you can shorten it to --force-w22:44
Gooberpatrol66 and a shebang22:44
i don't see why that would cause a problem22:44
→ Quack joined22:44
→ guardianx joined22:45
← bambanxx left22:45
j416 Gooberpatrol66: what is the exit code of that script?22:45
tirnanog Gooberpatrol66: it will never, ever exit 0. use if.22:52
← Quack left22:53
tirnanog as an aside, consider printing errors to stderr, rather than stdout.22:53
Gooberpatrol66 i see, thanks22:54
→ sreve joined22:55
→ Quack joined22:58
← sreve left23:00
← gxt left23:05
→ gxt joined23:06
← schne1der left23:11
← Quack left23:17
← guardianx left23:18
→ Quack joined23:21
← Quack left23:29
← jab416171 left23:31
← Gary_Sinise left23:38
→ Quack joined23:40
← PantelicGR left23:43
← anakimluke left23:44
← xx left23:50
← miigotu left23:51
→ miigotu joined23:51
→ jab416171 joined23:55
← ghost43 left23:56
→ ghost43 joined23:58

Logs Search ←Prev date Next date→ Channels Documentation