Merge branch 'tc/last-modified-recursive-fix'
"git last-modified" operating in non-recursive mode used to trigger a BUG(), which has been corrected. * tc/last-modified-recursive-fix: last-modified: fix bug when some paths remain unhandled
This commit is contained in:
7
diff.h
7
diff.h
@@ -127,6 +127,13 @@ struct diff_flags {
|
||||
unsigned recursive;
|
||||
unsigned tree_in_recursive;
|
||||
|
||||
/*
|
||||
* Historically diff_tree_combined() overrides recursive to 1. To
|
||||
* suppress this behavior, set the flag below.
|
||||
* It has no effect if recursive is already set to 1.
|
||||
*/
|
||||
unsigned no_recursive_diff_tree_combined;
|
||||
|
||||
/* Affects the way how a file that is seemingly binary is treated. */
|
||||
unsigned binary;
|
||||
unsigned text;
|
||||
|
||||
Reference in New Issue
Block a user