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

Re: [PATCH 1/5] replace: forbid replacing an object with one of a different type

From
Christian Couder <chriscool@tuxfamily.org>
Date
Aug 25, 2013, 19:44 UTC
Message-ID
<20130825.214417.1308749312477487067.chriscool@tuxfamily.org>
In-Reply-To
<521A4E83.9000400@kdbg.org>
From: Johannes Sixt <j6t@kdbg.org>
Show 12 quoted lines
> Am 25.08.2013 15:06, schrieb Christian Couder:
>> @@ -100,6 +101,15 @@ static int replace_object(const char *object_ref, const char *replace_ref,
>>  	if (check_refname_format(ref, 0))
>>  		die("'%s' is not a valid ref name.", ref);
>>  
>> +	obj_type = sha1_object_info(object, NULL);
>> +	repl_type = sha1_object_info(repl, NULL);
>> +	if (obj_type != repl_type)
>> +		die("Objects must be of the same type.\n"
>> +		    "Object ref '%s' is of type '%s'\n"
> 
> Is it really an "Object ref", not just an "Object"?

Well, it is what is passed to the command line. It is then converted into an hex sha1 using get_sha1() and then sha1_to_hex().

What about:
     		die("Objects must be of the same type.\n"
		    "'%s' points to a replaced object of type '%s'\n"
		    "while '%s' points to a replacement object of type '%s'.",
> BTW, I appreciate your choice of where in the sentence the line breaks are.

Thanks, Christian.

Previous: Johannes SixtNext: Johannes Sixt
Message 4 of 11 in “Check replacement object type and minor updates”
  1. 0/5 Check replacement object type and minor updatesChristian Couder, Aug 25, 2013
  2. 1/5 replace: forbid replacing an object with one of a different typeChristian Couder, Aug 25, 2013
  3. Johannes SixtAug 25, 2013
  4. Christian CouderAug 25, 2013
  5. Johannes SixtAug 25, 2013
  6. Christian CouderAug 26, 2013
  7. 2/5 Documentation/replace: state that objects must be of the same typeChristian Couder, Aug 25, 2013
  8. 3/5 t6050-replace: test that objects are of the same typeChristian Couder, Aug 25, 2013
  9. Johannes SixtAug 25, 2013
  10. 4/5 t6050-replace: add test to clean up all the replace refsChristian Couder, Aug 25, 2013
  11. 5/5 Documentation/replace: add Creating Replacement Objects sectionChristian Couder, Aug 25, 2013

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.