{"thread":{"id":"6089","subject":"[PATCH 1/2] Use extended SHA1 syntax in merge-recursive conflicts.","startedAt":"2006-12-23T08:44:00Z","lastAt":"2006-12-23T08:44:00Z","messageCount":1,"participants":["Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"30184","messageId":"20061223084400.GA10203@spearce.org","threadId":"6089","inReplyTo":null,"subject":"[PATCH 1/2] Use extended SHA1 syntax in merge-recursive conflicts.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2006-12-23T08:44:00Z","receivedAt":"2006-12-23T08:44:00Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"When we get a line-level conflict in merge-recursive and print out\nthe two sides in the conflict hunk header and footer we should use\nthe standard extended SHA1 syntax to specify the specific blob,\nas this allows the user to copy and paste the line right into\n'git show' to view the complete version.\n\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n---\n merge-recursive.c |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex ae7ae4c..abebb95 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -649,8 +649,8 @@ static struct merge_file_info merge_file(struct diff_filespec *o,\n \t\t\tchar *name1, *name2;\n \t\t\tint merge_status;\n \n-\t\t\tname1 = xstrdup(mkpath(\"%s/%s\", branch1, a->path));\n-\t\t\tname2 = xstrdup(mkpath(\"%s/%s\", branch2, b->path));\n+\t\t\tname1 = xstrdup(mkpath(\"%s:%s\", branch1, a->path));\n+\t\t\tname2 = xstrdup(mkpath(\"%s:%s\", branch2, b->path));\n \n \t\t\tfill_mm(o->sha1, &orig);\n \t\t\tfill_mm(a->sha1, &src1);\n-- \n1.4.4.3.g87d8\n"}]}