[PATCH 2/3] fetch --prune: Always print header url
- From
- Tom Miller <jackerran@gmail.com>
- Date
- Dec 18, 2013, 21:22 UTC
- Message-ID
- <1387401776-30994-2-git-send-email-jackerran@gmail.com>
- In-Reply-To
- <1387401776-30994-1-git-send-email-jackerran@gmail.com>
If fetch --prune is run with no new refs to fetch, but it has refs to prune. Then, the header url is not printed as it would if there were new refs to fetch. the following is example output showing this behavior:
$ git fetch --prune --dry-run origin x [deleted] (none) -> origin/world
After this patch the output of fetch --prune should look like this:
$ git fetch --prune --dry-run origin From https://github.com/git/git x [deleted] (none) -> origin/test
Signed-off-by: Tom Miller <jackerran@gmail.com> --- builtin/fetch.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c index b3145f6..e50b697 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -732,7 +732,8 @@ static int fetch_refs(struct transport *transport, struct ref *ref_map) return ret; } -static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map) +static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map, + const char *raw_url) { int result = 0; struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map); @@ -744,6 +745,7 @@ static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map) if (!dry_run) result |= delete_ref(ref->name, NULL, 0); if (verbosity >= 0) { + print_url(raw_url); fprintf(stderr, " x %-*s %-*s -> %s\n", TRANSPORT_SUMMARY(_("[deleted]")), REFCOL_WIDTH, _("(none)"), prettify_refname(ref->name)); @@ -878,11 +880,12 @@ static int do_fetch(struct transport *transport, * don't care whether --tags was specified. */ if (ref_count) { - prune_refs(refs, ref_count, ref_map); + prune_refs(refs, ref_count, ref_map, transport->url); } else { prune_refs(transport->remote->fetch, transport->remote->fetch_refspec_nr, - ref_map); + ref_map, + transport->url); } } free_refs(ref_map);
-- 1.8.5.1.163.gd7aced9