summaryrefslogtreecommitdiff
path: root/git-merge-recursive.py
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-14 04:09:03 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-14 04:09:03 (GMT)
commit74376a686425c6304eafff9f26d8d5fb0d083bc0 (patch)
tree450ea2350197d0265847b98b901615a54b17aede /git-merge-recursive.py
parentdaae66994967ba503f5e868eddf6962a2c1d7871 (diff)
downloadgit-74376a686425c6304eafff9f26d8d5fb0d083bc0.zip
git-74376a686425c6304eafff9f26d8d5fb0d083bc0.tar.gz
git-74376a686425c6304eafff9f26d8d5fb0d083bc0.tar.bz2
git-merge-recursive: Trivial RE fixes.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-recursive.py')
-rwxr-xr-xgit-merge-recursive.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 66165b0..60e8b21 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -74,7 +74,7 @@ def merge(h1, h2, branch1Name, branch2Name, graph, callDepth=0):
return [res, clean]
-getFilesRE = re.compile('([0-9]+) ([a-z0-9]+) ([0-9a-f]{40})\t(.*)')
+getFilesRE = re.compile(r'^([0-7]+) (\S+) ([0-9a-f]{40})\t(.*)$', re.S)
def getFilesAndDirs(tree):
files = Set()
dirs = Set()
@@ -99,7 +99,7 @@ class CacheEntry:
self.stages = [Stage(), Stage(), Stage()]
self.path = path
-unmergedRE = re.compile('^([0-9]+) ([0-9a-f]{40}) ([1-3])\t(.*)$')
+unmergedRE = re.compile(r'^([0-7]+) ([0-9a-f]{40}) ([1-3])\t(.*)$', re.S)
def unmergedCacheEntries():
'''Create a dictionary mapping file names to CacheEntry
objects. The dictionary contains one entry for every path with a