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

Re: [PATCH v2 2/2] status: improve rebase todo list parsing

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Jun 1, 2026, 15:20 UTC
Message-ID
<4fafee2c-4151-45f4-a842-17d6b77d951c@gmail.com>
In-Reply-To
<xmqqbjdwcsno.fsf@gitster.g>
Hi Junio
On 31/05/2026 01:46, Junio C Hamano wrote:
Show 13 quoted lines
> Phillip Wood <phillip.wood123@gmail.com> writes:
> 
>> +static void abbrev_oid_in_line(struct repository *r,
>> +			       struct strbuf *line, char **pp)
>> +{
>> ...
>> +	have_oid = !repo_get_oid(r, p, &oid);
>> +	*end_of_object_name = saved;
>> +	if (!have_oid)
>> +		goto out; /* object name was a label */
> 
> Can there be a label "deadbeef123" that is unrelated to an object whose
> object name happens to abbreviate to "deadbeef123"?

In theory yes, but I had assumed it was so unlikely to happen that we could ignore it. If we want to be more careful then we could add a "bool maybe_label" argument for commands that accept a label or a revision and check if "refs/rewritten/$object_name" exists before trying repo_get_oid().

Show 15 quoted lines
>> +	case TODO_MERGE:
>> +		skip_dash_c(&p);
>> +		while (true) {
>> +			p += strspn(p, " \t");
>> +			if (!p[0] || (p[0] == '#' && (!p[1] || isspace(p[1]))))
>> +				break;
>> +			abbrev_oid_in_line(r, line, &p);
>> +		}
>> +		break;
> 
> What does this loop do?  A "merge" command may look like "merge
> [[-C|-c] <commit>] <label>", and we give each whitespace-separated
> token to abbrev_oid_in_line()?  Would "<label>" that is ambiguous
> cause an issue?  You may want to limit the scope of what the loop
> does a bit, e.g., massage only the token after -C/-c, or something?

The parents can be a label or any revision so we want to abbreviate the parent if it is a hex object id. The same is true for "reset" below.

Thanks
Phillip
Show 38 quoted lines
> 
>> +	case TODO_FIXUP:
>> +		skip_dash_c(&p);
>> +		/* fallthrough */
>> +	case TODO_DROP:
>> +	case TODO_EDIT:
>> +	case TODO_PICK:
>> +	case TODO_RESET:
> 
> Doesn't RESET also take a <label>?  And if it happens to be the same
> as an abbreviated object name, e.g., "deadbeef123", of an unrelated
> object, would wt-status say "reset deadbeef1", causing a mismatch?
> If this is indeed an issue, would moving this to the "no-op" section
> below, next to TODO_LABEL, solve it?
> 
>> +	case TODO_REVERT:
>> +	case TODO_REWORD:
>> +	case TODO_SQUASH:
>> +		abbrev_oid_in_line(r, line, &p);
>> +		break;
>> +
>> +	/*
>> +	 * Avoid "default" and instead list all the other commands so
>> +	 * that -Wswitch (which is included in -Wall) warns if a new
>> +	 * command is added without handling it in this function.
>> +	 */
>> +	case TODO_BREAK:
>> +	case TODO_EXEC:
>> +	case TODO_LABEL:
>> +	case TODO_NOOP:
>> +	case TODO_UPDATE_REF:
>> +		break;
>>   	}
>> -	string_list_clear(&split, 0);
>> +
>> +	return true;
>>   }
> 
Previous: Junio C HamanoNext: Junio C Hamano
Message 15 of 29 in “status: improve rebase todo list parsing”
  1. 0/2 status: improve rebase todo list parsingPhillip Wood, Apr 20, 2026
  2. 1/2 sequencer: factor out parsing of todo commandsPhillip Wood, Apr 20, 2026
  3. Elijah NewrenApr 22, 2026
  4. 2/2 status: improve rebase todo list parsingPhillip Wood, Apr 20, 2026
  5. Tian YuchenApr 20, 2026
  6. Phillip WoodApr 21, 2026
  7. Elijah NewrenApr 22, 2026
  8. Patrick SteinhardtApr 22, 2026
  9. Phillip WoodApr 22, 2026
  10. Phillip WoodApr 22, 2026
  11. 0/2 status: improve rebase todo list parsingPhillip Wood, May 1, 2026
  12. 1/2 sequencer: factor out parsing of todo commandsPhillip Wood, May 1, 2026
  13. 2/2 status: improve rebase todo list parsingPhillip Wood, May 1, 2026
  14. Junio C HamanoMay 31, 2026
  15. Phillip WoodJun 1, 2026
  16. Junio C HamanoJun 11, 2026
  17. Phillip WoodJun 22, 2026
  18. Phillip WoodMay 1, 2026
  19. 0/2 status: improve rebase todo list parsingPhillip Wood, Jun 22, 2026
  20. 1/2 sequencer: factor out parsing of todo commandsPhillip Wood, Jun 22, 2026
  21. Junio C HamanoJun 22, 2026
  22. Phillip WoodJun 23, 2026
  23. 2/2 status: improve rebase todo list parsingPhillip Wood, Jun 22, 2026
  24. Junio C HamanoJun 22, 2026
  25. Junio C HamanoJun 22, 2026
  26. Phillip WoodJun 23, 2026
  27. 0/2 status: improve rebase todo list parsingPhillip Wood, Jun 23, 2026
  28. 1/2 sequencer: factor out parsing of todo commandsPhillip Wood, Jun 23, 2026
  29. 2/2 status: improve rebase todo list parsingPhillip Wood, Jun 23, 2026

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.