Re: [PATCH 01/18] rebase -i: Make the condition for an "if" more transparent
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 25, 2010, 18:28 UTC
- Message-ID
- <alpine.DEB.1.00.1001251927460.8733@intel-tinevez-2-302>
- In-Reply-To
- <aa37ee8a68d460df172b23b4999fbe4ce7d77c1e.1263447037.git.mhagger@alum.mit.edu>
Hi,
On Thu, 14 Jan 2010, Michael Haggerty wrote:
Show 6 quoted lines
> @@ -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?
Ciao, Dscho