diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-01 21:39:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-01 21:39:41 -0800 |
| commit | a6b51f11ab7f7f838a9b17f81059eebfc36e4c84 (patch) | |
| tree | ba312419331dbca9506e0559ab534bb1e6d914a8 | |
| parent | 10b15b86f545e081aebba8783ad9e9acf6bf0d98 (diff) | |
| download | git-a6b51f11ab7f7f838a9b17f81059eebfc36e4c84.tar.gz git-a6b51f11ab7f7f838a9b17f81059eebfc36e4c84.tar.xz | |
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>
| -rwxr-xr-x | git-merge-recursive.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: |