aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-28 17:42:26 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-28 17:42:26 -0700
commit1ba5c532e1f6ede63fd46bf6b647e70baa10a364 (patch)
tree5b514b2936389e2f0433565881c8555fe189c644 /builtin
parent078e9bce1e8e2484d33d7400ae02c10954fd93ac (diff)
parentedac1883dc5fbadbc2d7d7cf975ed347eaef0702 (diff)
downloadgit-1ba5c532e1f6ede63fd46bf6b647e70baa10a364.tar.gz
git-1ba5c532e1f6ede63fd46bf6b647e70baa10a364.tar.xz
Merge branch 'maint'
* maint: Update draft release notes to 1.7.1.1 notes: Initialise variable to appease gcc notes: check number of parameters to "git notes copy"
Diffstat (limited to 'builtin')
-rw-r--r--builtin/notes.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/notes.c b/builtin/notes.c
index f1f53a80e..190005f3c 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -614,6 +614,10 @@ static int copy(int argc, const char **argv, const char *prefix)
}
}
+ if (argc < 2) {
+ error("too few parameters");
+ usage_with_options(git_notes_copy_usage, options);
+ }
if (2 < argc) {
error("too many parameters");
usage_with_options(git_notes_copy_usage, options);