git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Gabriel Souza Franco <gabrielfrancosouza@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH v3] fetch-pack: fix object_id of exact sha1
Date: Mon, 29 Feb 2016 23:54:53 -0500	[thread overview]
Message-ID: <20160301045453.GB19272@sigill.intra.peff.net> (raw)
In-Reply-To: <1456798376-29904-1-git-send-email-gabrielfrancosouza@gmail.com>

On Mon, Feb 29, 2016 at 11:12:56PM -0300, Gabriel Souza Franco wrote:

> 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>
> ---
> 
> I did keep the oid variable because ref is uninitialized at that point,
> and this means having to copy either name or old_oid afterwards anyway.

Oh, right. That's why we had the variable in the first place (even in
the original, we could otherwise have gone without the extra variable).

>  builtin/fetch-pack.c | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)

The code looks good to me. Do we need documentation or test updates?

Here's a test that can be squashed in. For documentation, it looks like
we don't cover the "<sha1> <ref>" form at all. That's maybe OK, as it's
mostly for internal use by remote-http (though fetch-pack _is_ plumbing,
so perhaps some other remote-* could make use of it). But perhaps we
should document that "<sha1>" should work.

diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index e5f83bf..9b9bec4 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -531,6 +531,20 @@ test_expect_success 'shallow fetch with tags does not break the repository' '
 		git fsck
 	)
 '
+
+test_expect_success 'fetch-pack can fetch a raw sha1' '
+	git init hidden &&
+	(
+		cd hidden &&
+		test_commit 1 &&
+		test_commit 2 &&
+		git update-ref refs/hidden/one HEAD^ &&
+		git config transfer.hiderefs refs/hidden &&
+		git config uploadpack.allowtipsha1inwant true
+	) &&
+	git fetch-pack hidden $(git -C hidden rev-parse refs/hidden/one)
+'
+
 check_prot_path () {
 	cat >expected <<-EOF &&
 	Diag: url=$1

  reply	other threads:[~2016-03-01  4:55 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                 ` [PATCH v2] " Gabriel Souza Franco
2016-02-29  8:30                   ` 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 [this message]
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=20160301045453.GB19272@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=gabrielfrancosouza@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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).