summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Johan Herland <johan@herland.net>2013-09-08 22:58:12 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-09 11:02:52 -0700
commit81f339dc3d7f4f1dcec01f8d74be922e882ffc82 (patch)
tree0423716a6ec99113c4953e4f056383ad1ec41448 /builtin
parentt2024: Fix &&-chaining and a couple of typos (diff)
downloadtgif-81f339dc3d7f4f1dcec01f8d74be922e882ffc82.tar.xz
t3200: Minor fix when preparing for tracking failure
We're testing that trying to --track a ref that is not covered by any remote refspec should fail. For that, we want to have refs/remotes/local/master present, but we also want the remote.local.fetch refspec to NOT match refs/remotes/local/master (so that the tracking setup will fail, as intended). However, when doing "git fetch local" to ensure the existence of refs/remotes/local/master, we must not already have changed remote.local.fetch so as to cause refs/remotes/local/master not to be fetched. Therefore, set remote.local.fetch to refs/heads/*:refs/remotes/local/* BEFORE we fetch, and then reset it to refs/heads/s:refs/remotes/local/s AFTER we have fetched (but before we test --track). Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions