From: Vikrant Varma <vikrant.varma94@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Vikrant Varma <vikrant.varma94@gmail.com>
Subject: [PATCH v2 0/2] Show suggested refs when ref unknown
Date: Sat, 4 May 2013 05:34:18 +0530 [thread overview]
Message-ID: <1367625860-20746-1-git-send-email-vikrant.varma94@gmail.com> (raw)
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
It does this by adding a new help function, help_unknown_ref, that takes care of
printing the more friendly error message, and modifies builtin/merge.c to use it.
This function can easily be used by other operations involving refs that don't
exist instead of providing blanket failure error messages (eg. git checkout foo).
Vikrant Varma (2):
help: add help_unknown_ref
merge: use help_unknown_ref
builtin/merge.c | 3 ++-
help.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
help.h | 5 +++++
3 files changed, 57 insertions(+), 1 deletion(-)
--
1.7.10.4
next reply other threads:[~2013-05-04 0:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-04 0:04 Vikrant Varma [this message]
2013-05-04 0:04 ` [PATCH v2 1/2] help: add help_unknown_ref Vikrant Varma
2013-05-08 22:49 ` Junio C Hamano
2013-05-09 21:04 ` Vikrant Varma
2013-05-04 0:04 ` [PATCH v2 2/2] merge: use help_unknown_ref 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=1367625860-20746-1-git-send-email-vikrant.varma94@gmail.com \
--to=vikrant.varma94@gmail.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).