summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar John Keeping <john@keeping.me.uk>2013-05-27 17:33:09 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-28 08:13:14 -0700
commit823c6d56a83f3eec657a94581c23c5b7682bdaf4 (patch)
tree45474c59c4754cc19b203e61183c6a3982a1aa15 /mergetools
parentfetch: opportunistically update tracking refs (diff)
downloadtgif-823c6d56a83f3eec657a94581c23c5b7682bdaf4.tar.xz
fetch: don't try to update unfetched tracking refs
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions