From: Gabriel Souza Franco <gabrielfrancosouza@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Gabriel Souza Franco <gabrielfrancosouza@gmail.com>,
Jeff King <peff@peff.net>,
git@vger.kernel.org
Subject: [PATCH v2] fetch-pack: fix object_id of exact sha1
Date: Sun, 28 Feb 2016 19:22:24 -0300 [thread overview]
Message-ID: <1456698144-11519-1-git-send-email-gabrielfrancosouza@gmail.com> (raw)
In-Reply-To: <xmqqh9gseiqk.fsf@gitster.mtv.corp.google.com>
Commit 58f2ed0 (remote-curl: pass ref SHA-1 to fetch-pack as well,
2013-12-05) added support for specifying a SHA-1 as well as a ref name.
Add support for specifying just a SHA-1 and set the ref name to the same
value in this case.
Signed-off-by: Gabriel Souza Franco <gabrielfrancosouza@gmail.com>
---
Not the cleanest conditional I've ever written, but it should handle
all cases correctly.
builtin/fetch-pack.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 79a611f..763f510 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -16,10 +16,12 @@ static void add_sought_entry(struct ref ***sought, int *nr, int *alloc,
struct ref *ref;
struct object_id oid;
- if (!get_oid_hex(name, &oid) && name[GIT_SHA1_HEXSZ] == ' ')
- name += GIT_SHA1_HEXSZ + 1;
- else
+ if (get_oid_hex(name, &oid) ||
+ (name[GIT_SHA1_HEXSZ] != ' ' &&
+ name[GIT_SHA1_HEXSZ] != '\0'))
oidclr(&oid);
+ else if (name[GIT_SHA1_HEXSZ] == ' ')
+ name += GIT_SHA1_HEXSZ + 1;
ref = alloc_ref(name);
oidcpy(&ref->old_oid, &oid);
--
2.7.2
next prev parent reply other threads:[~2016-02-28 22:22 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-27 12:43 [PATCH] fetch-pack: fix unadvertised requests validation Gabriel Souza Franco
2016-02-27 18:25 ` Junio C Hamano
2016-02-27 18:32 ` Junio C Hamano
2016-02-27 18:38 ` Junio C Hamano
2016-02-27 19:07 ` Jeff King
2016-02-27 19:19 ` Jeff King
2016-02-27 20:28 ` Gabriel Souza Franco
2016-02-27 20:32 ` [PATCH] fetch-pack: fix object_id of exact sha1 Gabriel Souza Franco
2016-02-27 22:12 ` Jeff King
2016-02-27 22:23 ` Gabriel Souza Franco
2016-02-28 19:29 ` Junio C Hamano
2016-02-28 22:22 ` Gabriel Souza Franco [this message]
2016-02-29 8:30 ` [PATCH v2] " Johannes Schindelin
2016-02-29 10:00 ` Jeff King
2016-03-01 2:08 ` Gabriel Souza Franco
2016-03-01 2:12 ` [PATCH v3] " Gabriel Souza Franco
2016-03-01 4:54 ` Jeff King
2016-03-03 23:35 ` Gabriel Souza Franco
2016-03-04 0:50 ` Jeff King
2016-03-05 1:11 ` [PATCH v4] " Gabriel Souza Franco
2016-03-05 16:59 ` Jeff King
2016-03-05 18:54 ` Junio C Hamano
2016-03-05 19:34 ` [PATCH] fetch-pack: update the documentation for "<refs>..." arguments Gabriel Souza Franco
2016-03-05 19:35 ` Junio C Hamano
2016-03-01 4:40 ` [PATCH v2] fetch-pack: fix object_id of exact sha1 Jeff King
2016-02-29 9:50 ` [PATCH] " Jeff King
2016-02-27 22:08 ` [PATCH] fetch-pack: fix unadvertised requests validation Jeff King
2016-02-28 19:14 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456698144-11519-1-git-send-email-gabrielfrancosouza@gmail.com \
--to=gabrielfrancosouza@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).