Introduce "reset type" flag to "git reset"

diff --git a/diff-helper.c b/diff-helper.c
index 63aff6969863f6fb3da94c9866067e1c779831a3..3fa50ee75b510c5396fe004160f80ddbe4955ca1 100644 (file)
--- a/diff-helper.c
+++ b/diff-helper.c
@@ -17,10 +17,10 @@ static void flush_them(int ac, const char **av)
        diffcore_std_no_resolve(av + 1,
                                pickaxe, pickaxe_opts,
                                orderfile, diff_filter);
-       diff_flush(DIFF_FORMAT_PATCH);
+       diff_flush(DIFF_FORMAT_PATCH, '\n');
 }
 
-static const char *diff_helper_usage =
+static const char diff_helper_usage[] =
 "git-diff-helper [-z] [-O<orderfile>] [-S<string>] [--pickaxe-all] [<path>...]";
 
 int main(int ac, const char **av) {
@@ -94,7 +94,8 @@ int main(int ac, const char **av) {
                        if (!strchr("MCRNDU", status))
                                break;
                        two_paths = score = 0;
-                       if (status == 'R' || status == 'C')
+                       if (status == DIFF_STATUS_RENAMED ||
+                           status == DIFF_STATUS_COPIED)
                                two_paths = 1;
 
                        /* pick up score if exists */