git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/3] send-pack: track errors for each ref

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 17, 2007, 20:53 UTC
Message-ID
<7v6400twzp.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<20071117125426.GA23186@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 11 quoted lines
> 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
Show 18 quoted lines
> @@ -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...
Show 19 quoted lines
> +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.
Previous: Jeff KingNext: Jeff King
Message 8 of 20 in “tracking per-ref errors on push”
  1. 0/3 tracking per-ref errors on pushJeff King, Nov 17, 2007
  2. 1/3 send-pack: track errors for each refJeff King, Nov 17, 2007
  3. Alex RiesenNov 17, 2007
  4. Daniel BarkalowNov 17, 2007
  5. Jeff KingNov 18, 2007
  6. Junio C HamanoNov 18, 2007
  7. Jeff KingNov 18, 2007
  8. Junio C HamanoNov 17, 2007
  9. Jeff KingNov 18, 2007
  10. 2/3 send-pack: check ref->status before updating tracking refsJeff King, Nov 17, 2007
  11. Alex RiesenNov 17, 2007
  12. Jeff KingNov 17, 2007
  13. Daniel BarkalowNov 17, 2007
  14. 3/3 send-pack: assign remote errors to each refJeff King, Nov 17, 2007
  15. Daniel BarkalowNov 17, 2007
  16. Jeff KingNov 18, 2007
  17. Junio C HamanoNov 18, 2007
  18. Jeff KingNov 18, 2007
  19. Junio C HamanoNov 18, 2007
  20. Jeff KingNov 18, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.