t4014: cleanups in a few tests

Arrange things we are going to create to be removed at end, and then
start creating them.  That way, we will clean them up even if we fail
after creating some but before the end of the command.

Signed-off-by: Rubén Justo <rjusto@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index e37a1411ee247cc76083367870e0e0c2e16fbb84..a252c8fbf116d6dfbba08383def63a2fdec1fcec 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -820,8 +820,8 @@ test_expect_success 'format-patch --notes --signoff' '
 '
 
 test_expect_success 'format-patch notes output control' '
+       test_when_finished "git notes remove HEAD || :" &&
        git notes add -m "notes config message" HEAD &&
-       test_when_finished git notes remove HEAD &&
 
        git format-patch -1 --stdout >out &&
        ! grep "notes config message" out &&
@@ -848,10 +848,10 @@ test_expect_success 'format-patch notes output control' '
 '
 
 test_expect_success 'format-patch with multiple notes refs' '
+       test_when_finished "git notes --ref note1 remove HEAD;
+                           git notes --ref note2 remove HEAD || :" &&
        git notes --ref note1 add -m "this is note 1" HEAD &&
-       test_when_finished git notes --ref note1 remove HEAD &&
        git notes --ref note2 add -m "this is note 2" HEAD &&
-       test_when_finished git notes --ref note2 remove HEAD &&
 
        git format-patch -1 --stdout >out &&
        ! grep "this is note 1" out &&
@@ -892,10 +892,10 @@ test_expect_success 'format-patch with multiple notes refs' '
 test_expect_success 'format-patch with multiple notes refs in config' '
        test_when_finished "test_unconfig format.notes" &&
 
+       test_when_finished "git notes --ref note1 remove HEAD;
+                           git notes --ref note2 remove HEAD || :" &&
        git notes --ref note1 add -m "this is note 1" HEAD &&
-       test_when_finished git notes --ref note1 remove HEAD &&
        git notes --ref note2 add -m "this is note 2" HEAD &&
-       test_when_finished git notes --ref note2 remove HEAD &&
 
        git config format.notes note1 &&
        git format-patch -1 --stdout >out &&