diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-12 18:34:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-12 18:35:14 -0700 |
| commit | eed94a570e0421175d6b4342c0ac48e03ceedf0b (patch) | |
| tree | f33864f2abffdcb83cbf626b26da34f9cc8d5bab /git-rebase.sh | |
| parent | 4147d801db66df9b127ffe315601f467aa9d1c48 (diff) | |
| parent | 01aaf1f88ddc2b99162c302710339f202996f39b (diff) | |
| download | git-eed94a570e0421175d6b4342c0ac48e03ceedf0b.tar.gz git-eed94a570e0421175d6b4342c0ac48e03ceedf0b.tar.xz | |
Merge branch 'master' into js/c-merge-recursive
Adjust to hold_lock_file_for_update() change on the master.
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index cb1a9ce12..20f74d416 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -277,14 +277,11 @@ onto=$(git-rev-parse --verify "${onto_name}^0") || exit # Check if we are already based on $onto, but this should be # done only when upstream and onto are the same. -if test "$upstream" = "$onto" +mb=$(git-merge-base "$onto" "$branch") +if test "$upstream" = "$onto" && test "$mb" = "$onto" then - mb=$(git-merge-base "$onto" "$branch") - if test "$mb" = "$onto" - then - echo >&2 "Current branch $branch_name is up to date." - exit 0 - fi + echo >&2 "Current branch $branch_name is up to date." + exit 0 fi # Rewind the head to "$onto"; this saves our current head in ORIG_HEAD. @@ -292,9 +289,9 @@ 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." + echo >&2 "Fast-forwarded $branch_name to $onto_name." exit 0 fi |