[PATCH] Resurrect diff-tree-helper -R
- From
Junio C Hamano <junkio@cox.net>
- Date
- May 1, 2005, 00:34 UTC
- Message-ID
- <7v7jij3htp.fsf@assigned-by-dhcp.cox.net>
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> --- diff-tree-helper.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-)
jit-diff 0 diff-tree-helper.c # - Fix up d_type handling - we need to include <dirent.h> before # + working-tree --- k/diff-tree-helper.c (mode:100644) +++ l/diff-tree-helper.c (mode:100644)
@@ -44,7 +44,8 @@ static int parse_oneside_change(const ch 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; char path[PATH_MAX]; @@ -98,8 +99,12 @@ static int parse_diff_tree_output(const default: return -1; } - if (!cnt || matches_pathspec(path, spec, cnt)) - run_external_diff(path, &old, &new); + if (!cnt || matches_pathspec(path, spec, cnt)) { + if (reverse) + run_external_diff(path, &new, &old); + else + run_external_diff(path, &old, &new); + } return 0; } @@ -108,14 +113,14 @@ static const char *diff_tree_helper_usag int main(int ac, const char **av) { struct strbuf sb; - int reverse_diff = 0; + int reverse = 0; int line_termination = '\n'; strbuf_init(&sb); while (1 < ac && av[1][0] == '-') { if (av[1][1] == 'R') - reverse_diff = 1; + reverse = 1; else if (av[1][1] == 'z') line_termination = 0; else @@ -129,7 +134,7 @@ int main(int ac, const char **av) { read_line(&sb, stdin, line_termination); if (sb.eof) 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) fprintf(stderr, "cannot parse %s\n", sb.buf); }