{"thread":{"id":"21937","subject":"FEATURE REQUEST: Announce branch name with merge comamnd","startedAt":"2009-12-11T18:55:50Z","lastAt":"2009-12-15T07:35:13Z","messageCount":14,"participants":["Jari Aalto","Junio C Hamano","Stephen Boyd","Alex Riesen","Johannes Sixt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"129762","messageId":"87zl5p1gsp.fsf@jondo.cante.net","threadId":"21937","inReplyTo":null,"subject":"FEATURE REQUEST: Announce branch name with merge comamnd","fromName":"Jari Aalto","fromEmail":"jari.aalto@cante.net","sentAt":"2009-12-11T18:55:50Z","receivedAt":"2009-12-11T18:55:50Z","isPatch":false,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"\nDoing octopus merge results:\n\n $ git merge ...\n\n Trying simple merge with c87c49b1e413e5dc378d7e6b16951761a1e82f6d\n Trying simple merge with b650c8c8809ef493ad4128fc941ed6b520c82f28\n Trying simple merge with 047f83d6c8a08c4016004780e94257d9e487b7e6\n Simple merge did not work, trying automatic merge.\n Auto-merging example.jwmrc\n Trying simple merge with 16860b016e198acd0814492092e2ad5ea88fb219\n Simple merge did not work, trying automatic merge.\n Auto-merging example.jwmrc\n Trying simple merge with 9a397ff24a381ce49dd093c4f51c06c4c62f3ce7\n Simple merge did not work, trying automatic merge.\n ...\n\nSUGGESTION\n\nPlease announce the branch name being merged so that the listing is\neasier to follow (possibly only with --verbose, -v option). Add\n\"Branch: \" just before the merge is attempted. somethiglike this\n\n Branch: bug--manpage-fix-hyphen\n Trying simple merge with c87c49b1e413e5dc378d7e6b16951761a1e82f6d\n Branch: bug--manpage-fix-TH\n Trying simple merge with b650c8c8809ef493ad4128fc941ed6b520c82f28\n Branch: bug-manpage-change-binary-name\n Trying simple merge with 047f83d6c8a08c4016004780e94257d9e487b7e6\n Branch: feature--example.jwmrc-change-browser\n Simple merge did not work, trying automatic merge.\n Auto-merging example.jwmrc\n Branch: feature--example.jwmrc-change-clock\n Trying simple merge with 16860b016e198acd0814492092e2ad5ea88fb219\n Simple merge did not work, trying automatic merge.\n Auto-merging example.jwmrc\n Branch: feature--example.jwmrc-change-font\n Trying simple merge with 9a397ff24a381ce49dd093c4f51c06c4c62f3ce7\n Simple merge did not work, trying automatic merge.\n ...\n"},{"id":"129765","messageId":"7vpr6l2tm9.fsf@alter.siamese.dyndns.org","threadId":"21937","inReplyTo":"87zl5p1gsp.fsf@jondo.cante.net","subject":"Re: FEATURE REQUEST: Announce branch name with merge comamnd","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-12-11T19:33:34Z","receivedAt":"2009-12-11T19:33:34Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Patches welcome.\n\nI didn't think people did Octopus these days. It feels so 2005 ;-)\n"},{"id":"129772","messageId":"1260578339-30750-1-git-send-email-bebarino@gmail.com","threadId":"21937","inReplyTo":"87zl5p1gsp.fsf@jondo.cante.net","subject":"[PATCH 1/3] octopus: make merge process simpler to follow","fromName":"Stephen Boyd","fromEmail":"bebarino@gmail.com","sentAt":"2009-12-12T00:38:57Z","receivedAt":"2009-12-12T00:38:57Z","isPatch":true,"sender":{"key":"bebarino@gmail.com","avatar":"https://avatars.githubusercontent.com/u/38832?v=4"},"body":"Its not very easy to understand what heads are being merged given\nthe current output of an octopus merge. Fix this by replacing the\nsha1 with the (usually) better description in GITHEAD_.\n\nSuggested-by: Jari Aalto \nSigned-off-by: Stephen Boyd \n---\n\nMaybe this will work? At least it will replace the sha1 with\nwhatever is given on the command line.\n\n git-merge-octopus.sh | 9 +++++----\n t/t7602-merge-octopus-many.sh | 33 +++++++++++++++++++++++++++++++++\n 2 files changed, 38 insertions(+), 4 deletions(-)\n\ndiff --git a/git-merge-octopus.sh b/git-merge-octopus.sh\nindex 825c52c..1c8ee0a 100755\n--- a/git-merge-octopus.sh\n+++ b/git-merge-octopus.sh\n@@ -61,12 +61,13 @@ do\n \t\texit 2\n \tesac\n \n+\tpretty_name=\"$(eval echo \\$GITHEAD_$SHA1)\"\n \tcommon=$(git merge-base --all $SHA1 $MRC) ||\n-\t\tdie \"Unable to find common commit with $SHA1\"\n+\t\tdie \"Unable to find common commit with $pretty_name\"\n \n \tcase \"$LF$common$LF\" in\n \t*\"$LF$SHA1$LF\"*)\n-\t\techo \"Already up-to-date with $SHA1\"\n+\t\techo \"Already up-to-date with $pretty_name\"\n \t\tcontinue\n \t\t;;\n \tesac\n@@ -81,7 +82,7 @@ do\n \t\t# tree as the intermediate result of the merge.\n \t\t# We still need to count this as part of the parent set.\n \n-\t\techo \"Fast-forwarding to: $SHA1\"\n+\t\techo \"Fast-forwarding to: $pretty_name\"\n \t\tgit read-tree -u -m $head $SHA1 || exit\n \t\tMRC=$SHA1 MRT=$(git write-tree)\n \t\tcontinue\n@@ -89,7 +90,7 @@ do\n \n \tNON_FF_MERGE=1\n \n-\techo \"Trying simple merge with $SHA1\"\n+\techo \"Trying simple merge with $pretty_name\"\n \tgit read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2\n \tnext=$(git write-tree 2>/dev/null)\n \tif test $? -ne 0\ndiff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh\nindex 01e5415..7377033 100755\n--- a/t/t7602-merge-octopus-many.sh\n+++ b/t/t7602-merge-octopus-many.sh\n@@ -49,4 +49,37 @@ test_expect_success 'merge c1 with c2, c3, c4, ... c29' '\n \tdone\n '\n \n+cat >expected <<\\EOF\n+Trying simple merge with c2\n+Trying simple merge with c3\n+Trying simple merge with c4\n+Merge made by octopus.\n+ c2.c | 1 +\n+ c3.c | 1 +\n+ c4.c | 1 +\n+ 3 files changed, 3 insertions(+), 0 deletions(-)\n+ create mode 100644 c2.c\n+ create mode 100644 c3.c\n+ create mode 100644 c4.c\n+EOF\n+\n+test_expect_success 'merge output uses pretty names' '\n+\tgit reset --hard c1 &&\n+\tgit merge c2 c3 c4 >actual &&\n+\ttest_cmp actual expected\n+'\n+\n+cat >expected <<\\EOF\n+Already up-to-date with c4\n+Trying simple merge with c5\n+Merge made by octopus.\n+ c5.c | 1 +\n+ 1 files changed, 1 insertions(+), 0 deletions(-)\n+ create mode 100644 c5.c\n+EOF\n+\n+test_expect_success 'merge up-to-date output uses pretty names' '\n+\tgit merge c4 c5 >actual &&\n+\ttest_cmp actual expected\n+'\n test_done\n-- \n1.6.6.rc1.45.g9aadbb\n"},{"id":"129771","messageId":"1260578339-30750-2-git-send-email-bebarino@gmail.com","threadId":"21937","inReplyTo":"87zl5p1gsp.fsf@jondo.cante.net","subject":"[PATCH 2/3] octopus: reenable fast-forward merges","fromName":"Stephen Boyd","fromEmail":"bebarino@gmail.com","sentAt":"2009-12-12T00:38:58Z","receivedAt":"2009-12-12T00:38:58Z","isPatch":true,"sender":{"key":"bebarino@gmail.com","avatar":"https://avatars.githubusercontent.com/u/38832?v=4"},"body":"The fast-forward logic is never being triggered because $common and\n$MRC are never equivalent. $common is initialized to a commit id by\nmerge-base and MRC is initialized to HEAD. Fix this by initializing\n$MRC to the commit id for HEAD so that its possible for $MRC and\n$common to be equal.\n\nSigned-off-by: Stephen Boyd \n---\n\nFound this while making tests up for part 1 of this series.\n\n git-merge-octopus.sh | 2 +-\n t/t7602-merge-octopus-many.sh | 18 ++++++++++++++++++\n 2 files changed, 19 insertions(+), 1 deletions(-)\n\ndiff --git a/git-merge-octopus.sh b/git-merge-octopus.sh\nindex 1c8ee0a..99b6f8a 100755\n--- a/git-merge-octopus.sh\n+++ b/git-merge-octopus.sh\n@@ -44,7 +44,7 @@ esac\n # MRC is the current \"merge reference commit\"\n # MRT is the current \"merge result tree\"\n \n-MRC=$head MSG= PARENT=\"-p $head\"\n+MRC=$(git rev-parse --verify -q $head) MSG= PARENT=\"-p $head\"\n MRT=$(git write-tree)\n CNT=1 ;# counting our head\n NON_FF_MERGE=0\ndiff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh\nindex 7377033..2746169 100755\n--- a/t/t7602-merge-octopus-many.sh\n+++ b/t/t7602-merge-octopus-many.sh\n@@ -82,4 +82,22 @@ test_expect_success 'merge up-to-date output uses pretty names' '\n \tgit merge c4 c5 >actual &&\n \ttest_cmp actual expected\n '\n+\n+cat >expected <<\\EOF\n+Fast-forwarding to: c1\n+Trying simple merge with c2\n+Merge made by octopus.\n+ c1.c | 1 +\n+ c2.c | 1 +\n+ 2 files changed, 2 insertions(+), 0 deletions(-)\n+ create mode 100644 c1.c\n+ create mode 100644 c2.c\n+EOF\n+\n+test_expect_success 'merge fast-forward output uses pretty names' '\n+\tgit reset --hard c0 &&\n+\tgit merge c1 c2 >actual &&\n+\ttest_cmp actual expected\n+'\n+\n test_done\n-- \n1.6.6.rc1.45.g9aadbb\n"},{"id":"129773","messageId":"1260578339-30750-3-git-send-email-bebarino@gmail.com","threadId":"21937","inReplyTo":"87zl5p1gsp.fsf@jondo.cante.net","subject":"[PATCH 3/3] octopus: remove dead code","fromName":"Stephen Boyd","fromEmail":"bebarino@gmail.com","sentAt":"2009-12-12T00:38:59Z","receivedAt":"2009-12-12T00:38:59Z","isPatch":true,"sender":{"key":"bebarino@gmail.com","avatar":"https://avatars.githubusercontent.com/u/38832?v=4"},"body":"MSG, PARENT, and CNT are never used, just assigned to.\n\nSigned-off-by: Stephen Boyd \n---\n\nI don't know if this is wanted. Looks like maybe they're used\nas simple debug aides?\n\n git-merge-octopus.sh | 6 +-----\n 1 files changed, 1 insertions(+), 5 deletions(-)\n\ndiff --git a/git-merge-octopus.sh b/git-merge-octopus.sh\nindex 99b6f8a..3cb0b31 100755\n--- a/git-merge-octopus.sh\n+++ b/git-merge-octopus.sh\n@@ -44,9 +44,8 @@ esac\n # MRC is the current \"merge reference commit\"\n # MRT is the current \"merge result tree\"\n \n-MRC=$(git rev-parse --verify -q $head) MSG= PARENT=\"-p $head\"\n+MRC=$(git rev-parse --verify -q $head)\n MRT=$(git write-tree)\n-CNT=1 ;# counting our head\n NON_FF_MERGE=0\n OCTOPUS_FAILURE=0\n for SHA1 in $remotes\n@@ -72,9 +71,6 @@ do\n \t\t;;\n \tesac\n \n-\tCNT=`expr $CNT + 1`\n-\tPARENT=\"$PARENT -p $SHA1\"\n-\n \tif test \"$common,$NON_FF_MERGE\" = \"$MRC,0\"\n \tthen\n \t\t# The first head being merged was a fast-forward.\n-- \n1.6.6.rc1.45.g9aadbb\n"},{"id":"129774","messageId":"7viqcdxaxt.fsf@alter.siamese.dyndns.org","threadId":"21937","inReplyTo":"1260578339-30750-3-git-send-email-bebarino@gmail.com","subject":"Re: [PATCH 3/3] octopus: remove dead code","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-12-12T01:01:18Z","receivedAt":"2009-12-12T01:01:18Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stephen Boyd writes:\n\n> MSG, PARENT, and CNT are never used, just assigned to.\n>\n> Signed-off-by: Stephen Boyd \n> ---\n>\n> I don't know if this is wanted. Looks like maybe they're used\n> as simple debug aides?\n\nNo, thanks for spotting. It is the right thing to do to just get rid of\nthem.\n\nIIRC, they are remnants of ancient logic of the script, even before\n91063bb (Multi-backend merge driver., 2005-09-08) that added it to the\nofficial git history, and were used to update MRC and to come up with the\nend result (experimental versions of the script used to run \"commit-tree\"\nitself).\n"},{"id":"129775","messageId":"81b0412b0912111735v474a9d3k5a24024c2d51587b@mail.gmail.com","threadId":"21937","inReplyTo":"87zl5p1gsp.fsf@jondo.cante.net","subject":"Re: FEATURE REQUEST: Announce branch name with merge comamnd","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2009-12-12T01:35:49Z","receivedAt":"2009-12-12T01:35:49Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On Fri, Dec 11, 2009 at 19:55, Jari Aalto wrote:\n> Please announce the branch name being merged so that the listing is\n> easier to follow (possibly only with --verbose, -v option). Add\n> \"Branch: \" just before the merge is attempted. somethiglike this\n>\n>    Branch: bug--manpage-fix-hyphen\n>    Trying simple merge with c87c49b1e413e5dc378d7e6b16951761a1e82f6d\n\nIt is not exactly \"easier\" to follow in your case. It is more\ntext and there is no immediately visible cue that the two\nlines are related. You have to give the observer this information.\nPut reference name and SHA-1 on the same line?\n"},{"id":"129787","messageId":"87tyvwpp2b.fsf@jondo.cante.net","threadId":"21937","inReplyTo":"81b0412b0912111735v474a9d3k5a24024c2d51587b@mail.gmail.com","subject":"Re: FEATURE REQUEST: Announce branch name with merge comamnd","fromName":"Jari Aalto","fromEmail":"jari.aalto@cante.net","sentAt":"2009-12-12T08:35:40Z","receivedAt":"2009-12-12T08:35:40Z","isPatch":false,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"Alex Riesen writes:\n\n> On Fri, Dec 11, 2009 at 19:55, Jari Aalto wrote:\n>\n>> Please announce the branch name being merged so that the listing is\n>> easier to follow (possibly only with --verbose, -v option). Add\n>> \"Branch: \" just before the merge is attempted. somethiglike this\n>>\n>>    Branch: bug--manpage-fix-hyphen\n>>    Trying simple merge with c87c49b1e413e5dc378d7e6b16951761a1e82f6d\n>\n> It is not exactly \"easier\" to follow in your case. It is more\n> text and there is no immediately visible cue that the two\n> lines are related. You have to give the observer this information.\n> Put reference name and SHA-1 on the same line?\n\nThat would work too. As long as the branch name appears there\n(optionally only with -v in effect).\n\nJari\n"},{"id":"129788","messageId":"7vljh8vaj4.fsf@alter.siamese.dyndns.org","threadId":"21937","inReplyTo":"1260578339-30750-1-git-send-email-bebarino@gmail.com","subject":"Re: [PATCH 1/3] octopus: make merge process simpler to follow","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-12-12T08:53:03Z","receivedAt":"2009-12-12T08:53:03Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stephen Boyd writes:\n\n> Its not very easy to understand what heads are being merged given\n> the current output of an octopus merge. Fix this by replacing the\n> sha1 with the (usually) better description in GITHEAD_.\n>\n> Suggested-by: Jari Aalto \n> Signed-off-by: Stephen Boyd \n> ---\n>\n> Maybe this will work? At least it will replace the sha1 with\n> whatever is given on the command line.\n\nThis shows what was given from the command line instead of the\ncommit object name. I think it makes sense to not even make this\ndependent on any option. Also I don't think anybody misses the\ncommit object name in the output---after all, that is all internal\nto git and is different from what the user gave us anyway (unless\nthe user did give us the full 40-char object name, in which case\nthe value of GITHEAD_ would be that name, and we will show it,\nwhich is also fine).\n\nNo, I haven't applied nor run it yet. The above is purely from my cursory\nreading of the code.\n\nAnyway, I'll keep this in my inbox or queue it on 'pu' if I had time.\n"},{"id":"129807","messageId":"200912122056.59297.j6t@kdbg.org","threadId":"21937","inReplyTo":"1260578339-30750-1-git-send-email-bebarino@gmail.com","subject":"Re: [PATCH 1/3] octopus: make merge process simpler to follow","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2009-12-12T19:56:58Z","receivedAt":"2009-12-12T19:56:58Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"On Samstag, 12. Dezember 2009, Stephen Boyd wrote:\n> +\tpretty_name=\"$(eval echo \\$GITHEAD_$SHA1)\"\n\n\teval pretty_name=\\$GITHEAD_$SHA1\n\n:)\n\n-- Hannes\n"},{"id":"129802","messageId":"7vk4wrrkce.fsf@alter.siamese.dyndns.org","threadId":"21937","inReplyTo":"200912122056.59297.j6t@kdbg.org","subject":"Re: [PATCH 1/3] octopus: make merge process simpler to follow","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-12-12T20:46:57Z","receivedAt":"2009-12-12T20:46:57Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Sixt writes:\n\n> On Samstag, 12. Dezember 2009, Stephen Boyd wrote:\n>> +\tpretty_name=\"$(eval echo \\$GITHEAD_$SHA1)\"\n>\n> \teval pretty_name=\\$GITHEAD_$SHA1\n>\n> :)\n\nTrue, and also there can be scripts that call merge-octupos directly\nwithout setting \"GITHEAD_$commit\", so it would probably need something\nlike\n\n\t: ${pretty_name:=$SHA1}\n\nafter that.\n"},{"id":"129936","messageId":"1260859755-3990-1-git-send-email-bebarino@gmail.com","threadId":"21937","inReplyTo":"7vk4wrrkce.fsf@alter.siamese.dyndns.org","subject":"[PATCH] octopus: make merge process simpler to follow","fromName":"Stephen Boyd","fromEmail":"bebarino@gmail.com","sentAt":"2009-12-15T06:49:15Z","receivedAt":"2009-12-15T06:49:15Z","isPatch":true,"sender":{"key":"bebarino@gmail.com","avatar":"https://avatars.githubusercontent.com/u/38832?v=4"},"body":"Its not very easy to understand what heads are being merged given\nthe current output of an octopus merge. Fix this by replacing the\nsha1 with the (usually) better description in GITHEAD_.\n\nSuggested-by: Jari Aalto \nSigned-off-by: Stephen Boyd \n---\n\nThanks both. Here's a replacement. Let me know if you want a reroll.\n\n git-merge-octopus.sh | 11 +++++++----\n t/t7602-merge-octopus-many.sh | 33 +++++++++++++++++++++++++++++++++\n 2 files changed, 40 insertions(+), 4 deletions(-)\n\ndiff --git a/git-merge-octopus.sh b/git-merge-octopus.sh\nindex 825c52c..417e8fb 100755\n--- a/git-merge-octopus.sh\n+++ b/git-merge-octopus.sh\n@@ -61,12 +61,15 @@ do\n \t\texit 2\n \tesac\n \n+\teval pretty_name=\"\\$GITHEAD_$SHA1\"\n+\t: ${pretty_name:=$SHA1}\n+\n \tcommon=$(git merge-base --all $SHA1 $MRC) ||\n-\t\tdie \"Unable to find common commit with $SHA1\"\n+\t\tdie \"Unable to find common commit with $pretty_name\"\n \n \tcase \"$LF$common$LF\" in\n \t*\"$LF$SHA1$LF\"*)\n-\t\techo \"Already up-to-date with $SHA1\"\n+\t\techo \"Already up-to-date with $pretty_name\"\n \t\tcontinue\n \t\t;;\n \tesac\n@@ -81,7 +84,7 @@ do\n \t\t# tree as the intermediate result of the merge.\n \t\t# We still need to count this as part of the parent set.\n \n-\t\techo \"Fast-forwarding to: $SHA1\"\n+\t\techo \"Fast-forwarding to: $pretty_name\"\n \t\tgit read-tree -u -m $head $SHA1 || exit\n \t\tMRC=$SHA1 MRT=$(git write-tree)\n \t\tcontinue\n@@ -89,7 +92,7 @@ do\n \n \tNON_FF_MERGE=1\n \n-\techo \"Trying simple merge with $SHA1\"\n+\techo \"Trying simple merge with $pretty_name\"\n \tgit read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2\n \tnext=$(git write-tree 2>/dev/null)\n \tif test $? -ne 0\ndiff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh\nindex 01e5415..7377033 100755\n--- a/t/t7602-merge-octopus-many.sh\n+++ b/t/t7602-merge-octopus-many.sh\n@@ -49,4 +49,37 @@ test_expect_success 'merge c1 with c2, c3, c4, ... c29' '\n \tdone\n '\n \n+cat >expected <<\\EOF\n+Trying simple merge with c2\n+Trying simple merge with c3\n+Trying simple merge with c4\n+Merge made by octopus.\n+ c2.c | 1 +\n+ c3.c | 1 +\n+ c4.c | 1 +\n+ 3 files changed, 3 insertions(+), 0 deletions(-)\n+ create mode 100644 c2.c\n+ create mode 100644 c3.c\n+ create mode 100644 c4.c\n+EOF\n+\n+test_expect_success 'merge output uses pretty names' '\n+\tgit reset --hard c1 &&\n+\tgit merge c2 c3 c4 >actual &&\n+\ttest_cmp actual expected\n+'\n+\n+cat >expected <<\\EOF\n+Already up-to-date with c4\n+Trying simple merge with c5\n+Merge made by octopus.\n+ c5.c | 1 +\n+ 1 files changed, 1 insertions(+), 0 deletions(-)\n+ create mode 100644 c5.c\n+EOF\n+\n+test_expect_success 'merge up-to-date output uses pretty names' '\n+\tgit merge c4 c5 >actual &&\n+\ttest_cmp actual expected\n+'\n test_done\n-- \n1.6.6.rc2.5.g49666\n"},{"id":"129939","messageId":"7v3a3c3d5p.fsf@alter.siamese.dyndns.org","threadId":"21937","inReplyTo":"1260859755-3990-1-git-send-email-bebarino@gmail.com","subject":"Re: [PATCH] octopus: make merge process simpler to follow","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-12-15T07:32:50Z","receivedAt":"2009-12-15T07:32:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stephen Boyd writes:\n\n> Its not very easy to understand what heads are being merged given\n> the current output of an octopus merge. Fix this by replacing the\n> sha1 with the (usually) better description in GITHEAD_.\n>\n> Suggested-by: Jari Aalto \n> Signed-off-by: Stephen Boyd \n> ---\n>\n> Thanks both. Here's a replacement. Let me know if you want a reroll.\n\nAh, thanks and sorry for having you do an extra work. I amended the\nassignment further like thi,s but haven't got a chance to push the result out...\n\n\teval pretty_name=\\${GITHEAD_$SHA1:-$SHA1}\n"},{"id":"129940","messageId":"1260862513.1571.443.camel@swboyd-laptop","threadId":"21937","inReplyTo":"7v3a3c3d5p.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] octopus: make merge process simpler to follow","fromName":"Stephen Boyd","fromEmail":"bebarino@gmail.com","sentAt":"2009-12-15T07:35:13Z","receivedAt":"2009-12-15T07:35:13Z","isPatch":true,"sender":{"key":"bebarino@gmail.com","avatar":"https://avatars.githubusercontent.com/u/38832?v=4"},"body":"On Mon, 2009-12-14 at 23:32 -0800, Junio C Hamano wrote:\n\n> Ah, thanks and sorry for having you do an extra work. I amended the\n> assignment further like thi,s but haven't got a chance to push the result out...\n> \n> \teval pretty_name=\\${GITHEAD_$SHA1:-$SHA1}\n> \n\nGreat, thanks.\n"}]}