@matheusbsbs / matheus-bagliano / commits / 74376a6864
Fork 0

git-merge-recursive: Trivial RE fixes.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Sep 13, 2005 at 21:09 UTC 74376a686425c6304eafff9f26d8d5fb0d083bc0
1 file changed +2 -2
git-merge-recursive.py
+2 -2
@@ -74,7 +74,7 @@ def merge(h1, h2, branch1Name, branch2Name, graph, callDepth=0):
74
75 return [res, clean]
76
77 -getFilesRE = re.compile('([0-9]+) ([a-z0-9]+) ([0-9a-f]{40})\t(.*)')
77 +getFilesRE = re.compile(r'^([0-7]+) (\S+) ([0-9a-f]{40})\t(.*)$', re.S)
78 def getFilesAndDirs(tree):
79 files = Set()
80 dirs = Set()
@@ -99,7 +99,7 @@ class CacheEntry:
99 self.stages = [Stage(), Stage(), Stage()]
100 self.path = path
101
102 -unmergedRE = re.compile('^([0-9]+) ([0-9a-f]{40}) ([1-3])\t(.*)$')
102 +unmergedRE = re.compile(r'^([0-7]+) ([0-9a-f]{40}) ([1-3])\t(.*)$', re.S)
103 def unmergedCacheEntries():
104 '''Create a dictionary mapping file names to CacheEntry
105 objects. The dictionary contains one entry for every path with a