Eric Sunshine <sunshine@xxxxxxxxxxxxxx> writes: > Although I'm the one who brought up the idea of "automating" these > tests, I'm not convinced that it's an improvement in this case, but I > don't feel so strongly that I'd forbid it. Another option is to define helper functions to shorten the "manual" tests, e.g. define: setup_rebase_test () { git reset --hard before-rebase && echo dirty >new_file && git add new_file } rebase_test_ok () { git pull $1 . copy && test_cmp_rev HEAD^ copy && test "$(cat new_file)" = dirty && test "$(cat file)" = "modified again" } rebase_test_err () { test_must_fail git pull $1 . copy 2>err && test_i18ngrep "uncommitted changes." err } I'm also OK with keeping the "manual" tests. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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