From: David Kågedal <david@xxxxxxxxxxxxx>
This leaves the index and working tree in the state that merge-recursive
left it, with unmerged files in different stages, and the non-conflicting
changes in the index.
Signed-off-by: David Kågedal <davidk@xxxxxxxxxxxxxx>
Signed-off-by: Karl Hasselström <kha@xxxxxxxxxxx>
---
stgit/git.py | 20 +-------------------
stgit/stack.py | 17 ++++++++++++-----
t/t0002-status.sh | 3 ---
3 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/stgit/git.py b/stgit/git.py
index 0619aa8..7cc94b9 100644
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -676,25 +676,7 @@ def merge_recursive(base, head1, head2):
# error and we have to abort the merge
raise GitException, err_output
- # merge the unmerged files
- errors = False
- for path in files:
- # remove additional files that might be generated for some
- # newer versions of GIT
- for suffix in [base, head1, head2]:
- if not suffix:
- continue
- fname = path + '~' + suffix
- if os.path.exists(fname):
- os.remove(fname)
-
- stages = files[path]
- if gitmergeonefile.merge(stages['1'][1], stages['2'][1],
- stages['3'][1], path, stages['1'][0],
- stages['2'][0], stages['3'][0]) != 0:
- errors = True
-
- if errors:
+ if files:
raise GitException, 'GIT index merging failed (possible conflicts)'
def merge(base, head1, head2):
diff --git a/stgit/stack.py b/stgit/stack.py
index f065787..e9dc97e 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -735,6 +735,7 @@ class Series(PatchSet):
config.unset(self.format_version_key())
def refresh_patch(self, files = None, message = None, edit = False,
+ empty = False,
show_patch = False,
cache_update = True,
author_name = None, author_email = None,
@@ -784,9 +785,16 @@ class Series(PatchSet):
bottom = patch.get_bottom()
+ if empty:
+ tree_id = git.get_commit(bottom).get_tree()
+ else:
+ tree_id = None
+
commit_id = git.commit(files = files,
message = descr, parents = [bottom],
cache_update = cache_update,
+ tree_id = tree_id,
+ set_head = True,
allowempty = True,
author_name = author_name,
author_email = author_email,
@@ -1089,11 +1097,10 @@ class Series(PatchSet):
log = 'push'
self.refresh_patch(cache_update = False, log = log)
else:
- # we store the correctly merged files only for
- # tracking the conflict history. Note that the
- # git.merge() operations should always leave the index
- # in a valid state (i.e. only stage 0 files)
- self.refresh_patch(cache_update = False, log = 'push(c)')
+ # we make the patch empty, with the merged state in
+ # the working tree.
+ self.refresh_patch(cache_update = False, empty = True,
+ log = 'push(c)')
raise StackException, str(ex)
return modified
diff --git a/t/t0002-status.sh b/t/t0002-status.sh
index ce3b688..7e34020 100755
--- a/t/t0002-status.sh
+++ b/t/t0002-status.sh
@@ -93,9 +93,6 @@ test_expect_success 'Make a conflicting patch' '
'
cat > expected.txt <<EOF
-? foo/bar.ancestor
-? foo/bar.current
-? foo/bar.patched
C foo/bar
EOF
test_expect_success 'Status after conflicting push' '
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
