diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-07-11 19:45:49 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-07-11 19:45:49 (GMT) |
commit | 9ca724933a8d50633699acf3e5731fa392e2ff36 (patch) | |
tree | 3aacdf358feb1e0bf564b8e0a62c31b8231c8d8e /builtin/reset.c | |
parent | a0ceb72f38bf841322fc8ce28ea39328e8a5aa19 (diff) | |
parent | 023e37c37780d6a56f2870a979c8eb3a9ee9a44d (diff) | |
download | git-9ca724933a8d50633699acf3e5731fa392e2ff36.zip git-9ca724933a8d50633699acf3e5731fa392e2ff36.tar.gz git-9ca724933a8d50633699acf3e5731fa392e2ff36.tar.bz2 |
Merge branch 'mm/verify-filename-fix' into maint
"git diff COPYING HEAD:COPYING" gave a nonsense error message that
claimed that the treeish HEAD did not have COPYING in it.
* mm/verify-filename-fix:
verify_filename(): ask the caller to chose the kind of diagnosis
sha1_name: do not trigger detailed diagnosis for file arguments
Diffstat (limited to 'builtin/reset.c')
-rw-r--r-- | builtin/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index 8c2c1d5..4cc34c9 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -285,7 +285,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) rev = argv[i++]; } else { /* Otherwise we treat this as a filename */ - verify_filename(prefix, argv[i]); + verify_filename(prefix, argv[i], 1); } } |