Michael Haggerty <mhagger <at> alum.mit.edu> writes: > 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" 'test cond1 -a cond2' is not portable. Use 'test cond1 && test cond2'. -- Eric Blake -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html