{"thread":{"id":"22489","subject":"[PATCH] Correct spelling of 'REUC' extension","startedAt":"2010-02-02T15:33:28Z","lastAt":"2010-02-02T18:13:09Z","messageCount":2,"participants":["Shawn O. Pearce","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"133363","messageId":"20100202153328.GB9687@spearce.org","threadId":"22489","inReplyTo":null,"subject":"[PATCH] Correct spelling of 'REUC' extension","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2010-02-02T15:33:28Z","receivedAt":"2010-02-02T15:33:28Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"The new dircache extension CACHE_EXT_RESOLVE_UNDO, whose value is\n0x52455543, is actually the ASCII sequence 'REUC', not the ASCII\nsequence 'REUN'.\n\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n---\n\n I missed the patch that added this to C Git, so I got a bit\n surprised when an unresolved index started crashing inside of JGit.\n\n JGit is trying to do the right thing by ignoring the extension,\n since its name is all uppercase, but its still getting confused\n and barfing at the end of the file.  While trying to track it down\n I started scratching my head wondering what this 'REUC' extension\n was, and where it came from... only to find out its not actually\n documented in the sources, because the comment is wrong.\n\n read-cache.c |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/read-cache.c b/read-cache.c\nindex 309b77a..f1f789b 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -26,7 +26,7 @@ static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int reall\n \n #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )\n #define CACHE_EXT_TREE 0x54524545\t/* \"TREE\" */\n-#define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* \"REUN\" */\n+#define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* \"REUC\" */\n \n struct index_state the_index;\n \n-- \n1.7.0.rc0.170.g7207c\n\n-- \nShawn.\n"},{"id":"133370","messageId":"7vpr4n5wwa.fsf@alter.siamese.dyndns.org","threadId":"22489","inReplyTo":"20100202153328.GB9687@spearce.org","subject":"Re: [PATCH] Correct spelling of 'REUC' extension","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-02-02T18:13:09Z","receivedAt":"2010-02-02T18:13:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Shawn O. Pearce\" <spearce@spearce.org> writes:\n\n> The new dircache extension CACHE_EXT_RESOLVE_UNDO, whose value is\n> 0x52455543, is actually the ASCII sequence 'REUC', not the ASCII\n> sequence 'REUN'.\n\nThanks; applied.\n\nIt was originally meant to be \"resolve undo conflicts\" but the symbolic\nname got too long with the last word.\n"}]}