Skip to content

Commit

Permalink
Merge branch 'jk/fetch-status'
Browse files Browse the repository at this point in the history
* jk/fetch-status:
  git-fetch: always show status of non-tracking-ref fetches
  • Loading branch information
Junio C Hamano committed May 6, 2008
2 parents b79c985 + e5c4982 commit 9c36e17
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions builtin-fetch.c
Original file line number Diff line number Diff line change
Expand Up @@ -360,12 +360,10 @@ static int store_updated_refs(const char *url, struct ref *ref_map)

if (ref)
update_local_ref(ref, what, verbose, note);
else if (verbose)
else
sprintf(note, "* %-*s %-*s -> FETCH_HEAD",
SUMMARY_WIDTH, *kind ? kind : "branch",
REFCOL_WIDTH, *what ? what : "HEAD");
else
*note = '\0';
if (*note) {
if (!shown_url) {
fprintf(stderr, "From %.*s\n",
Expand Down

0 comments on commit 9c36e17

Please sign in to comment.