From 2cb040baa6fcb8a6314a54933cbcb4d3fcb60401 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Sun, 26 Jun 2016 07:58:08 +0200 Subject: [PATCH] fetch: change flag code for displaying tag update and deleted ref MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This makes the fetch flag code consistent with push, where '-' means deleted ref. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- Documentation/git-fetch.txt | 4 ++-- builtin/fetch.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index cbf441f671..771dde51cd 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -120,8 +120,8 @@ flag:: A single character indicating the status of the ref: (space);; for a successfully fetched fast-forward; `+`;; for a successful forced update; -`x`;; for a successfully pruned ref; -`-`;; for a successful tag update; +`-`;; for a successfully pruned ref; +`t`;; for a successful tag update; `*`;; for a successfully fetched new ref; `!`;; for a ref that was rejected or failed to update; and `=`;; for a ref that was up to date and did not need fetching. diff --git a/builtin/fetch.c b/builtin/fetch.c index a7f152a315..8177f90d41 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); -- 2.43.2