undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mm/rebase-continue-freebsd-WB'

Browse Source 
Work around a bug in FreeBSD shell that caused a regression to "git
rebase" in v1.8.4.  May need to be later applied to 'maint'.

* mm/rebase-continue-freebsd-WB:
  rebase: fix run_specific_rebase's use of "return" on FreeBSD
This commit is contained in:
Junio C Hamano 2013-09-20 12:34:36 -07:00
commit f26f250b44
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git-rebase.sh
View File

@ -167,13 +167,22 @@ You can run "git stash pop" or "git stash drop" at any time.
rm -rf "$state_dir" rm -rf "$state_dir"
} }
run_specific_rebase () { run_specific_rebase_internal () {
if [ "$interactive_rebase" = implied ]; then if [ "$interactive_rebase" = implied ]; then
GIT_EDITOR=: GIT_EDITOR=:
export GIT_EDITOR export GIT_EDITOR
autosquash= autosquash=
fi fi
# On FreeBSD, the shell's "return" returns from the current
# function, not from the current file inclusion.
# run_specific_rebase_internal has the file inclusion as a
# last statement, so POSIX and FreeBSD's return will do the
# same thing.
. git-rebase--$type . git-rebase--$type
}
run_specific_rebase () {
run_specific_rebase_internal
ret=$? ret=$?
if test $ret -eq 0 if test $ret -eq 0
then then