Merge remote-tracking branch 'in/master' into android-rebuild
This commit is contained in:
commit
6515ea8dde
6 changed files with 45 additions and 2 deletions
|
@ -20,7 +20,7 @@ if [ ! -e "$base/bin/git" ]; then
|
|||
exit 1
|
||||
fi
|
||||
if [ -n "$GIT_ANNEX_STANDLONE_ENV" ]; then
|
||||
echo "** runshell loop detected!"> &2
|
||||
echo "** runshell loop detected!" >&2
|
||||
fi
|
||||
|
||||
# Get absolute path to base, to avoid breakage when things change directories.
|
||||
|
|
|
@ -22,7 +22,7 @@ if [ ! -e "$bundle/git" ]; then
|
|||
exit 1
|
||||
fi
|
||||
if [ -n "$GIT_ANNEX_STANDLONE_ENV" ]; then
|
||||
echo "** runshell loop detected!"> &2
|
||||
echo "** runshell loop detected!" >&2
|
||||
fi
|
||||
|
||||
# Get absolute path to base, to avoid breakage when things change directories.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue