{"thread":{"id":"9274","subject":"[PATCH guilt] guilt-rebase: Make fast-forward work","startedAt":"2007-07-28T12:22:12Z","lastAt":"2007-07-28T20:40:43Z","messageCount":2,"participants":["Eric Lesh","Josef Sipek"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"48900","messageId":"87d4ycen0r.fsf@hubert.paunchy.net","threadId":"9274","inReplyTo":null,"subject":"[PATCH guilt] guilt-rebase: Make fast-forward work","fromName":"Eric Lesh","fromEmail":"eclesh@ucla.edu","sentAt":"2007-07-28T12:22:12Z","receivedAt":"2007-07-28T12:22:12Z","isPatch":true,"sender":{"key":"eclesh@ucla.edu","avatar":null},"body":"Merges created with --no-commit and a blank commit message didn't update\nthe branch's HEAD in a fast-forward merge. Rebasing didn't actually do\nanything in that case.\n\nAlso quote the log message when displaying the new HEAD.\n\nSigned-off-by: Eric Lesh <eclesh@ucla.edu>\n---\n guilt-rebase |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/guilt-rebase b/guilt-rebase\nindex cc8dcf6..f7de813 100755\n--- a/guilt-rebase\n+++ b/guilt-rebase\n@@ -49,11 +49,11 @@ cp \"$applied\" \"$rebase_dir/status\"\n \n echo \"First, poping all patches...\"\n pop_all_patches\n-git-merge --no-commit \"\" HEAD $upstream > /dev/null 2> /dev/null\n+git-merge --no-commit $upstream > /dev/null 2> /dev/null\n \n echo \"\"\n log=`git-log -1 --pretty=oneline`\n-echo \"HEAD is now at `echo $log | cut -c 1-7`... `echo $log | cut -c 41-`\"\n+echo \"HEAD is now at `echo $log | cut -c 1-7`... `echo \"$log\" | cut -c 41-`\"\n \n #\n # For each previously applied patch:\n-- \n1.5.2\n"},{"id":"48935","messageId":"20070728204043.GB6240@filer.fsl.cs.sunysb.edu","threadId":"9274","inReplyTo":"87d4ycen0r.fsf@hubert.paunchy.net","subject":"Re: [PATCH guilt] guilt-rebase: Make fast-forward work","fromName":"Josef Sipek","fromEmail":"jsipek@fsl.cs.sunysb.edu","sentAt":"2007-07-28T20:40:43Z","receivedAt":"2007-07-28T20:40:43Z","isPatch":true,"sender":{"key":"jsipek@fsl.cs.sunysb.edu","avatar":null},"body":"On Sat, Jul 28, 2007 at 05:22:12AM -0700, Eric Lesh wrote:\n> Merges created with --no-commit and a blank commit message didn't update\n> the branch's HEAD in a fast-forward merge. Rebasing didn't actually do\n> anything in that case.\n> \n> Also quote the log message when displaying the new HEAD.\n \nApplied. Thanks.\n\nJosef 'Jeff' Sipek.\n\n-- \nYou measure democracy by the freedom it gives its dissidents, not the\nfreedom it gives its assimilated conformists.\n\t\t- Abbie Hoffman\n"}]}