summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-02-20 19:42:53 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-02-21 15:46:05 -0800
commitb56fca07d2bac20339d59218ab98de38a9363e77 (patch)
treefc2c0a0703a248e8702f30c9153309d100a2cb29 /git.c
parentbuiltin-checkout.c: Remove unused prefix arguments in switch_branches path (diff)
downloadtgif-b56fca07d2bac20339d59218ab98de38a9363e77.tar.xz
checkout: updates to tracking report
Ask branch_get() for the new branch explicitly instead of letting it return a potentially stale information. Tighten the logic to find the tracking branch to deal better with misconfigured repositories (i.e. branch.*.merge can exist but it may not have a refspec that fetches to .it) Also fixes grammar in a message, as pointed out by Jeff King. The function is about reporting and not automatically fast-forwarding to the upstream, so stop calling it "adjust-to". Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Daniel Barkalow <barkalow@iabervon.org>
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions