Code

merge-recursive: adjust git-ls-tree use for the latest.
authorJunio C Hamano <junkio@cox.net>
Fri, 2 Dec 2005 05:39:41 +0000 (21:39 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 2 Dec 2005 05:39:41 +0000 (21:39 -0800)
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>
git-merge-recursive.py

index e599b11cc57ecd0219d39fbfc8141fa5455755bf..b7fb0961e0758c566c459f51b6983f99e694ee4f 100755 (executable)
@@ -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: