diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-12 20:51:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 20:51:36 (GMT) |
| commit | 6d71443d8e6da9e3d412f91b5f5e9dd95a058ed1 (patch) | |
| tree | 6b6afb01982a2752d55a9e3b30d618d6fb829859 /builtin | |
| parent | 0a15e94e1065419da3ad1bab3b79501a90cf2777 (diff) | |
| parent | 82823118b9cd397d6b626cc86a0e555069ea8253 (diff) | |
| download | git-6d71443d8e6da9e3d412f91b5f5e9dd95a058ed1.zip git-6d71443d8e6da9e3d412f91b5f5e9dd95a058ed1.tar.gz git-6d71443d8e6da9e3d412f91b5f5e9dd95a058ed1.tar.bz2 | |
Merge branch 'jt/push-negotiation-fixes' into maint
Bugfix for common ancestor negotiation recently introduced in "git
push" codepath.
* jt/push-negotiation-fixes:
fetch: die on invalid --negotiation-tip hash
send-pack: fix push nego. when remote has refs
send-pack: fix push.negotiate with remote helper
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fetch.c | 4 | ||||
| -rw-r--r-- | builtin/send-pack.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 25740c1..e064687 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; } diff --git a/builtin/send-pack.c b/builtin/send-pack.c index a7e0166..729dea1 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -230,6 +230,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) args.atomic = atomic; args.stateless_rpc = stateless_rpc; args.push_options = push_options.nr ? &push_options : NULL; + args.url = dest; if (from_stdin) { if (args.stateless_rpc) { |