| commit | b56fca07d2bac20339d59218ab98de38a9363e77 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Feb 2008 03:42:53 +0000 (20 19:42 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Feb 2008 23:46:05 +0000 (21 15:46 -0800) | ||
| tree | fc2c0a0703a248e8702f30c9153309d100a2cb29 | treesnapshot (tar.gz zip) |
| parent | 75ea38df66910dcb9d09f1320ae2787b5bc8211e | commitdiff |
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>
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>
| builtin-checkout.c | diffblobblamehistory |