IRCloggy #git 2022-07-17

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2022-07-17

← feriman left00:03
→ Ajax1468 joined00:03
→ thiago joined00:05
← Ajax146 left00:05
Ajax1468 → Ajax14600:05
→ Sulky joined00:06
← m0viefreak left00:09
→ pulse joined00:09
← thiago left00:10
← ghost43 left00:14
← dsrt^ left00:14
→ ghost43 joined00:15
→ Ajax1469 joined00:15
← Ajax146 left00:17
Ajax1469 → Ajax14600:17
→ lkor joined00:21
← lionkor left00:22
→ wbntdodt^ joined00:26
← nate4 left00:34
→ BUSY joined00:35
→ tsraoien joined00:38
← cronos left00:40
→ cronos joined00:40
→ prplecake joined00:45
← XV8 left00:47
← tsraoien left00:49
← laocid left00:50
→ sh0ne joined01:01
← keypusher left01:11
← lxsameer left01:13
→ keypusher joined01:13
→ nate4 joined01:15
← rgrinberg left01:16
← nate4 left01:23
← vdamewood left01:24
← umbramalison left01:24
→ umbramalison joined01:25
← smallville7123 left01:27
← FinnElija left01:30
← gxt left01:30
→ gxt joined01:31
→ FinnElija joined01:31
← pulse left01:32
← Peng left01:33
→ pulse joined01:33
→ Peng joined01:33
← pulse left01:33
→ pulse joined01:35
→ rgrinberg joined01:40
→ nate4 joined01:52
← lkor left01:54
← nate4 left01:57
← gxt left02:00
← ghost43 left02:00
→ gxt joined02:00
→ ghost43 joined02:00
← mon_aaraj left02:01
← FinnElija left02:03
→ mon_aaraj joined02:04
→ XV8 joined02:05
← pretty_dumm_guy left02:06
→ FinnElija joined02:09
← perrierjouet left02:10
← sh0ne left02:12
← sudoforge left02:15
← kevr left02:28
← zumba_addict left02:28
→ kevr joined02:28
→ Dotz0cat_ joined02:32
← Dotz0cat left02:33
Dotz0cat_ → Dotz0cat02:35
→ cvmn joined02:40
→ Dotz0cat_ joined02:40
→ finn_elija joined02:40
← FinnElija left02:40
finn_elija → FinnElija02:40
← Dotz0cat left02:41
Dotz0cat_ → Dotz0cat02:42
← rgrinberg left02:43
→ hoochmonger joined02:51
→ gast0n joined02:53
money → bigdaddykane02:54
← tyson2 left02:56
← TonyStone left02:57
← mud left03:02
← jinsl left03:04
→ jinsl joined03:04
→ nate4 joined03:14
← zebrag left03:15
← cvmn left03:16
← nate4 left03:19
→ mud joined03:33
← Murr left03:34
→ The_Blode joined03:46
→ thiago joined03:58
→ Ajax1462 joined04:04
← Ajax146 left04:05
Ajax1462 → Ajax14604:05
→ rgrinberg joined04:21
→ nate4 joined04:23
← nate4 left04:28
← gast0n left04:45
← ferdna left04:50
→ Wh0 joined04:57
→ perrierjouet joined05:04
→ madewokherd` joined05:09
← pulse left05:10
← madewokherd left05:13
← Wh0 left05:13
← EternalSunshine left05:18
→ Wh0 joined05:18
→ codaraxis__ joined05:29
→ Sulky_ joined05:29
← tirnanog left05:31
← Sulky left05:32
← codaraxis___ left05:33
→ dig joined05:34
← Visne left05:40
→ Visne joined05:41
→ sh0ne joined05:46
← dig left05:48
← bloody left05:48
→ dig joined05:54
→ FFY00_ joined05:54
← FFY00 left05:54
← jazzy left05:54
← great_taste left06:04
← thiago left06:10
→ nate4 joined06:11
← nate4 left06:17
→ dviola joined06:18
← hamburgler left06:33
← Marmotte left06:34
→ rsx joined06:34
→ Marmotte joined06:35
→ lgc joined06:42
← lgc left06:43
← ghost43 left06:46
← GNUmoon left06:46
← crabbedhaloablut left06:46
← rgrinberg left07:04
← dig left07:13
→ ghost43 joined07:13
→ EvilDMP joined07:16
→ dionysus69 joined07:19
← mon_aaraj left07:22
→ node1 joined07:23
→ mon_aaraj joined07:25
→ smallville7123 joined07:41
← wootehfoot left07:50
→ igemnace joined07:50
→ Ajax1467 joined07:55
← Ajax146 left07:56
Ajax1467 → Ajax14607:56
← kevr left08:00
← adanwan left08:00
→ adanwan joined08:01
→ srinidhi joined08:01
AlexKalopsia Hi everyone, I need some noob help. I forked a repo, and my first commit included some changes I made. Now I would like to have a separate branch that goes back to "before my first commit" (basically to the state as if I just forked the repo). Doing git reset --hard brings it back to AFTER my first commit. Same with git fetch origin master. Maybe I08:02
should fetch the remote?08:02
→ kevr joined08:03
← hqdruxn08__ left08:03
ikke git switch -c new-branch origin/master08:05
or did you commit the previous changes on top of master and pushed that?08:05
← EvilDMP left08:10
→ wootehfoot joined08:10
→ hqdruxn08 joined08:11
→ van1 joined08:11
van1 Hi08:12
← van1 left08:14
AlexKalopsia committed and pushed :S So I'll explain a bit better my situation.08:16
RepoA got forked by a user into RepoB, and they made a PR (USER-PR-1) for RepoA.08:16
I wanted to extend their PR (USER-PR-1), so I forked RepoB, did a change, pushed, and opened a PR (MY-PR-1) for Repo B. So far all good.08:16
Now, my goal is to basically make a PR (MY-PR-2) for RepoA, separate from (USER-PR-1), but I can't seem to be able to do that because I already have a fork (of RepoB) which, to my understanding, means I am _forced_ to have the USER-PR-1 in my PR2.08:16
← myme1 left08:17
→ myme1 joined08:17
← mven left08:18
ikke no, you are not08:19
Add their repo as a remote to your repository, and fetch that08:19
then create new branches on top of master from that remote08:19
← node1 left08:20
→ Liblx joined08:22
→ cvmn joined08:22
→ hello-smile6 joined08:22
→ han-solo joined08:23
→ kevr_ joined08:23
← kevr left08:23
← srinidhi left08:32
← rsx left08:34
AlexKalopsia mmm ok, let me give it a try08:35
→ feriman joined08:36
→ acebrianjuan joined08:38
← cvmn left08:38
AlexKalopsia > then create new branches on top of master from that remote08:38
do you mean I should first checkout the new remote, and then from there create a new branch?08:38
→ EvilDMP joined08:38
ikke You can create branches on top of other branches that you don't have checked out08:39
← feriman left08:42
AlexKalopsia that worked, ikke, thank you so much!08:42
→ feriman joined08:43
ikke no problem08:44
← skapata left08:44
← hello-smile6 left08:44
AlexKalopsia when I create a new branch I always do git checkout -b branchname. is there a more approriate way of doing that?08:44
ikke that's fine, but the 2nd argument defines the branch it will be created on top08:45
of08:45
which will default to HEAD (the current branch)08:45
→ nate4 joined08:45
AlexKalopsia with second argument you mean that there is an implicit <HEAD> after git checkout -b branchname?08:48
ikke 9yes08:49
so you can do08:49
git checkout -b branchname upstream/master08:49
so branchname will be created on top of upstream/master (the master branch you fetched from the remote called upstream)08:50
← nate4 left08:50
AlexKalopsia that's awesome, I didn't know that08:51
← wootehfoot left09:07
→ wootehfoot joined09:09
→ kenanmarasli joined09:10
← wbntdodt^ left09:10
← han-solo left09:11
→ han-solo joined09:15
→ iomari891 joined09:16
→ coot joined09:17
← Wh0 left09:19
← iomari891 left09:20
→ iomari891 joined09:23
→ epolanski joined09:24
→ lxsameer joined09:28
→ lkor joined09:35
← hoochmonger left09:37
← iomari891 left09:37
→ wbntdodt^ joined09:41
← lkor left09:44
← bkircher left09:46
← wootehfoot left09:47
→ wootehfoot joined09:52
← mon_aaraj left09:54
→ moldorcoder7 joined09:58
→ mon_aaraj joined10:01
← mon_aaraj left10:08
→ mon_aaraj joined10:09
→ srinidhi joined10:11
← coot left10:13
← mon_aaraj left10:18
→ mon_aaraj joined10:21
→ iomari891 joined10:24
→ m0viefreak joined10:29
← polyrob left10:37
← dionysus69 left10:38
→ polyrob joined10:41
← mon_aaraj left10:43
→ mon_aaraj joined10:45
← vishal left10:47
→ MajorBiscuit joined10:52
→ vishal joined10:53
← mon_aaraj left11:07
→ mon_aaraj joined11:09
← igemnace left11:09
→ justsomeguy joined11:10
← Betal left11:12
← mon_aaraj left11:13
← tejr left11:14
→ nate4 joined11:15
→ mon_aaraj joined11:15
→ tyson2 joined11:16
← junktext_ left11:19
← nate4 left11:20
→ junktext_ joined11:20
← mon_aaraj left11:22
← justsomeguy left11:24
→ mon_aaraj joined11:24
← chexum left11:31
→ chexum joined11:33
← smallville7123 left11:36
→ tejr joined11:36
← mon_aaraj left11:38
→ mon_aaraj joined11:40
← adanwan left11:44
→ adanwan joined11:45
← iomari891 left11:49
→ iomari891 joined11:50
← EvilDMP left11:52
→ momomo joined11:55
→ crabbedhaloablut joined11:56
→ Rashad joined11:57
← MajorBiscuit left12:04
→ smallville7123 joined12:05
← cweiss07653212 left12:09
→ cweiss07653212 joined12:09
bigdaddykane → money12:11
← FinnElija left12:16
→ FinnElija joined12:18
← mon_aaraj left12:20
→ nguvu joined12:21
→ mon_aaraj joined12:21
← han-solo left12:22
→ Trieste_ joined12:27
← Trieste left12:27
→ tykling joined12:28
← ripdog left12:30
Trieste_ → Trieste12:31
→ ripdog joined12:33
← XV8 left12:39
→ XV8 joined12:39
← blaklistd1 left12:43
← Rashad left12:46
→ FH_thecat joined12:50
← nguvu left12:51
← iomari891 left12:52
← Sulky_ left12:53
→ Sulky_ joined12:56
← mon_aaraj left12:56
→ mon_aaraj joined12:58
← adanwan left13:04
→ adanwan_ joined13:04
→ Rashad joined13:04
← mon_aaraj left13:06
→ mon_aaraj joined13:08
→ tsraoien joined13:13
→ pretty_dumm_guy joined13:13
→ iomari891 joined13:14
← m0viefreak left13:24
← iomari891 left13:25
← ikwyl6 left13:26
← Sulky_ left13:26
→ ikwyl6 joined13:29
← ikwyl6 left13:32
→ pulse joined13:33
← mitrokov left13:34
← adanwan_ left13:35
→ ferdna joined13:36
→ adanwan joined13:37
← FinnElija left13:38
→ ikwyl6 joined13:38
→ FinnElija joined13:39
← ikwyl6 left13:39
← dviola left13:53
→ ikwyl6 joined13:55
← mon_aaraj left13:55
→ mon_aaraj joined13:58
← Rashad left14:07
→ Sulky joined14:09
→ caveman joined14:11
→ jazzy joined14:13
← gxt left14:13
→ hoochmonger joined14:13
→ gxt joined14:14
→ nate4 joined14:14
→ sudoforge joined14:18
← nate4 left14:20
← mon_aaraj left14:24
→ mon_aaraj joined14:26
→ EvilDMP joined14:34
→ dviola joined14:36
← wbntdodt^ left14:39
← XV8 left14:43
→ hiroot joined14:45
← Sulky left14:48
← FFY00_ left14:53
→ FFY00 joined14:53
← ghost43 left14:54
→ ghost43 joined14:54
← SuperLag left15:02
← kenanmarasli left15:04
← caveman left15:06
→ SuperLag joined15:08
→ X-Scale` joined15:11
← ghost43 left15:13
→ thiago joined15:13
→ ghost43 joined15:13
← X-Scale left15:14
X-Scale` → X-Scale15:14
→ nate4 joined15:18
→ hamburgler joined15:22
→ X-Scale` joined15:22
← ghost43 left15:23
← X-Scale left15:23
→ ghost43 joined15:23
→ adelfino joined15:24
X-Scale` → X-Scale15:25
→ gunner joined15:27
→ rgrinberg joined15:30
← ferdna left15:41
← tyson2 left15:42
→ madewokherd joined15:44
→ Sulky joined15:44
→ iomari891 joined15:44
← fflam left15:46
← madewokherd` left15:46
→ fflam joined15:47
← mon_aaraj left15:52
→ mon_aaraj joined15:54
money → polo16:00
← tsraoien left16:02
← adelfino left16:05
← sh0ne left16:05
→ bloody joined16:06
← hiroot left16:07
→ sh0ne joined16:10
← kevr_ left16:10
→ kevr joined16:11
← terminaldweller left16:11
→ kenanmarasli joined16:12
→ terminaldweller joined16:16
→ csm3105 joined16:17
← nate4 left16:18
← sh0ne left16:22
← gunner left16:23
→ gunner joined16:24
→ sh0ne joined16:24
← mon_aaraj left16:30
→ mon_aaraj joined16:32
← sh0ne left16:43
← iomari891 left16:44
← rgrinberg left16:44
→ rgrinberg joined16:48
→ dionysus69 joined16:51
← dmc left16:52
→ dmc joined16:54
→ zebrag joined16:54
← mon_aaraj left17:01
→ mon_aaraj joined17:02
← rgrinberg left17:07
→ maroloccio joined17:10
→ tyson2 joined17:15
← gunner left17:15
→ SteveR joined17:19
SteveR Hi there.17:22
i have added upstream repo17:22
i want to make sure my forked branch stays updates as the upstream master branch17:22
can i just do git merge upstream?17:22
ikke merge --ff-only17:23
SteveR git merge upstream/master17:23
← Sulky left17:23
SteveR i just did that git fetch + git merge upstream/master17:23
what is --ff-only17:23
← maroloccio left17:24
ikke Tells git to not make any merge commit, just fast-forward17:25
SteveR oh ok17:25
→ john_johnk joined17:26
→ skapata joined17:28
← skapata left17:28
→ skapata joined17:28
← SteveR left17:30
→ great_taste joined17:45
← fling left17:47
→ fling joined17:48
→ Murr joined17:52
→ han-solo joined17:54
→ ferdna joined17:56
← john_johnk left17:58
polo → bigdaddykane17:59
→ rgrinberg joined18:02
→ sh0ne joined18:03
← sh0ne left18:05
← dviola left18:15
→ nate4 joined18:15
→ gas51627 joined18:20
← nate4 left18:20
→ torniq joined18:21
torniq I want to have 2 remotes. origin and dev. Dev consisting of just git add . ; git commit -m .. ... so i can freely move between 2 different machines and develop without being out of sync. The problem is, i don't want me dev commits to be seen on the master/develop branches. Is this covered by a git rebase?18:23
← tyson2 left18:25
← BlessJah left18:26
→ BlessJah joined18:28
← hamburgler left18:28
← epolanski left18:30
← csm3105 left18:31
hannibal_ad_port You can set a branch's upstream to be on that dev remote, then push pull from that. Once you're ready you can rebase/squash your commits and no one needs to know18:34
← Murr left18:36
→ dviola joined18:39
← zan left18:45
← han-solo left18:47
← ferdna left18:47
→ zan joined18:47
← FH_thecat left18:48
bigdaddykane → polo18:51
→ Murr joined18:52
→ coot joined18:55
→ tdodrlt^ joined18:57
← riposte left18:59
→ riposte joined18:59
→ subopt joined19:00
→ hello-smile6 joined19:02
→ sh0ne joined19:10
← steam left19:16
→ tsraoien joined19:17
→ steam joined19:17
→ john_johnk joined19:22
← rgrinberg left19:22
← junktext_ left19:23
← pflanze left19:23
→ junktext_ joined19:24
→ Linkandzelda joined19:28
→ pflanze joined19:37
→ Sulky joined19:44
← APic left19:52
← foul_owl left19:55
→ rgrinberg joined19:57
← momomo left19:58
← fling left20:00
← kevr left20:00
← hello-smile6 left20:00
→ vdamewood joined20:01
→ kevr joined20:01
→ fling joined20:03
→ APic joined20:05
→ Xenguy joined20:11
← fling left20:15
→ fling joined20:16
← fling left20:17
→ fling joined20:17
← ghost43 left20:22
→ ghost43_ joined20:22
← adanwan left20:22
← bindu left20:22
→ bindu joined20:22
→ adanwan joined20:23
← coot left20:25
→ acki_ joined20:28
← bindu left20:28
← rgrinberg left20:29
acki_ Is there a standard way to do a version bump in your software?20:29
→ bindu joined20:29
ikke Other than git tag -a <version>?20:29
← FinnElija left20:30
acki_ when I would a version bump, I would tag the commit right before the bump20:30
so then all commits and merge request which I integrate will have already the new version number20:30
← bindu left20:30
ikke The tag should point to the commit that you actually release20:30
acki_ and when I want to release this version, I would do a bump again and tag the version before20:31
is this the standard approach?20:31
ikke no20:31
acki_ what is the standard approach?20:31
ikke Do any preparations you need ot do20:31
to do*20:31
when you are ready to release, tag that commit20:32
When others checkout that tag, they get exactly the commit that has been release20:32
→ FinnElija joined20:32
ikke released*20:32
acki_ yeah, that is the same like in my approach20:32
another| doesn't sound like it20:33
ikke acki_: you seem to make changes afterwards, or at least, I got that idea from your description20:33
acki_ I think what you are descriping is the apporoach where you do a version bump in your code and tag this commit accordingly20:33
→ bindu joined20:33
acki_ there is always a hard coded version number in the software itself20:34
ikke I try to avoid having the version hardcoded in the source20:34
acki_ ahh you do not work with hard coded version number?20:34
ikke no20:34
acki_ so this is not standard anymore?20:34
→ tirnanog joined20:34
ikke If I need the version in my software, I make it part of the build process to bake it in20:34
acki_ and its get the version number from git?20:35
ikke Either that, or passed in by the build system20:36
The problem with having the version hardcoded in the source is that each commit with that version in the source could be considered that version20:36
so it's ambiguous what commit actually corresponds to a specific version20:37
← jinsl left20:38
→ gunner joined20:38
acki_ but git tags can be removed?20:38
and when the build number is set from outside, you can set anything you want20:38
I mean the version20:38
← srinidhi left20:38
→ jinsl joined20:38
← jinsl left20:40
another| ikke: I don't consider this a huge problem. You can bake the version from `git describe` and use the hardcoded as fallback for tarballs20:40
← Murr left20:40
→ Murr joined20:41
ikke another|: note that when you execute git describe, it might not be the repository you expect (mainly when building from tarballs)20:41
another| which is why you need a fallback for tarballs20:42
ikke yes, but how do you detect you need to fallback?20:42
another| meson20:42
→ SnoopJ joined20:42
ikke How does meson detect it needs to fallback?20:42
another| vcs_tag20:42
if it's not a git repo20:42
ikke What if the tarball is extracted in a directory of another repo?20:43
SnoopJ Is there any good way to run `git diff-index` and get a patch that excludes a given file, or am I stuck processing the resulting patch to remove that file's diff if it's present?20:43
another| sounds like a lot of ifs20:44
ikke another|: many distros work like that when packaging projects20:44
So it happens once in a while that some software reports an incorrect versions because of assumptions20:45
another| man git-diff-index20:45
gitinfo the git-diff-index manpage is available at https://gitirc.eu/git-diff-index.html20:45
another| search for exclude20:45
ikke man gitglossary20:45
gitinfo the gitglossary manpage is available at https://gitirc.eu/gitglossary.html20:45
ikke pathspec20:45
another| Oh, no. Sorry, I misread20:46
SnoopJ another|, I did that and see only --diff-filter and --relative, neither of which appears to be what I'm looking for20:46
ikke another|: in anycase, I should be able to get the released version (assuming github), if I download https20:46
https://github.com/namespace/project/archive/<version>.tar.gz20:47
or https://github.com/namespace/project/archive/refs/tra<version>.tar.gz20:47
another| true, that isn't catched20:47
ikke or https://github.com/namespace/project/archive/refs/tags/<version>.tar.gz20:47
SnoopJ context: I am thinking of submitting a patch to a project that calls diff-index to save the resulting patch, does a checkout, runs some checks, then re-applies the saved patch. I'm looking to allow the unstaged changes in exactly one file between the "checkout" and "run" parts of that.20:48
maybe I'm looking at the problem backwards and I should build a list of paths before calling diff-index (excluding that one file)20:49
acki_ is there a page descripting the industry standard of versioning?20:49
ikke acki_: You know the problem of standards?20:49
SnoopJ which one? :P20:49
ikke SnoopJ: exactly :D20:50
There is no single standard20:50
← gunner left20:50
→ jinsl joined20:51
SnoopJ I think if I run `git diff-index ... --name-only` first, I can use the resulting list of paths to do what I am after. Possibly my initial question was the wrong one anyway, excluding the file won't protect it from the subsequent checkout (thinking out loud, sorry)20:53
→ gunner joined20:53
→ lionkor joined20:54
→ wallabra joined20:55
wallabra How can I sync a repository across multiple providers (GitHub and Codeberg) without having to do endless merges?20:58
another| multiple remotes?21:00
← tdodrlt^ left21:03
wallabra yeah21:03
I could also use multi-URL remotes, but what if someone contributes a change on one of the remotes?21:04
← nickel715 left21:05
ikke If both remotes receive changes, there is not a lot you can do except merging21:07
← adanwan left21:10
← john_johnk left21:10
→ adanwan joined21:10
← adanwan left21:13
→ adanwan joined21:14
→ tdodrlt^ joined21:15
→ mven joined21:18
→ arescorpio joined21:19
← EvilDMP left21:21
→ EvilDMP joined21:22
→ foul_owl joined21:26
← mgubyt left21:29
← gunner left21:31
← arescorpio left21:39
← oprypin left21:42
→ oprypin joined21:42
← tdodrlt^ left21:42
← kenanmarasli left21:45
← n0rw4l1 left21:54
→ n0rw4l1 joined21:55
← acebrianjuan left21:56
→ dodobrain joined21:58
→ hello-smile6 joined21:59
→ aidalgol_ joined22:00
← aidalgol left22:01
← mfiano left22:04
hello-smile6 → hello-smile22:05
hello-smile → _9pfs22:05
→ tdodrlt^ joined22:06
→ rgrinberg joined22:07
→ smallville7123_ joined22:12
← smallville7123 left22:15
→ mfiano joined22:15
→ nate4 joined22:16
→ YuGiOhJCJ joined22:20
← nate4 left22:22
← mon_aaraj left22:32
→ mon_aaraj joined22:34
→ Betal joined22:38
← dionysus69 left22:39
← The_Blode left22:45
→ zeenk joined22:47
← YoungFrog left22:49
→ YoungFrog joined22:51
← acki_ left22:51
← feriman left22:55
→ mgubyt joined22:56
← YoungFrog left22:57
→ aidalgol joined22:58
← aidalgol_ left22:58
→ YoungFrog joined22:59
← pflanze left22:59
→ pflanze joined22:59
← aidalgol left23:02
← YoungFrog left23:06
← zeenk left23:07
→ Murr- joined23:08
← Murr left23:09
Murr- → Murr23:09
→ YoungFrog joined23:09
← YoungFrog left23:14
→ YoungFrog joined23:15
← adanwan left23:16
→ adanwan joined23:16
→ aidalgol joined23:29
← toluene left23:36
← Lord_of_Life left23:39
→ Lord_of_Life_ joined23:39
→ toluene joined23:40
Lord_of_Life_ → Lord_of_Life23:40
← dodobrain left23:42
→ dodobrain joined23:43
→ ferdna joined23:44
wallabra → wallabra_23:44
wallabra_ → wallabra23:44
← pretty_dumm_guy left23:52
← tdodrlt^ left23:56
← X-Scale left23:59

Logs Search ←Prev date Next date→ Channels Documentation