diff options
| author | Kyle J. McKay <mackyle@gmail.com> | 2014-04-11 01:28:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-17 10:15:27 -0700 |
| commit | 8cd65967fe0084574fcee278a5f9ff3d14047c4f (patch) | |
| tree | 3170b1da1567bfdeda34f3e6cacffe8e220716e9 /git-rebase--merge.sh | |
| parent | 9f50d32b9c20cc94b9882484ca9704af332a5622 (diff) | |
| download | git-8cd65967fe0084574fcee278a5f9ff3d14047c4f.tar.gz | |
Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"km/avoid-non-function-return-in-rebase
This reverts commit 99855ddf4bd319cd06a0524e755ab1c1b7d39f3b.
The workaround 99855ddf 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 <mackyle@gmail.com>
Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions