Use git porcelain for git commands where applicable #49
Conversation
git symbolic-ref --quiet --short will print the short branch name without color codes. It will return exit code 1 in the case of being in a detached HEAD state.
Git 1.6.6.1 and later support this notation for finding the upstream branch. This is useful because one might not be tracking origin/branchname.
git rev-list --left-right --count @{upstream}...HEAD outputs:
X Y
where X is the number of commits the left side has ('behind,')
and Y is the number of commits the right side has ('ahead.')
This lets us get a precise count of aheads and behinds easily,
doing away with pattern matching and also letting us be a bit
more intelligent about when automatic updating is a good idea.
|
this is beautiful ! |
…ere-applicable Use git porcelain for git commands where applicable
|
Happy to help :) A thought occurred to me a moment after you merged this - was the intent of In my case, upstream/master is actually the remote for your repo, and origin is my fork - if the goal is to make sure that the updater pulls from your repo perhaps it would be wise to have the updater add its own remote... ? |
|
i am fine with leaving it at "origin" since git sets it to the repo it came from it would only make sense to update from there. if i ever stop working on it and someone else is the main developer there is no issue at all ... i mean i could start using your fork without the need to change the code. and in the case of the developer that has its own fork but whats to run from my repo he can change the remote ... i believe someone with a fork is capable of changing a remote. but this is all just for a git installation. at some point (hopefully) the binaries will be me much more popular and the current solution is far from optimal :/ |
|
Right, now |
|
i don't see a reason to hardcode my repo into it ... if you get it from here fine if you get it from somewhere else also fine ^^ ps your help is very much appreciated ! :) |
git symbolic-ref --short --quiet HEADto get the name of the current branch to avoid parsing text and dealing with colors.git rev-parse --verify --quiet @{upstream}to get the remote tracking branch.git status --porcelainto get the list of changed files for dirty check.git rev-list --left-right --count @{upstream}...HEAD(note the triple-dots instead of double-dots) to get behind/ahead counts, and thus avoid regexp parsing.