Re: [PATCH 01/18] rebase -i: Make the condition for an "if" more transparent
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Jan 26, 2010, 12:38 UTC
- Message-ID
- <4B5EE257.8060204@alum.mit.edu>
- In-Reply-To
- <alpine.DEB.1.00.1001251927460.8733@intel-tinevez-2-302>
Johannes Schindelin wrote:
Show 10 quoted lines
> 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