diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-20 19:42:53 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-21 15:46:05 -0800 |
commit | b56fca07d2bac20339d59218ab98de38a9363e77 (patch) | |
tree | fc2c0a0703a248e8702f30c9153309d100a2cb29 /Makefile | |
parent | 75ea38df66910dcb9d09f1320ae2787b5bc8211e (diff) | |
download | git-b56fca07d2bac20339d59218ab98de38a9363e77.tar.gz |
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 'Makefile')
0 files changed, 0 insertions, 0 deletions