On Mon, May 27, 2013 at 11:42:52AM -0400, Jeff King wrote:
> On Mon, May 27, 2013 at 12:40:25PM +0100, John Keeping wrote:
>
> > Since commit f269048 (fetch: opportunistically update tracking refs,
> > 2013-05-11) we update tracking refs opportunistically when fetching
> > remote branches. However, if a refspec is given on the command line
> > that does not include a configured (non-pattern) refspec a fatal error
> > occurs.
>
> I'm not sure I understand what the last sentence means. I tried to add a
> test like:
>
> diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
> index ff43e08..02e30e1 100755
> --- a/t/t5510-fetch.sh
> +++ b/t/t5510-fetch.sh
> @@ -422,6 +422,16 @@ test_expect_success 'configured fetch updates tracking' '
> )
> '
>
> +test_expect_success 'non-configured ref does not confuse tracking update' '
> + cd "$D" &&
> + git update-ref refs/odd/location HEAD &&
> + (
> + cd three &&
> + git fetch origin refs/odd/location &&
> + git rev-parse --verify FETCH_HEAD
> + )
> +'
> +
> test_expect_success 'pushing nonexistent branch by mistake should not segv' '
>
> cd "$D" &&
>
> 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
Then doing "git fetch origin master" fails because:
fatal: Couldn't find remote ref refs/notes/amlog
The following test fails for me (and passes with my patch) - note that
in "two", remote.one.fetch is configured as
"refs/heads/master:refs/heads/one".
-- >8 --
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index ff43e08..c540257 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -422,6 +422,19 @@ test_expect_success 'configured fetch updates tracking' '
)
'
+test_expect_success 'configured ref does not confuse tracking' '
+
+ cd "$D" &&
+ (
+ cd one &&
+ git branch -f side
+ ) &&
+ (
+ cd two &&
+ git fetch one side
+ )
+'
+
test_expect_success 'pushing nonexistent branch by mistake should not segv' '
cd "$D" &&
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html