# [PATCH] Display (empty) when appropriate for the goto command

2 messages from 2008-11-23 to 2008-11-24. Participants: Catalin Marinas, Karl Hasselström.
Thread: https://gitlist.dev/t/16435

## Catalin Marinas, 2008-11-23 21:23

Subject: [PATCH] Display (empty) when appropriate for the goto command
Message-ID: <20081123212318.9835.53505.stgit@localhost.localdomain>
URL: https://gitlist.dev/e/20081123212318.9835.53505.stgit%40localhost.localdomain

```
This is a fix for bug #11810. The original implementation of goto used
to display (empty patch) when a patch became empty during a push + merge
operation. This patch adds this feature again.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---
 stgit/lib/transaction.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/stgit/lib/transaction.py b/stgit/lib/transaction.py
index de62a8c..6623645 100644
--- a/stgit/lib/transaction.py
+++ b/stgit/lib/transaction.py
@@ -290,7 +290,6 @@ class StackTransaction(object):
         conflicts to them."""
         orig_cd = self.patches[pn].data
         cd = orig_cd.set_committer(None)
-        s = ['', ' (empty)'][cd.is_nochange()]
         oldparent = cd.parent
         cd = cd.set_parent(self.top)
         base = oldparent.data.tree
@@ -298,6 +297,7 @@ class StackTransaction(object):
         theirs = cd.tree
         tree, self.temp_index_tree = self.temp_index.merge(
             base, ours, theirs, self.temp_index_tree)
+        s = ''
         merge_conflict = False
         if not tree:
             if iw == None:
@@ -324,6 +324,8 @@ class StackTransaction(object):
         else:
             comm = None
             s = ' (unmodified)'
+        if not merge_conflict and cd.is_nochange():
+            s = ' (empty)'
         out.info('Pushed %s%s' % (pn, s))
         def update():
             if comm:

```

## Karl Hasselström, 2008-11-24 11:19

Subject: Re: [PATCH] Display (empty) when appropriate for the goto command
Message-ID: <20081124111909.GB31986@diana.vm.bytemark.co.uk>
URL: https://gitlist.dev/e/20081124111909.GB31986%40diana.vm.bytemark.co.uk
In-Reply-To: <20081123212318.9835.53505.stgit@localhost.localdomain>

```
On 2008-11-23 21:23:18 +0000, Catalin Marinas wrote:

> This is a fix for bug #11810. The original implementation of goto
> used to display (empty patch) when a patch became empty during a
> push + merge operation. This patch adds this feature again.
>
> Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

Acked-by: Karl Hasselström <kha@treskal.com>

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

```