Skip to content

Commit 8cd6596

Browse files
mackylegitster
authored andcommitted
Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
This reverts commit 99855dd. The workaround 99855dd introduced to deal with problematic "return" statements in scripts run by "dot" commands located inside functions only handles one part of the problem. The issue has now been addressed by not using "return" statements in this way in the git-rebase--*.sh scripts. This workaround is therefore no longer necessary, so clean up the code by reverting it. Signed-off-by: Kyle J. McKay <[email protected]> Acked-by: Matthieu Moy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9f50d32 commit 8cd6596

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

git-rebase.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -169,22 +169,13 @@ You can run "git stash pop" or "git stash drop" at any time.
169169
rm -rf "$state_dir"
170170
}
171171

172-
run_specific_rebase_internal () {
172+
run_specific_rebase () {
173173
if [ "$interactive_rebase" = implied ]; then
174174
GIT_EDITOR=:
175175
export GIT_EDITOR
176176
autosquash=
177177
fi
178-
# On FreeBSD, the shell's "return" returns from the current
179-
# function, not from the current file inclusion.
180-
# run_specific_rebase_internal has the file inclusion as a
181-
# last statement, so POSIX and FreeBSD's return will do the
182-
# same thing.
183178
. git-rebase--$type
184-
}
185-
186-
run_specific_rebase () {
187-
run_specific_rebase_internal
188179
ret=$?
189180
if test $ret -eq 0
190181
then

0 commit comments

Comments
 (0)