diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-11 01:24:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-11 01:24:13 -0400 |
| commit | 7dcceb885e4b31a884767bc5c1c5681da5ffdd07 (patch) | |
| tree | fbb49a380ccccd025ea81d24ee4f0135d752fc44 | |
| parent | 3ea1710dcc4b90ee288a61c1f36f2e9cea5dbf19 (diff) | |
Remove bogus runshell loop check.
git-annex.linux/git-annex can legitimately try to run itself -- this
happens when the programfile is used. So this check was bogus.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | standalone/linux/runshell | 3 | ||||
| -rwxr-xr-x | standalone/osx/git-annex.app/Contents/MacOS/runshell | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 8742d248f..dd02231ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ git-annex (4.20131003) UNRELEASED; urgency=low appends stuff to it to make a temporary filename. Closes: #725512 * status: Fix space leak in local mode, introduced in version 4.20130920. * import: Skip .git directories. + * Remove bogus runshell loop check. -- Joey Hess <joeyh@debian.org> Thu, 03 Oct 2013 15:41:24 -0400 diff --git a/standalone/linux/runshell b/standalone/linux/runshell index 78ba3be15..a36e49083 100755 --- a/standalone/linux/runshell +++ b/standalone/linux/runshell @@ -19,9 +19,6 @@ if [ ! -e "$base/bin/git" ]; then echo "** base directory $base does not contain bin/git" >&2 exit 1 fi -if [ -n "$GIT_ANNEX_STANDLONE_ENV" ]; then - echo "** runshell loop detected!" >&2 -fi # Get absolute path to base, to avoid breakage when things change directories. orig="$(pwd)" diff --git a/standalone/osx/git-annex.app/Contents/MacOS/runshell b/standalone/osx/git-annex.app/Contents/MacOS/runshell index 01c31de55..9f1457e25 100755 --- a/standalone/osx/git-annex.app/Contents/MacOS/runshell +++ b/standalone/osx/git-annex.app/Contents/MacOS/runshell @@ -21,9 +21,6 @@ if [ ! -e "$bundle/git" ]; then echo "** bundle directory $bundle does not contain git" >&2 exit 1 fi -if [ -n "$GIT_ANNEX_STANDLONE_ENV" ]; then - echo "** runshell loop detected!" >&2 -fi # Get absolute path to base, to avoid breakage when things change directories. orig="$(pwd)" |