[pnfs] Error on git pull

Thu Mar 15 09:17:41 EDT 2007

On Wed, Mar 14, 2007 at 06:50:08PM -0700, Iyer, Rahul wrote:
> Ok... I got the tree afresh and then decided I'd go for option #1. So, I
> added the slot table code to the latest branch and then committed it. It
> all worked fine. Then I tried to merge it into the pnfs tree... But got
> an error. Here's what I did:
> 
> git checkout 4.1-sessions
> <hack hack>
> git add include/linux/nfs41_sessions.h
> git commit -a
> git checkout master
> git merge 4.1-sessions
> fatal: Needed a single revision
> Usage: /usr/local/bin/git-merge [-n] [--no-commit] [-s <strategy>]...
> <merge-message> <head> <remote>+
> 
> The git user manual seems to indicate that git merge <branchname> should
> be fine...
> Do I have to do something like
> git-merge 4.1-sessions/HEAD

Huh.  I can't figure out why you would get that complaint.

Actually all the "reference names" (branch heads, tags, etc.) are in a
namespace that starts with "refs".  In this case, 4.1-sessions is a
shorthand for "refs/heads/4.1-sessions".

So it's remotely possible that

	git merge refs/heads/4.1-sessions

might resolve some ambiguity.  I don't think it should, though, given
your setup.

--b.