diff-files: -1/-2/-3 to diff against unmerged stage.

While resolving conflicted merge, it was not easy to compare the
working tree file with unmerged index entries.  This commit
introduces new options -1/-2/-3 (with synonyms --base, --ours,
and --theirs) to compare working tree files with specified
stages.

When none of these options are given, the command defaults to -2
if the index file is unmerged, otherwise it acts as before.

[jc: majorly butchered from the version Linus originally posted.]

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

diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 3b04bfeec6ad18edffd9b6d44709a10fdda36b8c..b45d1e69da30cae6fad7eec3694c1768774519b8 100644 (file)
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -21,6 +21,16 @@ OPTIONS
 -------
 include::diff-options.txt[]
 
+-1 -2 -3 or --base --ours --theirs, and -0::
+       Diff against the "base" version, "our branch" or "their
+       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.
+
 -q::
        Remain silent even on nonexisting files
 

diff --git a/diff-files.c b/diff-files.c
index 38599b5b755df431e3e061df8a304698cc4496fc..bbeeea7988bf487930b42dfc4a50f4f8394c2795 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
@@ -7,12 +7,12 @@
 #include "diff.h"
 
 static const char diff_files_usage[] =
-"git-diff-files [-q] "
-"[<common diff options>] [<path>...]"
+"git-diff-files [-q] [-0/-1/2/3] [<common diff options>] [<path>...]"
 COMMON_DIFF_OPTIONS_HELP;
 
 static struct diff_options diff_options;
 static int silent = 0;
+static int diff_unmerged_stage = -1;
 
 static void show_unmerge(const char *path)
 {
@@ -46,7 +46,21 @@ int main(int argc, const char **argv)
                        argc--;
                        break;
                }
-               if (!strcmp(argv[1], "-q"))
+               if (!strcmp(argv[1], "-0"))
+                       diff_unmerged_stage = 0;
+               else if (!strcmp(argv[1], "-1"))
+                       diff_unmerged_stage = 1;
+               else if (!strcmp(argv[1], "-2"))
+                       diff_unmerged_stage = 2;
+               else if (!strcmp(argv[1], "-3"))
+                       diff_unmerged_stage = 3;
+               else if (!strcmp(argv[1], "--base"))
+                       diff_unmerged_stage = 1;
+               else if (!strcmp(argv[1], "--ours"))
+                       diff_unmerged_stage = 2;
+               else if (!strcmp(argv[1], "--theirs"))
+                       diff_unmerged_stage = 3;
+               else if (!strcmp(argv[1], "-q"))
                        silent = 1;
                else if (!strcmp(argv[1], "-r"))
                        ; /* no-op */
@@ -73,6 +87,20 @@ 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);
 
@@ -94,13 +122,31 @@ int main(int argc, const char **argv)
                        continue;
 
                if (ce_stage(ce)) {
-                       show_unmerge(ce->name);
-                       while (i < entries &&
-                              !strcmp(ce->name, active_cache[i]->name))
+                       if (!diff_unmerged_stage)
+                               show_unmerge(ce->name);
+                       while (i < entries) {
+                               struct cache_entry *nce = active_cache[i];
+
+                               if (strcmp(ce->name, nce->name))
+                                       break;
+                               /* diff against the proper unmerged stage */
+                               if (ce_stage(nce) == diff_unmerged_stage)
+                                       ce = nce;
                                i++;
-                       i--; /* compensate for loop control increments */
-                       continue;
+                       }
+                       /*
+                        * Compensate for loop update
+                        */
+                       i--;
+                       /*
+                        * Show the diff for the 'ce' if we found the one
+                        * from the desired stage.
+                        */
+                       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) {