diff options
| -rw-r--r-- | Documentation/git-diff-files.txt | 7 | ||||
| -rw-r--r-- | diff-files.c | 21 |
2 files changed, 5 insertions, 23 deletions
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index b45d1e69da..67f51265e6 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -26,10 +26,9 @@ include::diff-options.txt[] branch" respectively. With these options, diffs for merged entries are not shown. + -The default is to diff against our branch (-2) if there -is an unmerged path, and show diff for unmerged entries -otherwise. The option -0 can be given to force diff for -unmerged entries even when the index is unmerged. +The default is to diff against our branch (-2) and the +cleanly resolved paths. The option -0 can be given to +omit diff output for unmerged entries and just show "Unmerged". -q:: Remain silent even on nonexisting files diff --git a/diff-files.c b/diff-files.c index bbeeea7988..6c0696c34f 100644 --- a/diff-files.c +++ b/diff-files.c @@ -12,7 +12,7 @@ COMMON_DIFF_OPTIONS_HELP; static struct diff_options diff_options; static int silent = 0; -static int diff_unmerged_stage = -1; +static int diff_unmerged_stage = 2; static void show_unmerge(const char *path) { @@ -87,20 +87,6 @@ int main(int argc, const char **argv) pathspec = get_pathspec(prefix, argv + 1); entries = read_cache(); - if (diff_unmerged_stage < 0) { - /* default to "ours" if unmerged index, otherwise 0 */ - for (i = 0; i < entries; i++) { - struct cache_entry *ce = active_cache[i]; - if (ce_stage(ce)) { - diff_unmerged_stage = 2; - break; - } - } - if (diff_unmerged_stage < 0) - diff_unmerged_stage = 0; - } - - if (diff_setup_done(&diff_options) < 0) usage(diff_files_usage); @@ -122,8 +108,7 @@ int main(int argc, const char **argv) continue; if (ce_stage(ce)) { - if (!diff_unmerged_stage) - show_unmerge(ce->name); + show_unmerge(ce->name); while (i < entries) { struct cache_entry *nce = active_cache[i]; @@ -145,8 +130,6 @@ int main(int argc, const char **argv) if (ce_stage(ce) != diff_unmerged_stage) continue; } - else if (diff_unmerged_stage) - continue; if (lstat(ce->name, &st) < 0) { if (errno != ENOENT && errno != ENOTDIR) { |