From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Tue, 23 Aug 2005 09:07:22 +0000 (+0100)
Subject: Fix the push_patch function to not always call refresh_patch
X-Git-Tag: v0.14.3~699
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/a322940ba66cfb047676ad41a9ca1636d08c6d41

Fix the push_patch function to not always call refresh_patch

The refresh_patch() function should only be called when there was a
merge operation, otherwise push_patch() should only checkout the new
head.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---

diff --git a/stgit/stack.py b/stgit/stack.py
index 71f038d..ef7e3f6 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -481,11 +481,13 @@ class Series:
 
         self.__set_current(name)
 
-        if not ex:
-            # if the merge was OK and no conflicts, just refresh the patch
-            self.refresh_patch()
-        else:
-            raise StackException, str(ex)
+        # head == bottom case doesn't need to refresh the patch
+        if head != bottom:
+            if not ex:
+                # if the merge was OK and no conflicts, just refresh the patch
+                self.refresh_patch()
+            else:
+                raise StackException, str(ex)
 
     def undo_push(self):
         name = self.get_current()