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>
Junio C Hamano committed
Dec 1, 2005 at 21:39 UTC
a6b51f11ab7f7f838a9b17f81059eebfc36e4c84
1 file changed
+1
-1
git-merge-recursive.py
+1
-1
@@ -98,7 +98,7 @@ getFilesRE = re.compile(r'^([0-7]+) (\S+) ([0-9a-f]{40})\t(.*)$', re.S)
98
def getFilesAndDirs(tree):
99
files = Set()
100
dirs = Set()
101
- out = runProgram(['git-ls-tree', '-r', '-z', tree])
101
+ out = runProgram(['git-ls-tree', '-r', '-z', '-t', tree])
102
for l in out.split('\0'):
103
m = getFilesRE.match(l)
104
if m: