From a6b51f11ab7f7f838a9b17f81059eebfc36e4c84 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 1 Dec 2005 21:39:41 -0800 Subject: [PATCH] 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 --- git-merge-recursive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-merge-recursive.py b/git-merge-recursive.py index e599b11cc5..b7fb0961e0 100755 --- a/git-merge-recursive.py +++ b/git-merge-recursive.py @@ -98,7 +98,7 @@ def merge(h1, h2, branch1Name, branch2Name, graph, callDepth=0): 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: -- GitLab