X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff-helper.c;h=734956e4da47c1a7e982a7a9fd16afe9d49f9cf0;hb=5d9d831a51dc7847ad40fac77f9a072aa2d1c0bd;hp=5a3198ac8e239a784ead5f0f15a67afa5a7a14a0;hpb=f2ce9fde57513af026e0641073a6781a086251d5;p=git.git

diff --git a/diff-helper.c b/diff-helper.c
index 5a3198ac..734956e4 100644
--- a/diff-helper.c
+++ b/diff-helper.c
@@ -17,11 +17,11 @@ 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 =
-	"git-diff-helper [-z] [-S<string>] [-O<orderfile>] paths...";
+static const char diff_helper_usage[] =
+"git-diff-helper [-z] [-O<orderfile>] [-S<string>] [--pickaxe-all] [<path>...]";
 
 int main(int ac, const char **av) {
 	struct strbuf sb;
@@ -91,10 +91,11 @@ 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 == 'R' || status == 'C')
+			if (status == DIFF_STATUS_RENAMED ||
+			    status == DIFF_STATUS_COPIED)
 				two_paths = 1;
 
 			/* pick up score if exists */