@feigi/fleet-ctl 3.29.4 → 3.29.5
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 +9 -5
package/package.json
CHANGED
package/scripts/worktree.sh
CHANGED
|
@@ -632,17 +632,21 @@ wt_occupied() { [ -e "$1" ] || [ -L "$1" ]; }
|
|
|
632
632
|
# once per run — the git dir does not move under a running script. 1 with
|
|
633
633
|
# `$wt_why` when git cannot name the common directory.
|
|
634
634
|
#
|
|
635
|
-
# `2>/dev/null`, never `2>&1
|
|
636
|
-
# `~/.gitconfig` with a key outside any section makes every git
|
|
637
|
-
# `error: key does not contain a section: …` on stderr AT EXIT
|
|
638
|
-
# would glue in front of it.
|
|
635
|
+
# `2>/dev/null`, never `2>&1`, on the capture that answers: it is used as a
|
|
636
|
+
# PATH, and a `~/.gitconfig` with a key outside any section makes every git
|
|
637
|
+
# command print `error: key does not contain a section: …` on stderr AT EXIT
|
|
638
|
+
# 0, which `2>&1` would glue in front of it. Git's own words are fetched with
|
|
639
|
+
# a second call, only on the path that refuses, and there stdout is discarded
|
|
640
|
+
# so `2>&1` has no path to glue onto.
|
|
639
641
|
wt_root=
|
|
640
642
|
# shellcheck disable=SC2034
|
|
641
643
|
wt_registry_root() {
|
|
642
644
|
wt_why=
|
|
643
645
|
[ -z "$wt_root" ] || return 0
|
|
644
646
|
if ! wt_rr_common=$(git rev-parse --path-format=absolute --git-common-dir 2>/dev/null); then
|
|
645
|
-
|
|
647
|
+
wt_rr_err=$(git rev-parse --path-format=absolute --git-common-dir 2>&1 >/dev/null) || :
|
|
648
|
+
wt_rr_err=$(printf '%s' "$wt_rr_err" | tr '\n' ' ') || wt_rr_err=
|
|
649
|
+
wt_why="cannot resolve the git common directory${wt_rr_err:+: $wt_rr_err}"
|
|
646
650
|
return 1
|
|
647
651
|
fi
|
|
648
652
|
wt_root="$wt_rr_common/worktrees"
|