projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Teach git push .git/branches shorthand
[git.git]
/
diff-helper.c
diff --git
a/diff-helper.c
b/diff-helper.c
index
5a3198a
..
3fa50ee
100644
(file)
--- 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);
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;
int main(int ac, const char **av) {
struct strbuf sb;
@@
-94,7
+94,8
@@
int main(int ac, const char **av) {
if (!strchr("MCRNDU", status))
break;
two_paths = score = 0;
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 */
two_paths = 1;
/* pick up score if exists */