Re: Determining update/merge/current state of a workspace

From: David Aguilar <davvid@gmail.com>
Date: Feb 2, 2014, 23:04 UTC
Message-ID: <20140202230456.GA56790@gmail.com>
In-Reply-To: <85ppn540wi.fsf@stephe-leake.org>

On Sun, Feb 02, 2014 at 04:15:09PM -0600, Stephen Leake wrote:

Show 29 quoted lines

> I'm working on the DVC Emacs front-end for git
> (http://www.emacswiki.org/emacs/DistributedVersionControl), adding
> features similar to the ones I added for monotone
> (http://www.monotone.ca). I'm used to monotone and new to git, so this
> may seem like an odd workflow.
> 
> I always do 'fetch' and 'merge' separately, never 'pull'. So after a
> 'fetch', the DVC Emacs front end must determine what needs to happen
> next. I think there are three cases:
> 
> 1) 'fetch' did not retrieve any revisions from remote; the last local
>    commit is the head of the branch.
> 
>     The workspace is up to date (it may need to be comitted).
> 
> 2) 'fetch' retrieved revisions, and there were no local commits since
>    the previous fetch.
> 
>     The last fetch is the head of the branch; if not equal to HEAD, the
>     workspace needs to be updated (via 'merge').
> 
> 3) fetch retrieved revisions, and there were local commits since
>    the previous fetch.
> 
>    There are two heads for the branch (the two described above), they
>    need to be merged, then the workspace updated.
> 
> I'm not sure how 'git fetch' handles case 3); I have not tested that
> case yet.

Fetch updates your cached origin/master ref to match the remote. Your local master branch and worktree are left as-is.

Show 13 quoted lines

> The question I have is:
> 
> What git queries can I run to determine which of the three states the
> current workspace is in?
> 
> 'rev-parse HEAD' gives the last workspace commit.
> 
> 'rev-parse refs/remotes/<remote>/<branch>' gives the head of the branch
> in the remote repository as of the most recent fetch.
> 
> But to distinguish among the cases, I need to determine if one of these
> two revs is a child of the other or not. I don't see a git query to
> determine that directly.

I think you're looking for "git merge-base".

If you do `git merge-base HEAD origin/master` and its result is equal to `git rev-parse HEAD` then you know that master is an ancestor of origin/master and can be trivially fast-forwarded to origin/master.

If you get a SHA-1 that is not equal then there are probably[*] local commits that have happened on master and it should probably be rebased (or merged).

[*] other possibilities: someone rebased your upstream, etc.

People have differing opinions on how to resolve the diverging history. Topic branches are the gitty approach.

Another popular approach to resolving the divergence is what "git pull --rebase" would have done.

(No one really likes what "git pull" would have done by default
 when there are local commits)

To implement the rebase workflow, do "git rebase --autostash origin/master". after fetching. That workflow is probably the simplest for folks who eschew branching or are expats from other vcs.

If you're writing a tool you might want to check whether the branch has an upstream configured via `git config branch.$name.remote` and `git config branch.$name.merge` as well.

Show 5 quoted lines

> I could try parsing a 'log' output; I have not investigated that.
> This is easy in monotone; there is a command 'mtn heads' that gives this
> result directly (it returns either one or two revs), and another command
> 'mtn automate toposort' that orders revs topologically (by parent/child
> relationships).

`git log` can also tell you whether you have commits that they don't..

What does origin/master have that I don't?

	git log HEAD..origin/master

What do I have that origin/master does not?

	git log origin/master..HEAD

The git log output is easily controlled, though for these questions the mere presence/absense of output tells you what you need to know.

cheers,

-- 
David