summaryrefslogtreecommitdiff
path: root/t/t3304-notes-mixed.sh
diff options
context:
space:
mode:
authorJohan Herland <johan@herland.net>2010-02-13 22:28:34 +0100
committerJunio C Hamano <gitster@pobox.com>2010-02-13 19:36:16 -0800
commitaaec9bcf6d85a084725e8386bf314a6ef6842468 (patch)
treeac81dd7ed75b64aed4e51f3739e343be05116249 /t/t3304-notes-mixed.sh
parent2347fae50b2f75c6c0b362bd9ef24249419ed2b1 (diff)
downloadgit-aaec9bcf6d85a084725e8386bf314a6ef6842468.tar.gz
builtin-notes: Deprecate the -m/-F options for "git notes edit"
The semantics for "git notes edit -m/-F" overlap with those for "git notes add -f", and the behaviour (i.e. overwriting existing notes with the given message/file) is more intuitively captured by (and better documented with) "git notes add -f". Suggested-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3304-notes-mixed.sh')
-rwxr-xr-xt/t3304-notes-mixed.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3304-notes-mixed.sh b/t/t3304-notes-mixed.sh
index c975a6d3f7..1709e8c00b 100755
--- a/t/t3304-notes-mixed.sh
+++ b/t/t3304-notes-mixed.sh
@@ -188,7 +188,7 @@ test_expect_success "verify contents of non-notes" '
test_expect_success "git-notes preserves non-notes" '
test_tick &&
- git notes edit -m "foo bar"
+ git notes add -f -m "foo bar"
'
test_expect_success "verify contents of non-notes after git-notes" '