From: Jonathan Nieder <jrnieder@gmail.com>
To: Vikrant Varma <vikrant.varma94@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 0/2] Better advice on merge
Date: Wed, 1 May 2013 11:27:26 -0700 [thread overview]
Message-ID: <20130501182726.GL24467@google.com> (raw)
In-Reply-To: <1367407327-5216-1-git-send-email-vikrant.varma94@gmail.com>
Vikrant Varma wrote:
> 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
next prev parent reply other threads:[~2013-05-01 18:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-01 11:22 [PATCH 0/2] Better advice on merge Vikrant Varma
2013-05-01 11:22 ` [PATCH 1/2] help: add help_unknown_ref Vikrant Varma
2013-05-01 12:23 ` Ramkumar Ramachandra
2013-05-01 14:06 ` Matthieu Moy
2013-05-01 19:55 ` Vikrant Varma
2013-05-01 20:23 ` Johannes Sixt
2013-05-01 20:32 ` Ramkumar Ramachandra
2013-05-01 21:45 ` Vikrant Varma
2013-05-01 22:12 ` Junio C Hamano
2013-05-01 18:35 ` Junio C Hamano
2013-05-01 22:26 ` Vikrant Varma
2013-05-01 23:07 ` Junio C Hamano
2013-05-01 11:22 ` [PATCH 2/2] merge: use help_unknown_ref instead of die Vikrant Varma
2013-05-01 18:36 ` Junio C Hamano
2013-05-01 18:27 ` Jonathan Nieder [this message]
2013-05-01 23:06 ` [PATCH 0/2] Better advice on merge Vikrant Varma
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130501182726.GL24467@google.com \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=vikrant.varma94@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).