undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Resurrect diff-tree-helper -R

Browse Source 
Diff-tree-helper take two patch inadvertently dropped the
support of -R option, which is necessary to produce reverse diff
based on diff-cache and diff-files output (diff-tree does not
matter since you can feed two trees in reverse order).  This
patch restores it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Junio C Hamano 2005-04-30 17:59:35 -07:00 committed by Linus Torvalds
parent 4250a5e5b1
commit a6f3f3b108
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
diff-tree-helper.c
View File

@ -44,7 +44,8 @@ static int parse_oneside_change(const char *cp, struct diff_spec *one,
return 0; return 0;
} }
static int parse_diff_tree_output(const char *buf, const char **spec, int cnt) static int parse_diff_tree_output(const char *buf,
const char **spec, int cnt, int reverse)
{ {
struct diff_spec old, new; struct diff_spec old, new;
char path[PATH_MAX]; char path[PATH_MAX];
@ -98,8 +99,12 @@ static int parse_diff_tree_output(const char *buf, const char **spec, int cnt)
default: default:
return -1; return -1;
} }
if (!cnt || matches_pathspec(path, spec, cnt)) if (!cnt || matches_pathspec(path, spec, cnt)) {
run_external_diff(path, &old, &new); if (reverse)
run_external_diff(path, &new, &old);
else
run_external_diff(path, &old, &new);
}
return 0; return 0;
} }
@ -108,14 +113,14 @@ static const char *diff_tree_helper_usage =
int main(int ac, const char **av) { int main(int ac, const char **av) {
struct strbuf sb; struct strbuf sb;
int reverse_diff = 0; int reverse = 0;
int line_termination = '\n'; int line_termination = '\n';
strbuf_init(&sb); strbuf_init(&sb);
while (1 < ac && av[1][0] == '-') { while (1 < ac && av[1][0] == '-') {
if (av[1][1] == 'R') if (av[1][1] == 'R')
reverse_diff = 1; reverse = 1;
else if (av[1][1] == 'z') else if (av[1][1] == 'z')
line_termination = 0; line_termination = 0;
else else
@ -129,7 +134,7 @@ int main(int ac, const char **av) {
read_line(&sb, stdin, line_termination); read_line(&sb, stdin, line_termination);
if (sb.eof) if (sb.eof)
break; break;
status = parse_diff_tree_output(sb.buf, av+1, ac-1); status = parse_diff_tree_output(sb.buf, av+1, ac-1, reverse);
if (status) if (status)
fprintf(stderr, "cannot parse %s\n", sb.buf); fprintf(stderr, "cannot parse %s\n", sb.buf);
} }