diff options
| -rwxr-xr-x | t/t9300-fast-import.sh | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 566f7bdd30..e9c7602849 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -630,20 +630,9 @@ from refs/heads/branch INPUT_END test_expect_success 'F: non-fast-forward update skips' ' - if git fast-import <input - then - echo BAD gfi did not fail - return 1 - else - if test $old_branch = `git rev-parse --verify branch^0` - then - : branch unaffected and failure returned - return 0 - else - echo BAD gfi changed branch $old_branch - return 1 - fi - fi + test_must_fail git fast-import <input && + # branch must remain unaffected + test $old_branch = `git rev-parse --verify branch^0` ' test_expect_success 'F: verify pack' ' |