diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2018-09-13 06:30:30 -0400 |
|---|---|---|
| committer | Dave Reisner <dreisner@archlinux.org> | 2018-09-13 06:30:30 -0400 |
| commit | 407848a56e0f5a9073c328d1ed0c915b2f4309f0 (patch) | |
| tree | d4ded0175c67d8374d7cce64e35792f532123872 /package.inc.sh | |
| parent | 33b433898ebd7771ca045338bfca7c910312970c (diff) | |
| download | asp32-407848a56e0f5a9073c328d1ed0c915b2f4309f0.tar.xz | |
Revert "Avoid hardlinks when cloning across filesystems"
This reverts commit 33b433898ebd7771ca045338bfca7c910312970c.
Diffstat (limited to 'package.inc.sh')
| -rw-r--r-- | package.inc.sh | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/package.inc.sh b/package.inc.sh index 84c9f66..7a9756d 100644 --- a/package.inc.sh +++ b/package.inc.sh @@ -156,7 +156,7 @@ package_export() { } package_checkout() { - local remote clone_args + local remote pkgname=$1 package_init "$pkgname" remote || return @@ -164,20 +164,12 @@ package_checkout() { git show-ref -q "refs/heads/$remote/packages/$pkgname" || git branch -qf --no-track {,}"$remote/packages/$pkgname" - clone_args=( - --local - --single-branch - --branch "$remote/packages/$pkgname" - --config "pull.rebase=true" - ) - - # If the current directory isn't on the same FS as us, then we can't use - # hardlinks in the clone, implied by --local. - if [[ $(stat -c %d "$ASPROOT") != "$(stat -c %d .)" ]] ; then - clone_args+=(--no-hardlinks) - fi - - quiet_git clone "${clone_args[@]}" "$ASPROOT" "$pkgname" + quiet_git clone \ + --local \ + --single-branch \ + --branch "$remote/packages/$pkgname" \ + --config "pull.rebase=true" \ + "$ASPROOT" "$pkgname" || return } package_get_repos_with_arch() { |