Re: [PATCH 0/2] Better advice on merge

From: Jonathan Nieder <jrnieder@gmail.com>
Date: May 1, 2013, 18:27 UTC
Message-ID: <20130501182726.GL24467@google.com>
In-Reply-To: <1367407327-5216-1-git-send-email-vikrant.varma94@gmail.com>

Vikrant Varma wrote:

Show 13 quoted lines

> If origin/foo exists, but foo doesn't:
>
>    $ git merge foo
>    fatal: foo - not something we can merge
>
> This patch series improves the error message. If a remote branch exists 
> with the same name, it now says:
>
>      $ git merge foo
>      fatal: foo - not something we can merge
>
>      Did you mean this?
>      	 origin/foo

Fun. :)

I haven't looked at the patches closely. My only immediate thoughts are:

 - It would be nice to add a test under t/, so we can be sure without
   manually testing it that this new feature doesn't break in the
   future.  See t/README if interested.  I guess it would be t7613.

 - Since the first patch isn't useful without or logically separate
   from the second, this would probably be easier to read as a single
   patch.

Thanks for your work, and hope that helps.

Sincerely, Jonathan