Linus,
the merge-trees I sent you earlier was expecting the old
diff-tree behaviour, and I did not realize that I need an
explicit -z flag now. Here is a fix.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
merge-trees | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- merge-trees 2005-04-15 13:21:35.000000000 -0700
+++ merge-trees+ 2005-04-15 16:27:34.000000000 -0700
@@ -78,8 +78,8 @@
local ($_, $/);
$/ = "\0";
my %path;
- open $fhi, '-|', 'diff-tree', '-r', @tree
- or die "$!: diff-tree -r @tree";
+ open $fhi, '-|', 'diff-tree', '-r', '-z', @tree
+ or die "$!: diff-tree -r -z @tree";
while (<$fhi>) {
chomp;
if (/^\*($reM)->($reM)\tblob\t($reID)->($reID)\t(.*)$/so) {
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
