[PATCH v4 3/5] fetch: change flag code for displaying tag update and deleted ref
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Jun 26, 2016, 05:58 UTC
- Message-ID
- <20160626055810.26960-4-pclouds@gmail.com>
- In-Reply-To
- <20160626055810.26960-1-pclouds@gmail.com>
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> --- 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 cbf441f..771dde5 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 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);
-- 2.8.2.526.g02eed6d