[PATCH] Improve git-update-index error reporting

diff --git a/diff-helper.c b/diff-helper.c
index 07ccd7cc38d02843d339a9feb21088912f63dcba..734956e4da47c1a7e982a7a9fd16afe9d49f9cf0 100644 (file)
--- a/diff-helper.c
+++ b/diff-helper.c
@@ -20,7 +20,7 @@ static void flush_them(int ac, const char **av)
        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) {
@@ -91,7 +91,7 @@ int main(int ac, const char **av) {
                        if (*cp++ != ' ')
                                break;
                        status = *cp++;
-                       if (!strchr("MCRNDU", status))
+                       if (!strchr("AMCRDU", status))
                                break;
                        two_paths = score = 0;
                        if (status == DIFF_STATUS_RENAMED ||