Apply fix for rebase from Matthieu Moy in https://github.com/git/git/commit/99855dd Reported Sergey Svishchev.diff -r1.3 -r1.4 pkgsrc/devel/git-base/Makefile
(prlw1)
@@ -1,18 +1,19 @@ | @@ -1,18 +1,19 @@ | |||
1 | # $NetBSD: Makefile,v 1.3 2013/09/11 01:26:00 obache Exp $ | 1 | # $NetBSD: Makefile,v 1.4 2013/09/16 10:48:04 prlw1 Exp $ | |
2 | 2 | |||
3 | .include "../../devel/git/Makefile.common" | 3 | .include "../../devel/git/Makefile.common" | |
4 | 4 | |||
5 | PKGNAME= git-base-${GIT_VERSION} | 5 | PKGNAME= git-base-${GIT_VERSION} | |
6 | PKGREVISION= 1 | |||
6 | COMMENT= GIT Tree History Storage Tool (base package) | 7 | COMMENT= GIT Tree History Storage Tool (base package) | |
7 | 8 | |||
8 | CONFLICTS+= scmgit-base-[0-9]* | 9 | CONFLICTS+= scmgit-base-[0-9]* | |
9 | SUPERSEDES+= scmgit-base-[0-9]* | 10 | SUPERSEDES+= scmgit-base-[0-9]* | |
10 | 11 | |||
11 | DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error | 12 | DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error | |
12 | # for git-send-email | 13 | # for git-send-email | |
13 | DEPENDS+= p5-MIME-Base64>=3.13:../../converters/p5-MIME-Base64 | 14 | DEPENDS+= p5-MIME-Base64>=3.13:../../converters/p5-MIME-Base64 | |
14 | DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid | 15 | DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid | |
15 | DEPENDS+= p5-MailTools>=2.11:../../mail/p5-MailTools | 16 | DEPENDS+= p5-MailTools>=2.11:../../mail/p5-MailTools | |
16 | DEPENDS+= p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL | 17 | DEPENDS+= p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL | |
17 | DEPENDS+= p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL | 18 | DEPENDS+= p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL | |
18 | 19 |
@@ -1,14 +1,15 @@ | @@ -1,14 +1,15 @@ | |||
1 | $NetBSD: distinfo,v 1.1 2013/09/09 13:54:44 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.2 2013/09/16 10:48:04 prlw1 Exp $ | |
2 | 2 | |||
3 | SHA1 (git-1.8.4.tar.gz) = 2a361a2d185b8bc604f7f2ce2f502d0dea9d3279 | 3 | SHA1 (git-1.8.4.tar.gz) = 2a361a2d185b8bc604f7f2ce2f502d0dea9d3279 | |
4 | RMD160 (git-1.8.4.tar.gz) = 546720ff4234e0aec4867a81c7fba3130ccae397 | 4 | RMD160 (git-1.8.4.tar.gz) = 546720ff4234e0aec4867a81c7fba3130ccae397 | |
5 | Size (git-1.8.4.tar.gz) = 4657759 bytes | 5 | Size (git-1.8.4.tar.gz) = 4657759 bytes | |
6 | SHA1 (patch-aa) = 47e743aedffe231477d82d1190787af64faaa4b4 | 6 | SHA1 (patch-aa) = 47e743aedffe231477d82d1190787af64faaa4b4 | |
7 | SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 | 7 | SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 | |
8 | SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca | 8 | SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca | |
9 | SHA1 (patch-af) = d4741caeaed3ef6cfabf415f9fdbc95968307131 | 9 | SHA1 (patch-af) = d4741caeaed3ef6cfabf415f9fdbc95968307131 | |
10 | SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 | 10 | SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 | |
11 | SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7 | 11 | SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7 | |
12 | SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e | 12 | SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e | |
13 | SHA1 (patch-config.mak.uname) = e7fa7a91d4d9dd6793d752b1833f97fcaea236b1 | 13 | SHA1 (patch-config.mak.uname) = e7fa7a91d4d9dd6793d752b1833f97fcaea236b1 | |
14 | SHA1 (patch-git-rebase.sh) = a3f79687011ff82766925893a03526d925218f5d | |||
14 | SHA1 (patch-wrapper.c) = d8252c63cca9a134fca3f8f6f28663f563c7b4bc | 15 | SHA1 (patch-wrapper.c) = d8252c63cca9a134fca3f8f6f28663f563c7b4bc |
$NetBSD: patch-git-rebase.sh,v 1.1 2013/09/16 10:48:05 prlw1 Exp $
Rebase: fix run_specific_rebase's use of "return" on FreeBSD
Since a1549e1, git-rebase--am.sh uses the shell's "return" statement, to
mean "return from the current file inclusion", which is POSIXly correct,
but badly interpreted on FreeBSD, which returns from the current
function, hence skips the finish_rebase statement that follows the file
inclusion.
Make the use of "return" portable by using the file inclusion as the last
statement of a function.
https://github.com/git/git/commit/99855dd
--- git-rebase.sh.orig 2013-08-23 19:38:43.000000000 +0000
+++ git-rebase.sh
@@ -167,13 +167,22 @@ You can run "git stash pop" or "git stas
rm -rf "$state_dir"
}
-run_specific_rebase () {
+run_specific_rebase_internal () {
if [ "$interactive_rebase" = implied ]; then
GIT_EDITOR=:
export GIT_EDITOR
autosquash=
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
+}
+
+run_specific_rebase () {
+ run_specific_rebase_internal
ret=$?
if test $ret -eq 0
then