Merge branch 'jk/fetch-status'
* jk/fetch-status: git-fetch: always show status of non-tracking-ref fetches
This commit is contained in:
commit
9c36e1700f
@ -360,12 +360,10 @@ static int store_updated_refs(const char *url, struct ref *ref_map)
|
|||||||
|
|
||||||
if (ref)
|
if (ref)
|
||||||
update_local_ref(ref, what, verbose, note);
|
update_local_ref(ref, what, verbose, note);
|
||||||
else if (verbose)
|
else
|
||||||
sprintf(note, "* %-*s %-*s -> FETCH_HEAD",
|
sprintf(note, "* %-*s %-*s -> FETCH_HEAD",
|
||||||
SUMMARY_WIDTH, *kind ? kind : "branch",
|
SUMMARY_WIDTH, *kind ? kind : "branch",
|
||||||
REFCOL_WIDTH, *what ? what : "HEAD");
|
REFCOL_WIDTH, *what ? what : "HEAD");
|
||||||
else
|
|
||||||
*note = '\0';
|
|
||||||
if (*note) {
|
if (*note) {
|
||||||
if (!shown_url) {
|
if (!shown_url) {
|
||||||
fprintf(stderr, "From %.*s\n",
|
fprintf(stderr, "From %.*s\n",
|
||||||
|
Loading…
Reference in New Issue
Block a user