kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'rs/rebase' 

* rs/rebase:
  rebase: Make the fast-fowarding message more user-friendly by using branch names instead of SHA1 IDs.
  rebase: Fix the detection of fast-forwarding of the current branch to upstream.
maint
Junio C Hamano 2006-07-31 23:02:28 -07:00
parent 056d6d4e89 d587ed13bc
commit bc9e1b8483
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
git-rebase.sh
View File

@ -266,14 +266,11 @@ onto=$(git-rev-parse --verify "${onto_name}^0") || exit


# Check if we are already based on $onto, but this should be # Check if we are already based on $onto, but this should be
# done only when upstream and onto are the same. # 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 then
mb=$(git-merge-base "$onto" "$branch") echo >&2 "Current branch $branch_name is up to date."
if test "$mb" = "$onto" exit 0
then
echo >&2 "Current branch $branch_name is up to date."
exit 0
fi
fi fi


# Rewind the head to "$onto"; this saves our current head in ORIG_HEAD. # Rewind the head to "$onto"; this saves our current head in ORIG_HEAD.
@ -281,9 +278,9 @@ git-reset --hard "$onto"


# If the $onto is a proper descendant of the tip of the branch, then # If the $onto is a proper descendant of the tip of the branch, then
# we just fast forwarded. # we just fast forwarded.
if test "$mb" = "$onto" if test "$mb" = "$branch"
then then
echo >&2 "Fast-forwarded $branch to $newbase." echo >&2 "Fast-forwarded $branch_name to $onto_name."
exit 0 exit 0
fi fi