From: Michael W. Olson Date: Mon, 15 Oct 2007 17:48:27 +0000 (-0400) Subject: git-rebase--interactive.sh: Quote arguments to test X-Git-Tag: v1.5.4-rc0~359 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2858028e1ab6c79f39ec0057d2034bcbe9f47cf9;p=git.git git-rebase--interactive.sh: Quote arguments to test If /bin/sh is /bin/dash, then the script will display an error if $parent_sha1 is undefined. This patch works fixes the issue by quoting both arguments to `test'. Arguments composed solely of variable expansions should always be quoted, unless we know for certain that the contents are defined. Signed-off-by: Michael W. Olson Signed-off-by: Shawn O. Pearce --- diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index df4cedb85..0dd77b400 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -110,7 +110,7 @@ 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 "$no_ff$current_sha1" = "$parent_sha1"; then output git reset --hard $sha1 test "a$1" = a-n && output git reset --soft $current_sha1 sha1=$(git rev-parse --short $sha1)