@feigi/fleet-ctl 3.30.3 → 3.30.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/scripts/worktree.sh +7 -2
package/package.json
CHANGED
package/scripts/worktree.sh
CHANGED
|
@@ -937,8 +937,13 @@ EOF
|
|
|
937
937
|
fi
|
|
938
938
|
wt_lk_top=${wt_lk_top%?x}
|
|
939
939
|
if [ -L "$1" ]; then
|
|
940
|
-
if ! wt_lk_admin=$(git -C "$1" rev-parse --absolute-git-dir 2>/dev/null && echo x)
|
|
941
|
-
|
|
940
|
+
if ! wt_lk_admin=$(git -C "$1" rev-parse --absolute-git-dir 2>/dev/null && echo x); then
|
|
941
|
+
wt_lk_err=$(git -C "$1" rev-parse --absolute-git-dir 2>&1 >/dev/null) || :
|
|
942
|
+
wt_lk_err=$(printf '%s' "$wt_lk_err" | tr '\n' ' ') || wt_lk_err=
|
|
943
|
+
wt_why="$1 is a symbolic link through which git could not report its admin dir, so which worktree it stands for is unknown${wt_lk_err:+: $wt_lk_err}"
|
|
944
|
+
return 1
|
|
945
|
+
fi
|
|
946
|
+
if ! wt_lk_back=$(cat "${wt_lk_admin%?x}/gitdir" 2>/dev/null && echo x); then
|
|
942
947
|
wt_why="$1 is a symbolic link whose admin dir's gitdir back-pointer could not be read, so which worktree it stands for is unknown"
|
|
943
948
|
return 1
|
|
944
949
|
fi
|