[pnfs] Error on git pull

Thu Mar 15 09:30:59 EDT 2007

On Thu, Mar 15, 2007 at 09:17:41AM -0400, J. Bruce Fields wrote:
> 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.

Wait, what does

	git --version

say?

It looks like the only versions of git with the help message you show
are pre-1.5.0.

So upgrade to 1.5.0 if you can (that's what any instructions will be
for); if not, then

	git pull . master

is pretty much a synonym for

	git merge master

--b.