diff options
| author |  Jonathan Tan <jonathantanmy@google.com> | 2021-07-15 10:44:32 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-07-15 11:58:52 -0700 |
| commit | 82823118b9cd397d6b626cc86a0e555069ea8253 (patch) | |
| tree | b2fef9aff85748958c92be3a5479ba86a7b0da3c /builtin | |
| parent | send-pack: fix push nego. when remote has refs (diff) | |
| download | tgif-82823118b9cd397d6b626cc86a0e555069ea8253.tar.xz | |
fetch: die on invalid --negotiation-tip hash
If a full hexadecimal hash is given as a --negotiation-tip to "git
fetch", and that hash does not correspond to an object, "git fetch" will
segfault if --negotiate-only is given and will silently ignore that hash
otherwise. Make these cases fatal errors, just like the case when an
invalid ref name or abbreviated hash is given.
While at it, mark the error messages as translatable.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fetch.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index dfde96a435..0aeb043840 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1428,7 +1428,9 @@ static void add_negotiation_tips(struct git_transport_options *smart_options) if (!has_glob_specials(s)) { struct object_id oid; if (get_oid(s, &oid)) - die("%s is not a valid object", s); + die(_("%s is not a valid object"), s); + if (!has_object(the_repository, &oid, 0)) + die(_("the object %s does not exist"), s); oid_array_append(oids, &oid); continue; } |