{"thread":{"id":"5008","subject":"[PATCH 1/2] rebase: Fix the detection of fast-forwarding of the current branch to upstream.","startedAt":"2006-07-27T09:32:25Z","lastAt":"2006-07-27T09:32:25Z","messageCount":1,"participants":["Robert Shearman"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"24187","messageId":"44C88829.3020705@codeweavers.com","threadId":"5008","inReplyTo":null,"subject":"[PATCH 1/2] rebase: Fix the detection of fast-forwarding of the current branch to upstream.","fromName":"Robert Shearman","fromEmail":"rob@codeweavers.com","sentAt":"2006-07-27T09:32:25Z","receivedAt":"2006-07-27T09:32:25Z","isPatch":true,"sender":{"key":"robertshearman@gmail.com","avatar":null},"body":"\nPreviously, a rebasing operation with on a branch that is just tracking \nan upstream branch would output a confusing \"Nothing to do\" due to no \npatches being given to git-am.\n\nThe test brings the behaviour back into line with that of just before \ne646c9c8c0aa995eac284ea0a2117add19c4461c.\nSigned-off-by: Robert Shearman <rob@codeweavers.com>\n---\n  git-rebase.sh |    2 +-\n  1 files changed, 1 insertions(+), 1 deletions(-)\n\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 29028dd..5554541 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -281,7 +281,7 @@ git-reset --hard \"$onto\"\n \n # If the $onto is a proper descendant of the tip of the branch, then\n # we just fast forwarded.\n-if test \"$mb\" = \"$onto\"\n+if test \"$mb\" = \"$branch\"\n then\n \techo >&2 \"Fast-forwarded $branch to $newbase.\"\n \texit 0\n\n"}]}