From 5b99888bc11c6ac2c3c940c3c9bb4b9905225754 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Mon, 20 Nov 2006 21:45:17 +0000 Subject: [PATCH] Fix a bug in gitmergeonefile.py introduced recently The bug was introduced by the change of merger and keeporig variables from string to ConfigOption. Signed-off-by: Catalin Marinas --- stgit/gitmergeonefile.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stgit/gitmergeonefile.py b/stgit/gitmergeonefile.py index 39915fb..b35880e 100644 --- a/stgit/gitmergeonefile.py +++ b/stgit/gitmergeonefile.py @@ -126,10 +126,10 @@ def merge(orig_hash, file1_hash, file2_hash, return 1 # 3-way merge else: - merge_ok = os.system(merger % {'branch1': src1, - 'ancestor': orig, - 'branch2': src2, - 'output': path }) == 0 + merge_ok = os.system(str(merger) % {'branch1': src1, + 'ancestor': orig, + 'branch2': src2, + 'output': path }) == 0 if merge_ok: os.system('git-update-index -- %s' % path) @@ -142,7 +142,7 @@ def merge(orig_hash, file1_hash, file2_hash, # reset the cache to the first branch os.system('git-update-index --cacheinfo %s %s %s' % (file1_mode, file1_hash, path)) - if keeporig != 'yes': + if str(keeporig) != 'yes': __remove_files(orig_hash, file1_hash, file2_hash) __conflict(path) return 1 -- 2.11.0