Eric Sunshine <sunshine@xxxxxxxxxxxxxx> writes: >> + (git am --abort || true) && Why (x || y)? Is 'x' so unreliable that we do not know how should exit? Should this be "test_must_fail git am --abort"? >> + (cd submodule && git rev-parse HEAD >../actual) && "git -C submodule rev-parse HEAD >actual" perhaps? >> +test_expect_success 'diff.submodule unset' ' >> + (git config --unset diff.submodule || true) && I think test_config and test_unconfig were invented for things like this (same for all the other use of "git config"). -- 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