Git development
 help / color / mirror / Atom feed
From: Yann Dirson <ydirson@altern.org>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: [StGIT PATCH 1/7] Fix contrib/stg-whatchanged way of identifying a conflict.
Date: Mon, 25 Jun 2007 23:24:26 +0200	[thread overview]
Message-ID: <20070625212426.17189.23900.stgit@gandelf.nowhere.earth> (raw)
In-Reply-To: <20070625212229.17189.79919.stgit@gandelf.nowhere.earth>

Signed-off-by: Yann Dirson <ydirson@altern.org>
---

 contrib/stg-whatchanged |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/stg-whatchanged b/contrib/stg-whatchanged
index d5b6965..a416e97 100755
--- a/contrib/stg-whatchanged
+++ b/contrib/stg-whatchanged
@@ -24,7 +24,7 @@ fi
 # Merges via "push" leave top=bottom so we must look at old patch
 # in this case (unlike, eg., "pick --fold")
 patchdir="$(git-rev-parse --git-dir)/patches/$(stg branch)/patches/$(stg top)"
-if [ $(cat "$patchdir/bottom") = $(cat "$patchdir/top") ];
+if [ -s "$(git-rev-parse --git-dir)/conflicts" ];
 then
     current_cmd="stg show //top.old"
 else

  reply	other threads:[~2007-06-25 21:24 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-06-25 21:24 [StGIT PATCH 0/7] My patchqueue for 0.13 Yann Dirson
2007-06-25 21:24 ` Yann Dirson [this message]
2007-06-25 21:24 ` [StGIT PATCH 2/7] stg-cvs: update doc, and use correct setting for parent branch Yann Dirson
2007-06-25 21:24 ` [StGIT PATCH 3/7] Revert part of the reverted commit that we want to keep Yann Dirson
2007-06-25 21:24 ` [StGIT PATCH 4/7] Fixed thinko in error message Yann Dirson
2007-06-25 21:24 ` [StGIT PATCH 5/7] Changed sync not to use -b which has other semantics Yann Dirson
2007-06-25 21:24 ` [StGIT PATCH 6/7] Fix t1200 to catch intermediate errors Yann Dirson
2007-06-25 21:24 ` [StGIT PATCH 7/7] If available, use gitk --argscmd in contrib/stg-gitk Yann Dirson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070625212426.17189.23900.stgit@gandelf.nowhere.earth \
    --to=ydirson@altern.org \
    --cc=catalin.marinas@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox