From: Michael Haggerty <mhagger@alum.mit.edu>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 01/18] rebase -i: Make the condition for an "if" more transparent
Date: Tue, 26 Jan 2010 13:38:47 +0100 [thread overview]
Message-ID: <4B5EE257.8060204@alum.mit.edu> (raw)
In-Reply-To: <alpine.DEB.1.00.1001251927460.8733@intel-tinevez-2-302>
Johannes Schindelin wrote:
> On Thu, 14 Jan 2010, Michael Haggerty wrote:
>
>> @@ -166,7 +166,8 @@ pick_one () {
>> parent_sha1=$(git rev-parse --verify $sha1^) ||
>> die "Could not get the parent of $sha1"
>> current_sha1=$(git rev-parse --verify HEAD)
>> - if test "$no_ff$current_sha1" = "$parent_sha1"; then
>> + if test -z "$no_ff" -a "$current_sha1" = "$parent_sha1"
>
> Rather use &&, right?
Yes, that mistake was caused by my own ignorance about the portability
issues. This problem was already discussed [1] and the change has been
integrated into master.
Thanks,
Michael
[1] http://marc.info/?l=git&m=126344857120877&w=2
next prev parent reply other threads:[~2010-01-26 12:41 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-14 5:54 [PATCH 00/18] rebase -i: For pure fixups, do not start log message editor Michael Haggerty
2010-01-14 5:54 ` [PATCH 01/18] rebase -i: Make the condition for an "if" more transparent Michael Haggerty
2010-01-14 15:42 ` [PATCH 01/18] rebase -i: Make the condition for an "if" " Eric Blake
2010-01-14 17:42 ` Junio C Hamano
2010-01-15 7:20 ` Paolo Bonzini
2010-01-25 18:28 ` [PATCH 01/18] rebase -i: Make the condition for an "if" " Johannes Schindelin
2010-01-26 12:38 ` Michael Haggerty [this message]
2010-01-26 13:11 ` Johannes Schindelin
2010-01-14 5:54 ` [PATCH 02/18] rebase -i: Remove dead code Michael Haggerty
2010-01-14 5:54 ` [PATCH 03/18] rebase -i: Inline expression Michael Haggerty
2010-01-14 5:54 ` [PATCH 04/18] rebase -i: Use "test -n" instead of "test ! -z" Michael Haggerty
2010-01-14 5:54 ` [PATCH 05/18] rebase -i: Use symbolic constant $MSG consistently Michael Haggerty
2010-01-14 5:54 ` [PATCH 06/18] rebase -i: Document how temporary files are used Michael Haggerty
2010-01-25 3:38 ` Greg Price
2010-01-14 5:54 ` [PATCH 07/18] rebase -i: Introduce a constant AUTHOR_SCRIPT Michael Haggerty
2010-01-14 5:54 ` [PATCH 08/18] rebase -i: Introduce a constant AMEND Michael Haggerty
2010-01-14 5:54 ` [PATCH 09/18] t3404: Test the commit count in commit messages generated by "rebase -i" Michael Haggerty
2010-01-14 7:44 ` Johannes Sixt
2010-01-14 8:59 ` Michael Haggerty
2010-01-14 9:16 ` Johannes Sixt
2010-01-14 5:54 ` [PATCH 10/18] rebase -i: Improve consistency of commit count in generated commit messages Michael Haggerty
2010-01-14 7:54 ` Johannes Sixt
2010-01-14 9:05 ` Michael Haggerty
2010-01-14 5:54 ` [PATCH 11/18] rebase -i: Simplify commit counting for " Michael Haggerty
2010-01-14 5:54 ` [PATCH 12/18] rebase -i: Extract a function "commit_message" Michael Haggerty
2010-01-14 5:54 ` [PATCH 13/18] rebase -i: Handle the author script all in one place in do_next Michael Haggerty
2010-01-14 5:54 ` [PATCH 14/18] rebase -i: Extract function do_with_author Michael Haggerty
2010-01-14 5:54 ` [PATCH 15/18] rebase -i: Change function make_squash_message into update_squash_message Michael Haggerty
2010-01-14 8:20 ` Johannes Sixt
2010-01-14 5:54 ` [PATCH 16/18] rebase -i: For fixup commands without squashes, do not start editor Michael Haggerty
2010-01-14 5:54 ` [PATCH 17/18] t3404: Set up more of the test repo in the "setup" step Michael Haggerty
2010-01-14 5:54 ` [PATCH 18/18] rebase -i: Retain user-edited commit messages after squash/fixup conflicts Michael Haggerty
2010-01-14 9:17 ` [PATCH 00/18] rebase -i: For pure fixups, do not start log message editor Junio C Hamano
2010-01-25 18:38 ` Johannes Schindelin
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=4B5EE257.8060204@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.