All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Stephen Haberman <stephen@exigencecorp.com>,
	gitster@pobox.com, git@vger.kernel.org
Subject: Re: [PATCH] rebase-i-p: delay saving current-commit to REWRITTEN if squashing
Date: Wed, 22 Oct 2008 12:10:33 -0700	[thread overview]
Message-ID: <7v4p34v42e.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20081022125149.GA17092@coredump.intra.peff.net> (Jeff King's message of "Wed, 22 Oct 2008 08:51:49 -0400")

Jeff King <peff@peff.net> writes:

> On Wed, Oct 15, 2008 at 02:44:36AM -0500, Stephen Haberman wrote:
>
>> +		if [ "$fast_forward" == "t" ]
>
> This one even fails on my Linux box. :) "==" is a bash-ism.

Thanks.

-- >8 --
Subject: [PATCH] git-rebase--interactive.sh: comparision with == is bashism

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 git-rebase--interactive.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index a563dea..0cae3be 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -170,7 +170,7 @@ pick_one_preserving_merges () {
 
 	if test -f "$DOTEST"/current-commit
 	then
-		if [ "$fast_forward" == "t" ]
+		if test "$fast_forward" = t
 		then
 			cat "$DOTEST"/current-commit | while read current_commit
 			do
-- 
1.6.0.3.723.g757e

  parent reply	other threads:[~2008-10-22 19:12 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-15  7:44 [PATCH] rebase-i-p: squashing and limiting todo Stephen Haberman
2008-10-15  7:44 ` [PATCH] rebase-i-p: test to exclude commits from todo based on its parents Stephen Haberman
2008-10-15  7:44 ` [PATCH] rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEAD Stephen Haberman
2008-10-15  7:44 ` [PATCH] rebase-i-p: delay saving current-commit to REWRITTEN if squashing Stephen Haberman
2008-10-22 12:51   ` Jeff King
2008-10-22 15:21     ` Johannes Schindelin
2008-10-22 15:50       ` Fredrik Skolmli
2008-10-22 19:10     ` Junio C Hamano [this message]
2008-10-22 19:15       ` Jeff King
2008-10-15  7:44 ` [PATCH] rebase-i-p: fix 'no squashing merges' tripping up non-merges Stephen Haberman
2008-10-15  7:44 ` [PATCH] rebase-i-p: only list commits that require rewriting in todo Stephen Haberman
2008-10-20 11:50   ` Jeff King
2008-10-20 23:36     ` Junio C Hamano
2008-10-21  0:39       ` Jeff King
2008-10-22  5:01       ` Stephen Haberman
2008-10-22  5:48         ` Junio C Hamano
2008-10-15  7:44 ` [PATCH] rebase-i-p: do not include non-first-parent commits touching UPSTREAM Stephen Haberman
2008-10-15  7:44 ` [PATCH] rebase-i-p: if todo was reordered use HEAD as the rewritten parent Stephen Haberman

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=7v4p34v42e.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=stephen@exigencecorp.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.