From: Junio C Hamano <junkio@cox.net>
Date: Fri, 2 Dec 2005 05:39:41 +0000 (-0800)
Subject: merge-recursive: adjust git-ls-tree use for the latest.
X-Git-Tag: v0.99.9l^2~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a6b51f11ab7f7f838a9b17f81059eebfc36e4c84;p=git.git

merge-recursive: adjust git-ls-tree use for the latest.

You need to pass -t flag if you want to see tree objects in
"git-ls-tree -r" output these days.  This change broke the tree
structure reading code in git-merge-recursive used to detect D/F
conflicts.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index e599b11cc..b7fb0961e 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -98,7 +98,7 @@ getFilesRE = re.compile(r'^([0-7]+) (\S+) ([0-9a-f]{40})\t(.*)$', re.S)
 def getFilesAndDirs(tree):
     files = Set()
     dirs = Set()
-    out = runProgram(['git-ls-tree', '-r', '-z', tree])
+    out = runProgram(['git-ls-tree', '-r', '-z', '-t', tree])
     for l in out.split('\0'):
         m = getFilesRE.match(l)
         if m: