Re: [PATCH 3/3] rebase: refuse to rebase with -s ours

Sverre Rabbelier wrote:

Heya,

On Sun, Nov 15, 2009 at 19:25, Thomas Rast [off-list ref] wrote:

quoted

+               if test "$STRATEGY" = "-s ours"

Is this solid? Would "-s  ours" (two spaces) work?

Well, the variable is set by the case immediately before the new test:

	case "$#,$1" in
	*,*=*)
		STRATEGY="-s "$(expr "z$1" : 'z-[^=]*=\(.*\)') ;;
	1,*)
		usage ;;
	*)
		STRATEGY="-s $2"
		shift ;;
	esac

I didn't want to split that for a direct comparison with the second
half of the value, but unless I'm missing something, you'd have to say
-s ' ours' to make the test fail.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch