* [PATCH 1/2] rebase: Fix the detection of fast-forwarding of the current branch to upstream.
@ 2006-07-27 9:32 Robert Shearman
0 siblings, 0 replies; only message in thread
From: Robert Shearman @ 2006-07-27 9:32 UTC (permalink / raw)
To: Git Mailing List
[-- Attachment #1: Type: text/plain, Size: 424 bytes --]
Previously, a rebasing operation with on a branch that is just tracking
an upstream branch would output a confusing "Nothing to do" due to no
patches being given to git-am.
The test brings the behaviour back into line with that of just before
e646c9c8c0aa995eac284ea0a2117add19c4461c.
Signed-off-by: Robert Shearman <rob@codeweavers.com>
---
git-rebase.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
[-- Attachment #2: 5d77c657b6e3b8fabe8690171a10aa54ec2cf641.diff --]
[-- Type: text/x-patch, Size: 374 bytes --]
diff --git a/git-rebase.sh b/git-rebase.sh
index 29028dd..5554541 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -281,7 +281,7 @@ git-reset --hard "$onto"
# If the $onto is a proper descendant of the tip of the branch, then
# we just fast forwarded.
-if test "$mb" = "$onto"
+if test "$mb" = "$branch"
then
echo >&2 "Fast-forwarded $branch to $newbase."
exit 0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2006-07-27 9:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-27 9:32 [PATCH 1/2] rebase: Fix the detection of fast-forwarding of the current branch to upstream Robert Shearman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).