From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Carlos Martín Nieto" <cmn@elego.de>,
"Michael Schubert" <mschub@elegosoft.com>,
"Johan Herland" <johan@herland.net>, "Jeff King" <peff@peff.net>,
"Marc Branchaud" <marcnarc@xiplink.com>,
"Nicolas Pitre" <nico@fluxnic.net>,
"John Szakmeister" <john@szakmeister.net>
Subject: Re: [PATCH 02/15] t5510: prepare test refs more straightforwardly
Date: Thu, 24 Oct 2013 08:49:50 +0200 [thread overview]
Message-ID: <5268C30E.4050906@alum.mit.edu> (raw)
In-Reply-To: <xmqq61snrg0q.fsf@gitster.dls.corp.google.com>
On 10/23/2013 08:36 PM, Junio C Hamano wrote:
> Michael Haggerty <mhagger@alum.mit.edu> writes:
>
>> "git fetch" was being used with contrived refspecs to create tags and
>> remote-tracking branches in test repositories in preparation for the
>> actual tests. This is obscure and also makes one wonder whether this
>> is indeed just preparation or whether some side-effect of "git fetch"
>> is being tested.
>>
>> So use the more straightforward commands "git tag" / "git update-ref"
>> when preparing branches in test repositories.
>>
>> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
>> ---
>> t/t5510-fetch.sh | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
>> index c5e5dfc..08d8dbb 100755
>> --- a/t/t5510-fetch.sh
>> +++ b/t/t5510-fetch.sh
>> @@ -88,7 +88,7 @@ test_expect_success 'fetch --prune on its own works as expected' '
>> cd "$D" &&
>> git clone . prune &&
>> cd prune &&
>> - git fetch origin refs/heads/master:refs/remotes/origin/extrabranch &&
>> + git update-ref refs/remotes/origin/extrabranch master &&
>
> As long as you have checked that our local 'master' should be at the
> same commit as the origin's 'master' at this point, I think this
> change is OK.
It doesn't matter what the reference points at; the only point of these
tests is to check whether branches that look like stale remote-tracking
branches are pruned or not by the later command.
> I wouldn't call the use of "very explicit, without any room for
> mistake" refspecs "contrived", though.
According to Wiktionary, contrived means "unnatural, forced".
When the goal is just to create a local reference whose contents are
irrelevant, "fetch" is not the first command that comes to my mind. It
brings a lot of unnecessary machinery to bear on such a trivial task.
Plus it is not very common in daily life to invoke "fetch" with a
complicated, asymmetic refspec like this. Because of that it cost me a
little extra time to convince myself that the "fetch" command wasn't
trying to do something more. In that sense it seems "contrived" to me.
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/
next prev parent reply other threads:[~2013-10-24 6:57 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-13 2:54 Local tag killer Michael Haggerty
2013-09-13 4:03 ` Junio C Hamano
2013-09-20 22:51 ` Junio C Hamano
2013-09-21 6:42 ` Michael Haggerty
2013-09-21 12:28 ` John Szakmeister
2013-09-24 7:51 ` Jeff King
2013-09-24 13:22 ` Marc Branchaud
2013-09-25 8:22 ` Jeff King
2013-09-25 22:54 ` Nicolas Pitre
2013-09-28 12:20 ` Michael Haggerty
2013-09-28 21:42 ` Johan Herland
2013-09-29 4:29 ` Michael Haggerty
2013-09-29 9:30 ` Johan Herland
2013-09-30 15:24 ` Marc Branchaud
2013-09-30 15:52 ` Nicolas Pitre
2013-09-30 19:16 ` Marc Branchaud
2013-09-30 20:08 ` Nicolas Pitre
2013-09-30 21:14 ` Marc Branchaud
2013-09-30 22:44 ` Nicolas Pitre
2013-09-30 23:18 ` Jeff King
2013-10-01 3:04 ` Marc Branchaud
2013-10-01 3:28 ` Nicolas Pitre
2013-10-01 12:45 ` Marc Branchaud
2013-10-23 15:50 ` [PATCH 00/15] Change semantics of "fetch --tags" Michael Haggerty
2013-10-23 15:50 ` [PATCH 01/15] t5510: use the correct tag name in test Michael Haggerty
2013-10-23 15:50 ` [PATCH 02/15] t5510: prepare test refs more straightforwardly Michael Haggerty
2013-10-23 18:36 ` Junio C Hamano
2013-10-24 6:49 ` Michael Haggerty [this message]
2013-10-24 19:50 ` Junio C Hamano
2013-10-23 15:50 ` [PATCH 03/15] t5510: check that "git fetch --prune --tags" does not prune branches Michael Haggerty
2013-10-23 15:50 ` [PATCH 04/15] api-remote.txt: correct section "struct refspect" Michael Haggerty
2013-10-23 18:43 ` Junio C Hamano
2013-10-24 7:06 ` Michael Haggerty
2013-10-23 15:50 ` [PATCH 05/15] get_ref_map(): rename local variables Michael Haggerty
2013-10-23 18:45 ` Junio C Hamano
2013-10-24 7:24 ` Michael Haggerty
2013-10-23 15:50 ` [PATCH 06/15] ref_remove_duplicates(): avoid redundant bisection Michael Haggerty
2013-10-23 15:50 ` [PATCH 07/15] ref_remove_duplicates(): simplify function Michael Haggerty
2013-10-23 15:50 ` [PATCH 08/15] ref_remove_duplicates(): improve documentation comment Michael Haggerty
2013-10-23 18:47 ` Junio C Hamano
2013-10-23 15:50 ` [PATCH 09/15] builtin/fetch.c: reorder function definitions Michael Haggerty
2013-10-23 15:50 ` [PATCH 10/15] fetch --tags: fetch tags *in addition to* other stuff Michael Haggerty
2013-10-24 20:51 ` Junio C Hamano
2013-10-25 15:08 ` Michael Haggerty
2013-10-28 19:10 ` Junio C Hamano
2013-10-30 4:26 ` Michael Haggerty
2013-10-26 5:10 ` Michael Haggerty
2013-10-23 15:50 ` [PATCH 11/15] fetch --prune: prune only based on explicit refspecs Michael Haggerty
2013-10-24 21:11 ` Junio C Hamano
2013-10-26 6:49 ` Michael Haggerty
2013-10-28 15:08 ` Junio C Hamano
2013-10-23 15:50 ` [PATCH 12/15] query_refspecs(): move some constants out of the loop Michael Haggerty
2013-10-23 15:50 ` [PATCH 13/15] builtin/remote.c: reorder function definitions Michael Haggerty
2013-10-23 15:50 ` [PATCH 14/15] builtin/remote.c:update(): use struct argv_array Michael Haggerty
2013-10-23 15:50 ` [PATCH 15/15] fetch, remote: properly convey --no-prune options to subprocesses Michael Haggerty
2013-10-24 21:17 ` Junio C Hamano
2013-10-23 16:59 ` [PATCH 00/15] Change semantics of "fetch --tags" 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=5268C30E.4050906@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=cmn@elego.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johan@herland.net \
--cc=john@szakmeister.net \
--cc=marcnarc@xiplink.com \
--cc=mschub@elegosoft.com \
--cc=nico@fluxnic.net \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.