[PATCH v2] fetch: don't try to update unfetched tracking refs
- From
John Keeping <john@keeping.me.uk>
- Date
- May 27, 2013, 16:33 UTC
- Message-ID
- <20130527163308.GO27005@serenity.lan>
- In-Reply-To
- <20130527161934.GB9235@sigill.intra.peff.net>
Since commit f269048 (fetch: opportunistically update tracking refs, 2013-05-11) we update tracking refs opportunistically when fetching remote branches. However, if there is a configured non-pattern refspec that does not match any of the refspecs given on the command line then a fatal error occurs.
Fix this by setting the "missing_ok" flag when calling get_fetch_map.
Test-added-by: Jeff King <peff@peff.net> Signed-off-by: John Keeping <john@keeping.me.uk> Acked-by: Jeff King <peff@peff.net> --- On Mon, May 27, 2013 at 12:19:34PM -0400, Jeff King wrote:
Show 19 quoted lines
> On Mon, May 27, 2013 at 05:01:29PM +0100, John Keeping wrote: > > > > I'm not sure I understand what the last sentence means. I tried to add a > > > test like: > > [...] > > > but it does not fail with the existing code. Can you give an example > > > that fails? > > > > I have this in my .git/config for git.git: > > > > [remote "origin"] > > url = git://github.com/gitster/git > > fetch = +refs/heads/*:refs/remotes/origin/* > > fetch = +refs/notes/amlog:refs/notes/amlog > > Ah, I see. It is not "the refspec on the command-line does not match a > configured refspec", but rather "there exists a configured non-pattern > refspec that does not match what was on the command-line (even if what > was on the command-line did match another refspec)".
Exactly. I've changed the commit message to (hopefully) make this clearer.
> So your fix makes perfect sense. Do you mind squashing in this test
> below? I think it is a little less subtle than what you posted, as it
> sets up the situation explicitly in the test. It also checks that the
> refs we _did_ match still get updated ("master" in this case).Done.
builtin/fetch.c | 2 +- t/t5510-fetch.sh | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c index e41cc0d..d15a734 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -183,7 +183,7 @@ static struct ref *get_ref_map(struct transport *transport, old_tail = tail; for (i = 0; i < transport->remote->fetch_refspec_nr; i++) get_fetch_map(ref_map, &transport->remote->fetch[i], - &tail, 0); + &tail, 1); for (rm = *old_tail; rm; rm = rm->next) rm->fetch_head_status = FETCH_HEAD_IGNORE; } else { diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index ff43e08..fde6891 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -422,6 +422,22 @@ test_expect_success 'configured fetch updates tracking' ' ) ' +test_expect_success 'non-matching refspecs do not confuse tracking update' ' + cd "$D" && + git update-ref refs/odd/location HEAD && + ( + cd three && + git update-ref refs/remotes/origin/master base-origin-master && + git config --add remote.origin.fetch \ + refs/odd/location:refs/remotes/origin/odd && + o=$(git rev-parse --verify refs/remotes/origin/master) && + git fetch origin master && + n=$(git rev-parse --verify refs/remotes/origin/master) && + test "$o" != "$n" && + test_must_fail git rev-parse --verify refs/remotes/origin/odd + ) +' + test_expect_success 'pushing nonexistent branch by mistake should not segv' ' cd "$D" &&
-- 1.8.3.rc3.438.gb3e4ae3