Bryan Donlan schrieb:
quoted text
> -dotest=$GIT_DIR/.dotest-merge
> +dotest="$GIT_DIR/.dotest-merge"

This is not strictly necessary: The RHS expression of an assignment does
not undergo IFS splitting; but better safe than sorry. (But note that
'export foo=$bar', which is not POSIX, is *not* an assignment, and
different shells that support this construct treat it differently.)

quoted text
> +### Test that we handle strange characters properly
> +work_dir="$(pwd)/test \" ' $ \ dir"

In effect, you modify only this test to stress-test strange characters,
but other tests in the test suite still run in a "sane" environment. IOW,
I don't think you should go to this extreme for this one test only. The
better approach would be to rename 'trash' in test-lib.sh to this strange
name so that all tests suffer from a challenging environment.

quoted text
> -		git reset --hard pre-rebase
> -		test_must_fail git rebase'"$type"' master &&
> -		test -d '$dotest' &&
> +		git reset --hard pre-rebase &&
> +		test_must_fail git rebase$type master &&
> +		test -d \"$dotest\" &&

I could imagine that the missing && after the git reset is deliberate. Mike?

quoted text
> +		git reset --hard pre-rebase &&

Ditto.

Apart from that, this looks good.

-- Hannes

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html