Re: [PATCH 16/19] gitweb: Use git-diff-tree or git-diff patch output for blobdiff

From: Jakub Narebski <jnareb@gmail.com>
Date: Aug 26, 2006, 09:23 UTC
Message-ID: <ecp3uq$k1f$1@sea.gmane.org>
In-Reply-To: <200608252113.34731.jnareb@gmail.com>

Jakub Narebski wrote:

Show 5 quoted lines

> ATTENTION: The order of arguments (operands) to git-diff is reversed
> (sic!) to have correct diff in the legacy (no hash_parent_base) case.
> $hash_parent, $hash ordering is commented out, as it gives reversed
> patch (at least for git version 1.4.1.1) as compared to output in new
> scheme and output of older gitweb version.

By the way, wa it corrected later? git version 1.4.1.1

1010:jnareb@roke:~/git> git diff-tree 599f8d63140^ 599f8d63140 :100644 100644 0bd517b2649af37d9980f85e784f9a00c3263922 8213ce240232a1dc8a0a498972323a33e8fcb7a0 M builtin-grep.c

1011:jnareb@roke:~/git> git diff-tree -p 599f8d63140^ 599f8d63140

diff --git a/builtin-grep.c b/builtin-grep.c
index 0bd517b..8213ce2 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -293,9 +293,6 @@ static void compile_patterns(struct grep
         */
        p = opt->pattern_list;
        opt->pattern_expression = compile_pattern_expr(&p);
-#if DEBUG
-       dump_pattern_exp(opt->pattern_expression, 0);
-#endif
        if (p)
                die("incomplete pattern expression: %s", p->pattern);
 }


1012:jnareb@roke:~/git> git diff 0bd517b2649af37d9980f85e784f9a00c3263922 8213ce240232a1dc8a0a498972323a33e8fcb7a0
diff --git a/0bd517b2649af37d9980f85e784f9a00c3263922 b/0bd517b2649af37d9980f85e784f9a00c3263922
index 8213ce2..0bd517b 100644
--- a/0bd517b2649af37d9980f85e784f9a00c3263922
+++ b/0bd517b2649af37d9980f85e784f9a00c3263922
@@ -293,6 +293,9 @@ static void compile_patterns(struct grep
         */
        p = opt->pattern_list;
        opt->pattern_expression = compile_pattern_expr(&p);
+#if DEBUG
+       dump_pattern_exp(opt->pattern_expression, 0);
+#endif
        if (p)
                die("incomplete pattern expression: %s", p->pattern);
 }

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git