From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Aug 2012 18:51:53 +0000 (-0700)
Subject: Merge branch 'mm/die-with-dashdash-help'
X-Git-Tag: v1.8.0-rc0~149
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=64336ebe3413e07dcf9e0bcaba93884caab8d65d;p=git.git

Merge branch 'mm/die-with-dashdash-help'

When the user gives an argument that can be taken as both a revision
name and a pathname without disambiguating with "--", we used to
give a help message "Use '--' to separate".  The message has been
clarified to show where that '--' goes on the command line.

* mm/die-with-dashdash-help:
  setup: clarify error messages for file/revisions ambiguity
---

64336ebe3413e07dcf9e0bcaba93884caab8d65d
diff --cc setup.c
index 9139beefc,7663a4cbb..3a1b2fd45
--- a/setup.c
+++ b/setup.c
@@@ -77,9 -77,12 +77,9 @@@ static void NORETURN die_verify_filenam
  					 const char *arg,
  					 int diagnose_misspelt_rev)
  {
 -	unsigned char sha1[20];
 -	unsigned mode;
 -
  	if (!diagnose_misspelt_rev)
  		die("%s: no such path in the working tree.\n"
- 		    "Use '-- <path>...' to specify paths that do not exist locally.",
+ 		    "Use 'git <command> -- <path>...' to specify paths that do not exist locally.",
  		    arg);
  	/*
  	 * Saying "'(icase)foo' does not exist in the index" when the