Skip to content

Commit 0b34379

Browse files
author
Junio C Hamano
committed
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>
1 parent 1290563 commit 0b34379

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

diff.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ extern void diff_flush(struct diff_options*);
103103
/* these are not diff-raw status letters proper, but used by
104104
* diffcore-filter insn to specify additional restrictions.
105105
*/
106-
#define DIFF_STATUS_FILTER_AON 'A'
106+
#define DIFF_STATUS_FILTER_AON '*'
107107
#define DIFF_STATUS_FILTER_BROKEN 'B'
108108

109109
#endif /* DIFF_H */

0 commit comments

Comments
 (0)