summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2016-06-26 05:58:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-27 17:58:02 (GMT)
commit2cb040baa6fcb8a6314a54933cbcb4d3fcb60401 (patch)
treecfcef2f1400ad420322b564053bab873b1a2541a /builtin
parentd0b39a03cd5d6d5f9e2eac4907d9f47ec3d821da (diff)
downloadgit-2cb040baa6fcb8a6314a54933cbcb4d3fcb60401.zip
git-2cb040baa6fcb8a6314a54933cbcb4d3fcb60401.tar.gz
git-2cb040baa6fcb8a6314a54933cbcb4d3fcb60401.tar.bz2
fetch: change flag code for displaying tag update and deleted ref
This makes the fetch flag code consistent with push, where '-' means deleted ref. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/fetch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index a7f152a..8177f90 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -500,7 +500,7 @@ static int update_local_ref(struct ref *ref,
starts_with(ref->name, "refs/tags/")) {
int r;
r = s_update_ref("updating tag", ref, 0);
- format_display(display, r ? '!' : '-', _("[tag update]"),
+ format_display(display, r ? '!' : 't', _("[tag update]"),
r ? _("unable to update local ref") : NULL,
remote, pretty_ref);
return r;
@@ -814,7 +814,7 @@ static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map,
fprintf(stderr, _("From %.*s\n"), url_len, url);
shown_url = 1;
}
- format_display(&sb, 'x', _("[deleted]"), NULL,
+ format_display(&sb, '-', _("[deleted]"), NULL,
_("(none)"), prettify_refname(ref->name));
fprintf(stderr, " %s\n",sb.buf);
strbuf_release(&sb);