This patch series words around the FreeBSD /bin/sh problems that cause rebase
to fail on FreeBSD as well as test t5560-http-backend-noserver.
The rebase issue was first introduced in Git v1.8.4 which started using the
"return" statement to return from a "dot" command script where the "dot"
command itself was located inside a function. This behaves badly when using
FreeBSD's /bin/sh. An attempt was made to fix this in Git v1.8.4.1, but it
only addressed part of the problem.
Patch 1/3 fixes the problem by eliminating such use of "return", patch 2/3
then reverts the earlier workaround since it is no longer needed and did
not fully solve the problem.
The t5560 issue was first introduced in Git v1.7.0 which started using a
backslash escapes in ${...} expansions. The FreeBSD /bin/sh does not
properly support such escapes, but there is a simple change that works
everywhere (using [?] instead of \?).
There are more details in the individual patches.
This patch series is based on maint since these are bug fixes and that's
what SubmittingPatches says to do...
Kyle J. McKay (3):
rebase: avoid non-function use of "return" on FreeBSD
Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
test: fix t5560 on FreeBSD
git-rebase--am.sh | 131 +++++++--------
git-rebase--interactive.sh | 341 ++++++++++++++++++++-------------------
git-rebase--merge.sh | 87 +++++-----
git-rebase.sh | 11 +-
t/t5560-http-backend-noserver.sh | 4 +-
5 files changed, 287 insertions(+), 287 deletions(-)
The above stat may seem like a lot, but when using diff -w --stat you get this:
git-rebase--am.sh | 3 +++
git-rebase--interactive.sh | 3 +++
git-rebase--merge.sh | 3 +++
git-rebase.sh | 11 +----------
t/t5560-http-backend-noserver.sh | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
which more accurately reflects what was actually touched.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html