aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-05 19:16:12 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-05 19:16:12 -0700
commit9c36e1700f99811ea9190279ea197424dcbb0303 (patch)
tree0ab14ca56f74f6f4b9e37f18afafe462f12bf31e
parentb79c9859c8eb3bb4390f91320e126199ff884907 (diff)
parente5c49826d26e71ea18ff3010ef75edb1849df7ec (diff)
downloadgit-9c36e1700f99811ea9190279ea197424dcbb0303.tar.gz
git-9c36e1700f99811ea9190279ea197424dcbb0303.tar.xz
Merge branch 'jk/fetch-status'
* jk/fetch-status: git-fetch: always show status of non-tracking-ref fetches
-rw-r--r--builtin-fetch.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin-fetch.c b/builtin-fetch.c
index 167f94803..e56617e32 100644
--- a/builtin-fetch.c
+++ b/builtin-fetch.c
@@ -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",