undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2005-12-01 21:39:41 -08:00
parent 10b15b86f5
commit a6b51f11ab
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge-recursive.py
View File

@ -98,7 +98,7 @@ getFilesRE = re.compile(r'^([0-7]+) (\S+) ([0-9a-f]{40})\t(.*)$', re.S)
def getFilesAndDirs(tree): def getFilesAndDirs(tree):
files = Set() files = Set()
dirs = 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'): for l in out.split('\0'):
m = getFilesRE.match(l) m = getFilesRE.match(l)
if m: if m: