From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Jun 2013 20:48:35 +0000 (-0700)
Subject: Merge branch 'mm/rm-coalesce-errors'
X-Git-Tag: v1.8.4-rc0~139
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=8d8975aca7c2b031a2386cd8f266109a8c6e1973;p=git.git

Merge branch 'mm/rm-coalesce-errors'

Give a single message followed by list of paths from "git rm" to
report multiple paths that cannot be removed.

* mm/rm-coalesce-errors:
  rm: introduce advice.rmHints to shorten messages
  rm: better error message on failure for multiple files
---

8d8975aca7c2b031a2386cd8f266109a8c6e1973
diff --cc advice.c
index 54315cbd0a,a4c169ca38..2a52098a29
--- a/advice.c
+++ b/advice.c
@@@ -14,7 -14,7 +14,8 @@@ int advice_resolve_conflict = 1
  int advice_implicit_identity = 1;
  int advice_detached_head = 1;
  int advice_set_upstream_failure = 1;
 +int advice_object_name_warning = 1;
+ int advice_rm_hints = 1;
  
  static struct {
  	const char *name;
@@@ -34,7 -34,7 +35,8 @@@
  	{ "implicitidentity", &advice_implicit_identity },
  	{ "detachedhead", &advice_detached_head },
  	{ "setupstreamfailure", &advice_set_upstream_failure },
 +	{ "object_name_warning", &advice_object_name_warning },
+ 	{ "rmhints", &advice_rm_hints },
  
  	/* make this an alias for backward compatibility */
  	{ "pushnonfastforward", &advice_push_update_rejected }
diff --cc advice.h
index fefe39ac5c,36104c4776..93a7d110ea
--- a/advice.h
+++ b/advice.h
@@@ -17,7 -17,7 +17,8 @@@ extern int advice_resolve_conflict
  extern int advice_implicit_identity;
  extern int advice_detached_head;
  extern int advice_set_upstream_failure;
 +extern int advice_object_name_warning;
+ extern int advice_rm_hints;
  
  int git_default_advice_config(const char *var, const char *value);
  void advise(const char *advice, ...);