builtin-notes: Refactor handling of -F option to allow combining -m and -F

diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 290ed63d4e3048cdaae77d10ea13434beaea6c7f..07090e399730d8fa39737a60e232c3f96599583e 100755 (executable)
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -284,8 +284,29 @@ test_expect_success 'verify non-creation of note with -m ""' '
        ! git notes show
 '
 
+cat > expect-combine_m_and_F << EOF
+foo
+
+xyzzy
+
+bar
+
+zyxxy
+
+baz
+EOF
+
+test_expect_success 'create note with combination of -m and -F' '
+       echo "xyzzy" > note_a &&
+       echo "zyxxy" > note_b &&
+       git notes add -m "foo" -F note_a -m "bar" -F note_b -m "baz" &&
+       git notes show > output &&
+       test_cmp expect-combine_m_and_F output
+'
+
 test_expect_success 'remove note with "git notes remove" (setup)' '
-       git notes remove HEAD^
+       git notes remove HEAD^ &&
+       git notes remove
 '
 
 cat > expect-rm-remove << EOF