IRCloggy #git 2022-04-23

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-04-23

blahboybaz another|: Thanks for the ref00:06
That's sounds like what I want00:06
→ vysn joined00:15
→ rgrinberg joined00:19
→ furrymcg1e joined00:20
→ Techcable joined00:21
← igemnace left00:22
← vicfred left00:23
← furrymcgee left00:23
→ vdamewood joined00:28
← Techcable left00:38
→ hanneso joined00:39
→ Techcable joined00:40
← zebrag left00:41
← Techcable left00:42
→ Techcable joined00:42
← cliluw left00:44
→ laolmtdea^ joined00:45
← littlebobeep left00:55
→ littlebobeep joined00:56
→ roadie joined00:57
→ gooble_gobble_1 joined01:02
← gooble_gobble left01:02
→ exempt joined01:07
← agrosant left01:13
← mannequin left01:18
← rgrinberg left01:23
← roadie left01:24
← analoq left01:25
→ analoq joined01:26
→ mitrokov joined01:27
← blahboybaz left01:31
← BrianBlaze left01:42
→ Xenguy joined01:43
shush Why does reflog show the first 9 characters of the hash?01:47
Is 9 a typical length of a shortened hash?01:48
Is there a reason for 9?01:48
Or `git rev-parse --short HEAD` returns 9 hex length01:50
→ sa0 joined01:52
← duxsco left01:52
nedbat shush: git adjust the length based on how many commits are in the repo01:53
*adjusts01:53
→ oxcart11 joined01:53
← oxcart11 left01:55
→ BrianBlaze joined01:57
→ funhouse joined02:06
← Null_A_ left02:06
← led_belly left02:07
→ kaiseisei joined02:09
← nyah left02:11
→ blaklistd joined02:17
→ igemnace joined02:18
→ Vonter joined02:21
thiago it's a way to reduce the chance of collision02:24
← JanC left02:25
→ JanC joined02:25
← sa0 left02:26
← thebombzen left02:28
← pulse left02:32
← Xenguy left02:34
→ Xenguy joined02:37
← ibrahim_ left02:38
→ hoochmonger joined02:43
← vdamewood left02:46
→ skapata joined02:47
← skapata left02:47
→ skapata joined02:47
→ vinleod joined02:47
← kaiseisei left02:47
vinleod → vdamewood02:50
← littlebobeep left03:05
← vdamewood left03:07
→ tyson2 joined03:08
→ littlebobeep joined03:11
← reset left03:13
← littlebobeep left03:19
→ anaveragehuman joined03:20
← gast0n left03:24
← exempt left03:27
→ littlebobeep joined03:29
← Xaldafax left03:35
→ _9pfs joined03:39
← noord left03:41
→ jazzy2 joined03:45
← kryptokazz left03:47
← jazzy left03:48
→ bob518 joined03:52
bob518 Can I ask questions about Github here?03:54
← gooble_gobble_1 left03:55
← lemonsnicks left03:57
→ vdamewood joined03:58
→ lemonsnicks joined03:58
← _9pfs left04:08
→ _9pfs joined04:09
← _9pfs left04:11
→ bytehackr joined04:11
→ nate1 joined04:16
→ sa0 joined04:24
→ Sven_vB joined04:27
Sven_vB hi :)04:27
if two repos have identical directory structure and file contents in unignored files, and both commit all of them, are the commits guaranteed to have the same tree hash?04:28
vdamewood Sven_vB They are almost guaranteed not to have the same hash.04:29
Sven_vB filemodes also the same. do file dates matter?04:29
vdamewood For one, the name and email address of the committer would come into play. The time and date of the commit itself would also matter.04:29
Sven_vB vdamewood, I know the commit hash may differ. I'm asking about the tree hash.04:30
→ _9pfs joined04:30
vdamewood Oh, the tree hash. Yeah, that should match. I don't think file times matter.04:30
Sven_vB how could I go about finding a strong guarantee that the tree hashes must be the same?04:32
vdamewood Wish I could help, but real life is pulling at me.04:32
→ xuxx joined04:32
← vdamewood left04:32
Sven_vB no prob :) thanks for the initial validation.04:32
← bket left04:35
→ han-solo joined04:36
← tyson2 left04:40
→ hbautista__ joined04:41
→ bket joined04:41
← funhouse left04:42
← hbautista_ left04:44
← _9pfs left04:44
← bket left04:47
← sa0 left04:57
→ bket joined04:59
bob518 If anybody has an answer let me know if irrevalent to this channel ignore it. Why my commit to one of my public GitHub repo doesn't show up in my GitHub contribution overview?05:04
→ madewokherd` joined05:06
← madewokherd left05:08
→ dionysus69 joined05:17
SirRippovMaple34 → SirRippovMaple05:27
← SirRippovMaple left05:28
→ SirRippovMaple joined05:29
← inversed left05:29
← ChmEarl left05:30
← skapata left05:34
→ coot joined05:36
← thiago left05:39
← sudoforge left05:40
← anaveragehuman left05:41
Sven_vB bob518, what's the link to the commit?05:44
← infogulch left05:45
→ infogulch joined05:47
← bloody left05:48
bob518 Sven_vB why?05:55
Sven_vB to check if I can see it in your contributions overview. after all, it might be a caching issue or one of database sharding.05:55
→ wonko-the-sane joined05:57
← littlebobeep left05:57
Sven_vB also I wouldn't be surprised if the overview just lags behind a few hours.05:58
bob518 pretty sure it's not. New public repo shows up05:58
← nate1 left06:04
→ inversed joined06:09
← Thanatermesis left06:09
→ jazzy joined06:11
Sven_vB how can we help you debug the problem?06:12
← jazzy2 left06:13
← great_taste left06:18
onizu Hi. I was working on a public repository (someone open source project) and while trying to push a change in a file, git gave me an error that I don't have the permission to push to that repository and gave an option to create a fork instead (in my github account) and push the change there. I accidently hit ok on that option and it created a fork on my account and pushed the change there. Is there a way to revert that?06:20
→ littlebobeep joined06:20
onizu I deleted the forked repo from my github. But the file shows no change now in my local copy as if it is already pushed. How can I revert that in the local copy? How can I remove any trace of that fork that got created, from the local copy's git ?06:21
Sven_vB onizu, does "git status" say the repo is clean?06:23
onizu, if yes, try git checkout HEAD~1 -- filename06:23
onizu it says: Your branch is up to date with 'origin/v0.7.0'.06:24
a lot of modified files too06:25
Sven_vB you can force a local undo with "git reset --hard HEAD~1". it will likely erase uncommited changes, so make sure to only do that on a "clean" repo.06:25
← littlebobeep left06:25
onizu ok.06:25
Sven_vB when you have modified files, make a new branch and commit them first.06:26
that way you can go back if the hard reset causes an accident.06:26
→ littlebobeep joined06:26
onizu I did git checkout HEAD~1 -- filename and it staged the file back again06:26
Sven_vB does file now have the content you expect?06:26
onizu yeah the contents were the changed ones06:27
I just wanted to get it back as a modified file instead of already committed one06:27
Sven_vB if the file is the only thing modified, and has the content you want, then the hard reset will likely do what you want.06:27
onizu no, there's a lot of other things showing up in git status as modified06:27
→ tealtabbycat joined06:27
Sven_vB oh I see. in that case, a soft reset might be better06:28
ok if the other stuff is modified, it's harder to fix06:28
onizu but, these modified files (showing up in git status) are not what are shown as modified files in the Source Control in vscode06:28
← xkuru left06:28
Sven_vB in such cases, I make a temporary branch where I commit all, so I have a backup. then I look at the railroad diagram in gitg and try to pick the parts that I like.06:29
onizu ok06:29
Sven_vB I'd rather trust git in my command line, than trusting vscode.06:29
onizu It's the first time I'm trying to contribute to an open public repo, and didn't know that the push rights are not given by default .. :/06:29
what's the procedure here? pull request?06:30
Sven_vB yeah, git is usually done in a pull manner06:30
→ daru joined06:30
Sven_vB you make your own repo, make a new branch with the changes, and then request the maintainer to merge your branch into their upstream repo.06:30
you'll need to share your branch with the maintainer obviously. usually we do that by publishing our branch publicly.06:31
→ EvilDMP joined06:31
onizu request the entire branch to be merged? I just want a file to be merged06:31
Sven_vB the size of the change is irrelevant to the process06:31
onizu ok06:31
so create a new blank repo and push the changed file there?06:32
Sven_vB you cannot push files. you can only push commits.06:33
onizu but the local repo is connected to the official online git repo06:33
Sven_vB usually we clone the upstream repo and publish it. in GitHub, the combination of both those tasks is called "fork".06:33
onizu how it allow me to push just one commit to a different repo?06:33
what's an upstream repo?06:34
Sven_vB then we make a new branch in our "forked" repo. checkout that branch. do our changes. commit them. push the branch so it will be published. then request a pull.06:34
onizu I see06:34
Sven_vB upstream is the repo of the maintainer whom you want to merge your changes.06:34
onizu and if you want to at some point also update your forked repo with the main public repo (from which it was forked), how do you do that?06:35
Sven_vB in an ideal scenario, you just run "git pull"06:35
onizu but wouldn't that try to pull from the forked repo?06:36
Sven_vB also you should set your local merge policy to "fast-forward only" to be warned early if you tend to become incompatible06:36
onizu k06:36
Sven_vB it pulls from the default repo. you're right, that might be your own one06:37
in that case you add the upstream repo as an additional remote06:37
onizu i see06:37
Sven_vB e.g. git remote add upstream https://github.com/ytdl-org/youtube-dl.git06:37
then git pull upstream master06:37
in case you had local changes, it's better to just fetch the upstream master, and then compare in gitg06:38
if there's a straight path from your current commit to upstream master, git merge upstream/master06:38
← tealtabbycat left06:39
onizu straight path?06:39
Sven_vB gitg shows railroad diagrams06:39
onizu that is if the changed file on upstream is not changed at my local end too?06:39
gitg = git graph?06:40
Sven_vB no idea how the name "gitg" was derived06:40
it's a program separate from git06:40
your "changed file" question doesn't make sense to me. maybe the question solves itself once you try gitg.06:41
onizu i was trying to tell what I understood from "straight path"06:42
maybe I got it wrong06:42
Sven_vB yeah I think once you see the railroad diagrams, it will be obvious06:42
it shows all the commits as a circle and they're connected by lines06:43
← bob518 left06:44
onizu so is everyone contributing to the upstream repo doing it this way? Or are they able to commit directly to the upstream repo?06:44
Sven_vB you can grant other people permission to write to your repo directly. like how it was done in the old days with SVN. and keeping this old style also means keeping all the problems that SVN had.06:45
the new pull style is much easier for collaboration.06:45
the best benefit is, people's decisions are de-coupled in time. you can amend your branch without disturbing anyone.06:46
also people can try your branch even before the maintainer has decided about it06:47
← wonko-the-sane left06:49
→ wonko-the-sane joined06:49
Sven_vB do you have a special reason why you'd prefer to commit to someone else's repo?06:51
there's also a style of collaboration where you share a repo but have branch protection, so you can only add branches and change your branches that you created yourself.06:54
→ rsx joined06:54
Sven_vB then you do pull requests internal in that repo to merge your branch into master06:54
→ raindrop joined06:54
→ sa0 joined06:55
onizu I was talking to repo's maintainer and decided to contribute to a section06:55
Sven_vB in case of shared repo you usually need strong leadership to have the repo not be littered with lots of crappy branches06:56
onizu, the free software spirit is that you fix it and share your fix with the world, independent of the upstream. if upstream likes your fix, they can merge it some day.06:56
onizu ok06:57
Sven_vB the nice thing about having a collaboration platform with lots of forked repos is that it takes minimal space, because all the shared parts can be de-duped.06:59
so go ahead and have hundreds of forked repos in your account, you won't be a burden to the platform.06:59
some people frown at others when they "abuse the fork button for bookmarking" but I do and I don't see a problem with that.07:01
("I do" = … use the fork button to bookmark interesting projects)07:02
onizu i see07:06
when we fork a project, should we keep the name the same as the original?07:06
does it make it confusing for the users?07:06
(like, which one is the real one / official)07:06
I had deleted the forked repo from my account on github (online). How do I find out if there are any connections to it in the local copy?07:09
Sven_vB your fork, your name policy.07:09
← bytehackr left07:26
← sa0 left07:27
Sven_vB what kinds of connections? the usual kind would be a remote. those you can list with: git remote --verbose07:29
→ feriman joined07:29
→ tealtabbycat joined07:30
→ sa0 joined07:32
← sa0 left07:33
→ carl--- joined07:33
→ sa0 joined07:33
onizu ok07:37
Sven_vB: why did you say we must create a new branch in the forked repo before we commit?07:37
why not commit to the existing default branch?07:38
← carl--- left07:40
← The_Blode left07:43
← hbautista__ left07:44
← Murr left07:44
→ Murr joined07:45
← tealtabbycat left07:45
→ ChmEarl joined07:45
← coot left07:47
→ palasso joined07:48
← Visne left07:51
→ Visne joined07:52
← mw_ left07:58
→ arch_angel joined08:02
arch_angel → arch-angel08:02
→ tealtabbycat joined08:05
→ robigan joined08:05
→ kaiseisei joined08:07
← robigan left08:07
→ iomari891 joined08:08
j416 it's useful to have a branch named after the thing you're implementing; Git won't mind, but it tends to be more readable08:08
← tealtabbycat left08:12
← elastic_dog left08:12
← rsx left08:13
Sven_vB onizu, the upstream repo might decide to merge other stuff before they merge your branch. in that case it is useful to always keep your local master the same as the upstream master. this allows for easy comparison in gitg.08:14
onizu ok08:15
Sven_vB onizu, you will likely have to rebase your branch on the upstream. that's also easier if you have a local branch that mirrors the upstream.08:15
I'll be afk, good luck!08:16
→ tealtabbycat joined08:17
→ The_Blode joined08:22
→ YuGiOhJCJ joined08:24
→ zer0bitz joined08:27
← tealtabbycat left08:28
→ tealtabbycat joined08:29
→ cdown joined08:29
→ coot joined08:29
← tealtabbycat left08:30
→ tealtabbycat joined08:31
← cdown left08:35
← tealtabbycat left08:35
→ tealtabbycat joined08:36
→ stats464_ joined08:36
← stats4647 left08:39
← tealtabbycat left08:43
→ tealtabbycat joined08:44
← tealtabbycat left08:46
→ tealtabbycat joined08:46
→ jusski joined08:48
← laolmtdea^ left08:57
→ The_Blode_ joined08:57
← wonko-the-sane left08:58
← The_Blode left08:59
← fling left09:03
→ fling joined09:05
spaceone when I git checkout -b foo origin/bar (without --no-track) it sets upstream to origin/bar - how can i adjust it to follow origin/foo without specifiying the branch name twice?09:06
← bdeferme2 left09:07
cbreak spaceone: you can run git branch --set-upstream-to09:07
spaceone yes, but this requires a second call09:08
cbreak indeed09:08
→ bdeferme2 joined09:09
spaceone so is it possible in one step?09:09
← Gustavo6046 left09:10
ikke spaceone: git checkout -t origin/bar09:14
→ ISK0 joined09:17
← raindrop left09:20
→ vdamewood joined09:20
→ vinleod joined09:26
← vdamewood left09:30
→ cyphrCat joined09:30
cyphrCat Does git clone offer crash recovery? I’m sure it would re-fetch missing files, but what about partial files, like a 100+ mb file?09:32
ikke no09:32
cyphrCat: the git transport does not deal with individual files09:32
it uses a packfile where objects are delta compressed09:33
that pack-file is generated on the fly09:33
cyphrCat ok, thanks. The situation is that there is a Github repo w/many blobs (big zip files), which is not even really suitable for git, but it’s someone else’s beast.09:35
I guess I should just "wget -c" for each file i need09:36
cbreak cyphrCat: you'll only have to clone once09:36
after that, git will make incremental updates09:36
cyphrCat right, but i'm on a measured rate uplink (each file costs 1€ in effect)09:37
i guess one option is to go to an Internet cafe and clone the whole thing09:38
← Masklin left09:41
← Murr left09:44
→ Murr joined09:44
cyphrCat so w.r.t big blobs, would a git “packfile” be as large as the whole blob? And would it be an indivisible atomic unit?09:45
i suppose it could be even worse.. the packfile would contain every version of a blob where the incremental diffs are each as big as the whole file09:48
→ enkeyz joined09:49
→ skapata joined09:50
← skapata left09:50
→ skapata joined09:50
← iomari891 left09:52
→ gurkenglas joined09:53
ikke cyphrCat: doesn't help a lot with github, but git does support creating bundlefiles that you can wget09:53
(out-of-band)09:53
but git is not a file sync protocol09:53
cbreak cyphrCat: git clone will give you everything in history09:54
otherwise you couldn't check out the past09:54
if you don't want that, consider making a shallow clone09:54
ikke (github suffered greatly in the past due to projects abusing it as a package repository with git clone --depth=1)09:55
← ISK0 left10:01
← fling left10:08
→ zeenk joined10:08
→ fling joined10:08
→ robigan joined10:09
← tealtabbycat left10:14
→ tealtabbycat joined10:14
→ mw_ joined10:15
→ hqdruxn08_ joined10:17
→ iomari891 joined10:18
← gurkenglas left10:18
← kaiseisei left10:20
← YuGiOhJCJ left10:20
← hqdruxn08__ left10:21
← tealtabbycat left10:22
→ elastic_dog joined10:27
→ mannequin joined10:30
← vysn left10:36
onizu I forked a repo and checked it out locally and made some changes, and pushed them via a new branch into my forked repo on github. Now github shows a banner like "username:newbranch :onizu had recent pushes less than a minute ago -- Compare & Pull Request" What will that option do? will it try to send the changes in all the files that I made? If I have to send pull requests for each changed file separately, I must not use this option?10:38
Sven_vB10:38
→ Lord_of_Life_ joined10:38
onizu s/pushes/pushed10:38
→ gurkenglas joined10:39
ikke onizu: a pull request is to merge a branch10:39
← Lord_of_Life left10:39
← enkeyz left10:40
onizu the whole branch?10:40
why would they want to merge my whole branch (which is in my name)10:40
Lord_of_Life_ → Lord_of_Life10:41
ikke because that's how git works, you merge branches, not individual files or commits10:41
← chenqisu1 left10:42
onizu oh10:42
one of the files I changed, I don't want to send/merge just yet10:43
what can I do in this case?10:43
ikke Make sure that's committed to a separate branch for example10:43
onizu oh... so multiple branches for each merge?10:43
ikke one branch per pull request10:44
onizu I see10:44
and then delete that branch once it's merged?10:44
ikke sure10:44
vinleod → vdamewood10:45
← cyphrCat left10:46
→ jazzy2 joined10:46
onizu so now I should call back all the changes from my branch and then create new branches and re-push?10:48
← gurkenglas left10:48
← jazzy left10:49
→ wonko-the-sane joined10:50
← robigan left10:51
← EvilDMP left10:52
→ wakeup joined10:52
→ raindrop joined10:52
→ bytehackr joined10:55
← bytehackr left10:57
→ bytehackr joined10:57
→ duxsco joined11:00
← [twisti] left11:00
← wakeup left11:05
← elastic_dog left11:06
→ wakeup joined11:07
← bytehackr left11:08
← vicecea left11:10
→ vicecea joined11:10
→ jazzy3 joined11:10
← fling left11:11
→ fling joined11:11
← jazzy2 left11:15
→ elastic_dog joined11:17
→ kaiseisei joined11:19
← iomari891 left11:24
→ kix joined11:28
→ vitali64 joined11:33
← vitali64 left11:34
mackerman onizu: Maintain whatever branches you wish in your repo11:34
→ vitali64 joined11:35
mackerman Single purpose fix or feature branches often correspond to one PR, and might be deleted once merged.11:35
← vitali64 left11:35
→ vitali64 joined11:35
mackerman Or you might be maintaining something upstream is not interested in, so you might hang on to a certain branch forever11:35
onizu PR?11:36
mackerman Pull request.11:36
onizu yes11:36
ok11:36
← vitali64 left11:36
→ vitali64 joined11:36
→ iomari891 joined11:38
mackerman Or merge request in GitLab terms.11:39
onizu ok11:42
← jusski left11:43
→ rsx joined11:47
furrymcg1e → furrymcgee11:51
→ FH_thecat joined12:01
→ zebrag joined12:03
← jazzy3 left12:03
← vdamewood left12:05
→ nyah joined12:06
→ m0viefreak joined12:09
→ srinidhi joined12:10
← zeenk left12:14
← fling left12:15
→ fling_ joined12:15
← vitali64 left12:16
→ vitali64 joined12:16
← vitali64 left12:19
← wakeup left12:19
fling_ → fling12:22
→ EvilDMP joined12:25
→ vitali64 joined12:29
← arch-angel left12:30
→ duxco joined12:33
← duxsco left12:33
duxco → duxsco12:33
→ arch_angel joined12:34
← arch_angel left12:35
→ dos_ joined12:35
→ arch_angel joined12:40
arch_angel → arch-angel12:40
→ roadie joined12:45
← user24037 left12:47
→ user24037 joined12:50
← user24037 left12:50
→ user24037 joined12:50
← kaiseisei left12:50
→ kaiseisei joined12:51
→ ibrahim_ joined12:52
← vitali64 left12:53
→ GavinHsueh joined12:53
← dos_ left13:01
→ tyson2 joined13:01
→ xkuru joined13:07
→ pretty_dumm_guy joined13:10
→ dos_ joined13:12
← EvilDMP left13:18
→ gavinhsueh_ joined13:22
← gavinhsueh_ left13:22
← rsx left13:22
onizu my PR got merged and github automatically gave the option to "Delete Branch"13:24
ikke yes13:25
→ mintroot joined13:28
← GavinHsueh left13:29
→ GavinHsueh joined13:29
← mintroot left13:29
→ mintroot joined13:33
← dos_ left13:34
← mintroot left13:35
→ mintroot joined13:36
← mintroot left13:36
← GavinHsueh left13:36
→ GavinHsueh joined13:36
→ reset joined13:46
← mitrokov left13:48
GavinHsueh → mintroot13:48
mintroot → mintro13:48
mintro → GavinHsueh13:50
→ mintroot joined13:52
← GavinHsueh left13:53
→ bytehackr joined13:53
mintroot → GavinHsueh13:53
← GavinHsueh left13:54
→ GavinHsueh joined13:55
← bytehackr left13:55
→ duxco joined13:55
→ bytehackr joined13:55
← duxsco left13:56
duxco → duxsco13:56
← bytehackr left13:57
→ bytehackr joined13:58
← coot left14:01
← kix left14:02
← duxsco left14:03
→ duxsco joined14:03
← GavinHsueh left14:04
→ kix joined14:04
← kix left14:04
→ GavinHsueh joined14:04
← dag left14:06
← GavinHsueh left14:06
→ GavinHsueh joined14:06
← GavinHsueh left14:07
→ GavinHsueh joined14:08
→ jusski joined14:10
→ great_taste joined14:10
furrymcgee https://lwn.net/Articles/889760/14:12
ikke subscription required14:12
furrymcgee do subscribe please14:13
← han-solo left14:13
← GavinHsueh left14:14
→ humanface joined14:14
← srinidhi left14:14
furrymcgee Alternatively, this item will become freely available on May 5, 202214:14
← iomari891 left14:15
→ iomari891 joined14:19
← gildasio left14:21
← duxsco left14:21
→ duxsco joined14:22
→ gildasio joined14:24
← user24037 left14:24
← dionysus69 left14:31
→ duxco joined14:33
← duxsco left14:33
duxco → duxsco14:33
→ EvilDMP joined14:35
→ madewokherd joined14:36
→ thiago joined14:36
→ han-solo joined14:37
← duxsco left14:38
→ sudoforge joined14:38
→ gast0n joined14:38
→ user24037 joined14:38
← user24037 left14:38
→ user24037 joined14:38
← SuperLag left14:39
← madewokherd` left14:39
→ wakeup joined14:42
← wakeup left14:44
→ csm3105 joined14:45
→ kenanmarasli joined14:45
← csm3105 left14:45
→ SuperLag joined14:45
→ daru_ joined14:47
→ john_johnk joined14:50
← The_Blode_ left14:50
← kaiseisei left14:52
→ The_Blode joined14:52
← xkuru left14:52
→ nate1 joined14:55
← junktext left14:57
→ junktext joined14:58
← palasso left14:59
→ coaxing joined15:00
← john_johnk left15:01
Sven_vB onizu, is your earlier question solved sufficiently?15:03
onizu Sven_vB: yes, I think I have got an idea of how the process works, thanks!15:05
→ robigan joined15:07
onizu now after deleting that branch from github15:14
→ thebombzen joined15:14
onizu I switched to another existing branch locally and did "git fetch upstream"15:14
← jinsun left15:14
onizu but the code does not seem to be updated with the upstream15:15
what's wrong?15:15
← nate1 left15:16
→ jinsun joined15:19
→ gooble_gobble_1 joined15:19
→ sandipan joined15:20
← bytehackr left15:21
→ saroy|afk joined15:21
← fling left15:23
→ fling joined15:23
→ duxsco joined15:23
← sandipan left15:26
→ palasso joined15:26
← palasso left15:28
→ hbautista__ joined15:32
→ perrierjouet joined15:32
← Epithium left15:41
← Murr left15:44
gooble_gobble_1 hey folks, is it possible to count the number of merge commits that were made directly to my branch and not merge in as part of a merge?15:44
→ Murr joined15:44
← hbautista__ left15:45
gooble_gobble_1 i think it would be --min-parents=2 --max-parents=215:46
onizu I had to do: git rebase upstream/branch15:51
→ carl--- joined15:57
→ Linkandzelda joined15:58
→ bloody joined15:58
← tyson2 left16:02
→ enkeyz joined16:02
← arch-angel left16:03
← KnoP left16:03
→ wootehfoot joined16:05
→ vicfred joined16:09
← vicfred left16:09
← coaxing left16:11
→ coaxing joined16:13
← roadie left16:14
← Jong left16:16
→ vysn joined16:19
← carl--- left16:20
→ vitali64 joined16:21
← thebombzen left16:22
→ roadie joined16:23
→ thebombzen joined16:23
← thebombzen left16:23
→ thebombzen joined16:24
← FinnElija left16:24
← n-st left16:25
→ FinnElija joined16:25
← Sven_vB left16:25
→ Sven_vB joined16:25
→ n-st joined16:26
→ brw0 joined16:26
← brw left16:26
brw0 → brw16:26
← roboirc left16:26
← fling left16:28
→ fling joined16:29
← vysn left16:29
→ Willtech joined16:29
← roadie left16:34
← peirik left16:39
→ roadie joined16:43
← roadie left16:49
→ gurkenglas joined16:54
→ henko joined16:54
→ robo- joined16:55
← robo- left16:56
→ robo- joined16:56
→ DibbTubberOne joined16:57
→ Thanatermesis joined16:58
→ hbautista__ joined17:02
→ roadie joined17:02
← iomari891 left17:04
→ kix joined17:04
← kix left17:04
→ iomari891 joined17:05
← iomari891 left17:05
→ iomari891 joined17:06
→ tulpa_ joined17:07
← roadie left17:10
← thiago left17:14
Sven_vB onizu, yes, a fetch only downloads the updates, it does not merge them. I'd usually prefer a fast-forward merge over a rebase, if that is possible. I recommend to configure git to always use "fast-forward" merge and flinch from other kinds of merges.17:14
← daru_ left17:15
onizu Sven_vB: what's the command for a fast-forward merge?17:15
ikke Sven_vB: usually the way you make fast-forward merges possible is by rebasing17:15
git merge --ff-only17:15
onizu and does that do what rebase does?17:15
ikke no17:15
onizu ok17:15
ikke you can only do a fast-forward merge if the branch is a direct descendent17:16
which is what you achieve by rebasing17:16
https://github.com/Osse/git-stuff/blob/master/merge-vs-rebase.txt17:16
← vitali64 left17:16
← hbautista__ left17:17
ikke In the "initial state" a fast-forward merge is not possible17:17
→ hbautista__ joined17:18
onizu very nice diagrammatic explanation17:19
more appealing since it's all using text17:20
Sven_vB ikke, if a fast-forward merge is possible, I don't need a rebase. if it is not possible, I want to know, because then I tend to investigate in gitg first.17:23
ikke, but yeah, in lucky cases, a rebase is my next step.17:23
ikke sure, but it's not an either/or17:23
→ roadie joined17:23
→ vitali64 joined17:23
ikke they are not mutually exclusive17:24
Sven_vB indeed, the rebase may be a ff merge17:24
ikke no17:24
if you rebase ontop of master, master is not affected17:24
but after you rebase on master17:24
you _can_ do a fast-forward merge17:25
and the fast-forward merge is what's updating master17:25
Sven_vB I meant a scenario where a ff merge is possible but for some reason I request a rebase instead. in that case, the rebase should consist of just ff merge,.17:25
→ srinidhi joined17:26
ikke in that case, it's a no-op17:26
→ tealtabbycat joined17:26
Sven_vB no-op is only if the branches are identical before17:26
imMute it'll do a no-op if FF is possible too17:27
ikke Look at this example: https://github.com/Osse/git-stuff/blob/master/merge-vs-rebase.txt#L1317:27
imMute it's not a real "noop" but it's close enough17:27
ikke You can fast-forward merge feature into master17:28
a rebase from feature on top of master would be a noop17:28
Sven_vB in case my local copy is behind master, the minimal required operation would be to update my local copy's HEAD, i.e. 1 write operation more than a no-op17:28
← roadie left17:28
onizu what's a noop?17:29
Sven_vB no-op = no operation17:29
onizu ok17:29
imMute operation in git rebase meaning "make a commit object"17:29
moving branch pointers around can happen if a rebase todo is "noop"17:29
Sven_vB no-op is originally a CPU command that (hopefully) does not have any meaningful effect; it's basically the idle mode of a CPU17:29
imMute so it's doing *something* but it's not making new commits, thus it counts as a noop17:30
Sven_vB I see. I didn't know git has it's own definition of no-op.17:30
imMute even in a CPU, a noop instruction doesn't do literally *nothing*17:31
Sven_vB yeah, it still consumes energy17:31
and increases the instruction pointer17:31
imMute (and a wait-for-interrupt operation would be more of an "idle" state)17:31
← fling left17:32
→ Epithium joined17:32
Sven_vB oh right. the CPUs I learned didn't have interrupts. :D17:32
imMute O.o what CPU did you learn on that didn't have interrupts?17:32
← hbautista__ left17:33
→ fling joined17:33
← Willtech left17:34
← wootehfoot left17:36
← great_taste left17:36
→ Willtech_ joined17:36
Sven_vB a very basic one. the course was an introduction to hardware design.17:37
we started with an instruction counter, some very basic flow control, and then had to implement our own math unit17:38
← sudoforge left17:39
Willtech_ → Willtech17:41
→ rgrinberg joined17:41
← kenanmarasli left17:44
← iomari891 left17:45
← littlebobeep left17:45
→ cdown joined17:46
→ iomari891 joined17:46
→ great_taste joined17:49
← Epithium left17:51
← iomari891 left17:51
→ Epithium joined17:52
→ tyson2 joined17:52
← Epithium left17:57
→ littlebobeep joined17:58
→ Epithium joined18:00
← Epithium left18:03
→ Epithium joined18:03
→ roadie joined18:06
← gxt left18:12
→ gxt joined18:13
← roadie left18:15
← keypusher left18:23
→ keypusher joined18:24
← DibbTubberOne left18:25
← tyson2 left18:26
→ coot joined18:26
→ tyson2 joined18:29
← fflam left18:36
← geosmileus left18:37
→ fflam joined18:38
← jusski left18:46
← phryk left18:52
→ hbautista__ joined18:53
→ Rashad joined18:55
→ nyah_ joined18:56
→ nate1 joined18:57
← nyah left18:57
← littlebobeep left18:58
← saroy|afk left19:01
← hbautista__ left19:06
→ dionysus69 joined19:07
→ geosmile joined19:10
← han-solo left19:14
← tyson2 left19:20
← EvilDMP left19:23
→ EvilDMP joined19:24
→ daru_ joined19:24
→ tyson2 joined19:26
← Rashad left19:26
← EvilDMP left19:29
→ EvilDMP joined19:31
← daru left19:32
← EvilDMP left19:32
← fling left19:35
← tulpa_ left19:37
→ Celelibi joined19:37
→ fling joined19:38
→ zeenk joined19:40
← vitali64 left19:47
→ jazzy joined19:49
← shokohsc left19:59
→ Jong joined20:00
→ duxco joined20:00
→ shokohsc joined20:00
→ doppo joined20:02
← duxsco left20:02
duxco → duxsco20:02
← vancz left20:05
→ vancz joined20:06
← tyson2 left20:07
← nate1 left20:10
→ AbleBacon joined20:16
→ phryk_ joined20:17
← robigan left20:18
phryk_ → phryk20:22
← thebombzen left20:31
← srinidhi left20:31
→ thebombzen joined20:32
← thebombzen left20:32
→ thebombzen joined20:33
← tealtabbycat left20:35
→ sudoforge joined20:36
← raindrop left20:37
→ clime joined20:39
← fling left20:39
← rgrinberg left20:41
→ fling joined20:41
← zeenk left20:41
← phryk left20:41
→ raindrop joined20:46
→ phryk joined20:47
daru_ → daru20:47
← fling left20:53
→ fling joined20:53
→ goldfish joined20:54
← feriman left20:58
→ distantsail joined20:59
→ EvilDMP joined21:00
← phryk left21:03
→ tealtabbycat joined21:09
→ phryk joined21:13
← thebombzen left21:13
← dionysus69 left21:13
→ thebombzen joined21:15
→ Gustavo6046 joined21:22
← sudoforge left21:25
← zer0bitz left21:38
← Sven_vB left21:41
→ Sven_vB joined21:41
← R2robot left21:42
← fling left21:44
← Murr left21:44
→ Murr joined21:44
← raindrop left21:44
← coot left21:44
→ fling joined21:45
→ zeenk joined21:46
→ R2robot joined21:48
→ tyson2 joined21:55
← Sven_vB left22:00
→ Sven_vB joined22:00
→ nate1 joined22:03
← omero left22:06
← elastic_dog left22:06
→ littlebobeep joined22:08
→ elastic_dog joined22:08
← zeenk left22:11
← EvilDMP left22:15
→ EvilDMP joined22:16
← FinnElija left22:21
→ forgotmynick joined22:22
← tealtabbycat left22:27
← piwu left22:27
→ piwu joined22:28
→ sudoforge joined22:28
→ duxco joined22:28
← duxsco left22:28
duxco → duxsco22:28
← duxsco left22:32
→ duxsco joined22:32
← piwu left22:32
→ Cache_Money joined22:35
← enkeyz left22:37
← nate1 left22:43
→ piwu joined22:50
→ Yruama joined22:50
→ nate1 joined22:53
→ wakeup joined22:54
→ FinnElija joined22:56
← wakeup left22:59
→ hbautista__ joined23:01
→ Xenguy_ joined23:07
← sa0 left23:10
→ Xenguy__ joined23:10
← Xenguy left23:10
← Xenguy_ left23:13
← williewillus left23:13
→ williewillus0 joined23:14
williewillus0 → williewillus23:15
Xenguy__ → Xenguy23:15
→ whatsupdoc joined23:19
→ xkuru joined23:25
→ nehsou^ joined23:36
→ humanBird joined23:37
→ rgrinberg joined23:41
← Willtech left23:46
→ Willtech joined23:47
← goldfish left23:49
← fling left23:52
→ tealtabbycat joined23:53
→ fling joined23:53

Logs Search ←Prev date Next date→ Channels Documentation