summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-12-26 22:40:40 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-12-26 22:40:40 +0000
commitbbda1a2663af702079a3c547849732ea946a0f9c (patch)
treee154f9d8f9712882ffa8f628235916134d7aaded /dev-vcs/git/files
parentold (diff)
downloadhistorical-bbda1a2663af702079a3c547849732ea946a0f9c.tar.gz
historical-bbda1a2663af702079a3c547849732ea946a0f9c.tar.bz2
historical-bbda1a2663af702079a3c547849732ea946a0f9c.zip
Bug #349083: Fix a false positive in the Git testsuite, triggered when the portage user had a shell of /bin/false.
Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64
Diffstat (limited to 'dev-vcs/git/files')
-rw-r--r--dev-vcs/git/files/git-1.7.3.4-avoid-shell-issues.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/dev-vcs/git/files/git-1.7.3.4-avoid-shell-issues.patch b/dev-vcs/git/files/git-1.7.3.4-avoid-shell-issues.patch
new file mode 100644
index 000000000000..993f516a1767
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.3.4-avoid-shell-issues.patch
@@ -0,0 +1,26 @@
+Fix false positives in t3404 due to SHELL=/bin/false
+
+If the user's shell in NSS passwd is /bin/false (eg as found during Gentoo's
+package building), the git-rebase exec tests will fail, because they call
+$SHELL around the command, and in the existing testcase, $SHELL was not being
+cleared sufficently.
+
+This lead to false positive failures of t3404 on systems where the package
+build user was locked down as noted above.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar git-1.7.3.4.orig/t/t3404-rebase-interactive.sh git-1.7.3.4/t/t3404-rebase-interactive.sh
+--- git-1.7.3.4.orig/t/t3404-rebase-interactive.sh 2010-12-16 02:52:11.000000000 +0000
++++ git-1.7.3.4/t/t3404-rebase-interactive.sh 2010-12-26 22:30:47.826421313 +0000
+@@ -67,8 +67,8 @@
+ # "exec" commands are ran with the user shell by default, but this may
+ # be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work
+ # to create a file. Unseting SHELL avoids such non-portable behavior
+-# in tests.
+-SHELL=
++# in tests. It must be exported for it to take effect where needed.
++export SHELL=
+
+ test_expect_success 'rebase -i with the exec command' '
+ git checkout master &&