diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-11 12:45:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-11 12:45:49 -0700 |
| commit | 9ca724933a8d50633699acf3e5731fa392e2ff36 (patch) | |
| tree | 3aacdf358feb1e0bf564b8e0a62c31b8231c8d8e /sha1_name.c | |
| parent | a0ceb72f38bf841322fc8ce28ea39328e8a5aa19 (diff) | |
| parent | 023e37c37780d6a56f2870a979c8eb3a9ee9a44d (diff) | |
| download | git-9ca724933a8d50633699acf3e5731fa392e2ff36.tar.gz | |
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 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c index c6331136d1..5d81ea0564 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -1127,7 +1127,7 @@ int get_sha1_with_context_1(const char *name, unsigned char *sha1, if (new_filename) filename = new_filename; ret = get_tree_entry(tree_sha1, filename, sha1, &oc->mode); - if (only_to_die) { + if (ret && only_to_die) { diagnose_invalid_sha1_path(prefix, filename, tree_sha1, object_name); free(object_name); |