From: Junio C Hamano <junkio@cox.net>
Date: Wed, 5 Oct 2005 00:44:17 +0000 (-0700)
Subject: Fix diff-filter All-Or-None mark.
X-Git-Tag: v0.99.8b~1^2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0b34379a8da82061308b7a22d0caa1834d579f48;p=git.git

Fix diff-filter All-Or-None mark.

When we updated the marker for new files from 'N' to 'A', we forgot to
notice that the letter is already taken by the All-Or-None mark.
Change the All-Or-None marker to '*' to resolve this conflict.

	git-diff-tree -r --diff-filter='R*' -M

shows all the changes (not just renames) that are contained in commits
that have renames, in comparison with:

	git-diff-tree -r --diff-filter='R' -M

shows the same set of changes but the diff output are limited only to
renaming changes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/diff.h b/diff.h
index 7f4079c87..2f4a7b463 100644
--- a/diff.h
+++ b/diff.h
@@ -103,7 +103,7 @@ extern void diff_flush(struct diff_options*);
 /* these are not diff-raw status letters proper, but used by
  * diffcore-filter insn to specify additional restrictions.
  */
-#define DIFF_STATUS_FILTER_AON		'A'
+#define DIFF_STATUS_FILTER_AON		'*'
 #define DIFF_STATUS_FILTER_BROKEN	'B'
 
 #endif /* DIFF_H */