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

Re: [PATCH] replace: parse revision argument for -d

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Oct 29, 2012, 10:08 UTC
Message-ID
<508E55B2.6060502@drmicha.warpmail.net>
In-Reply-To
<20121029090419.GA29464@sigill.intra.peff.net>
Jeff King venit, vidit, dixit 29.10.2012 10:04:
Show 31 quoted lines
> On Mon, Oct 29, 2012 at 10:02:47AM +0100, Michael J Gruber wrote:
> 
>> Jeff King venit, vidit, dixit 29.10.2012 07:58:
>>> On Fri, Oct 26, 2012 at 03:33:27PM +0200, Michael J Gruber wrote:
>>>
>>>>  	for (p = argv; *p; p++) {
>>>> -		if (snprintf(ref, sizeof(ref), "refs/replace/%s", *p)
>>>> +		q = *p;
>>>> +		if (get_sha1(q, sha1))
>>>> +			warning("Failed to resolve '%s' as a valid ref; taking it literally.", q);
>>>> +		else
>>>> +			q = sha1_to_hex(sha1);
>>>
>>> Doesn't get_sha1 already handle this for 40-byte sha1s (and for anything
>>> else, it would not work anyway)?
>>
>> What is "this"???
>>
>> So far, "git replace -d <rev>" only accepts a full sha1, because it uses
>> it literally as a ref name "resf/replace/<rev>" without resolving anything.
>>
>> The patch makes it so that <rev> gets resolved to a sha1 even if it is
>> abbreviated, and then it gets used.
>>
>> Or do you mean the warning?
> 
> Sorry, yeah, I meant the warning and fallback.
> 
> If I understand correctly, the fallback will never work unless we are
> fed a 40-byte sha1. But get_sha1 should always return a 40-byte sha1
> without doing any further processing.

You do understand correctly, and I misunderstood get_sha1(). I does not check for the presence of that sha1 in the object db, so that it succeeds no matter what, that is: if it's valid hex. So I should probably rewrite the error handling: no more need to check for lengths.

Michael
Previous: Jeff KingNext: Michael J Gruber
Message 6 of 22 in “replace: parse revision argument for -d”
  1. replace: parse revision argument for -dMichael J Gruber, Oct 26, 2012
  2. Christian CouderOct 26, 2012
  3. Jeff KingOct 29, 2012
  4. Michael J GruberOct 29, 2012
  5. Jeff KingOct 29, 2012
  6. Michael J GruberOct 29, 2012
  7. [PATCHv2] replace: parse revision argument for -dMichael J Gruber, Oct 29, 2012
  8. Jeff KingNov 9, 2012
  9. Michael J GruberNov 12, 2012
  10. [PATCHv3] replace: parse revision argument for -dMichael J Gruber, Nov 12, 2012
  11. Jeff KingNov 12, 2012
  12. Michael J GruberNov 13, 2012
  13. [PATCHv4] replace: parse revision argument for -dMichael J Gruber, Nov 13, 2012
  14. Jeff KingNov 13, 2012
  15. Notes in format-patch (was: Re: [PATCHv3] replace: parse revision argument for -d)Michael J Gruber, Nov 13, 2012
  16. Jeff KingNov 13, 2012
  17. Junio C HamanoNov 13, 2012
  18. Junio C HamanoNov 13, 2012
  19. Junio C HamanoNov 13, 2012
  20. Junio C HamanoNov 13, 2012
  21. Michael J GruberNov 14, 2012
  22. Junio C HamanoNov 14, 2012

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.