Jeff King <peff@xxxxxxxx> writes:
> Instead of keeping the 'ret' variable, we instead have a
> status flag for each ref that tracks what happened to it.
> We then print the ref status after all of the refs have
> been examined.
>
> This paves the way for three improvements:
> - updating tracking refs only for non-error refs
> - incorporating remote rejection into the printed status
> - printing errors in a different order than we processed
> (e.g., consolidating non-ff errors near the end with
> a special message)
Looks good.
Except that
> @@ -218,15 +219,105 @@ static const char *prettify_ref(const char *name)
>
> #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
>
> +static void print_ref_status(char flag, const char *summary, struct ref *to, struct ref *from, const char *msg)
> +{
> + fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary);
> + if (from)
> + fprintf(stderr, "%s -> %s", prettify_ref(from), prettify_ref(to));
> + else
> + fputs(prettify_ref(to), stderr);
> + if (msg) {
> + fputs(" (", stderr);
> + fputs(msg, stderr);
> + fputc(')', stderr);
> + }
> + fputc('\n', stderr);
> +}
msg is parenthesized here, so...
> +static void print_ok_ref_status(struct ref *ref)
> +{
> + if (ref->deletion)
> + print_ref_status('-', "[deleted]", ref, NULL, NULL);
> + else if (is_null_sha1(ref->old_sha1))
> + print_ref_status('*',
> + (!prefixcmp(ref->name, "refs/tags/") ? "[new tag]" :
> + "[new branch]"),
> + ref, ref->peer_ref, NULL);
> + else {
> + char quickref[83];
> + char type;
> + const char *msg;
> +
> + strcpy(quickref, status_abbrev(ref->old_sha1));
> + if (ref->nonfastforward) {
> + strcat(quickref, "...");
> + type = '+';
> + msg = " (forced update)";
... you do not need the " (" and ")" here.
All merged to 'next'. Thanks.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
