@sassywares/skills 0.5.0 → 0.5.2
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
CHANGED
|
@@ -281,10 +281,15 @@ if (( CHECK )); then
|
|
|
281
281
|
esac
|
|
282
282
|
fi
|
|
283
283
|
|
|
284
|
-
if [[ "$
|
|
285
|
-
if [[
|
|
284
|
+
if [[ -n "$(yflat "git${US}default_branch")" ]]; then
|
|
285
|
+
if [[ "$TOPOLOGY" == "workspace" ]]; then
|
|
286
|
+
bad "git.default_branch is gone — the mirror's branch is git.mirror_branch"
|
|
287
|
+
else
|
|
286
288
|
bad "git.default_branch is gone — use git.base_map with a \"*\" entry"
|
|
287
289
|
fi
|
|
290
|
+
fi
|
|
291
|
+
|
|
292
|
+
if [[ "$TOPOLOGY" == "repo" ]]; then
|
|
288
293
|
if [[ -z "$(yflat "git${US}base_map${US}*")" ]]; then
|
|
289
294
|
bad "git.base_map has no \"*\" entry — it is the base for ordinary work"
|
|
290
295
|
else
|
|
@@ -297,7 +302,8 @@ if (( CHECK )); then
|
|
|
297
302
|
done < <(yaml_flat | awk -F'\t' -v us="$US" '{n=split($1,a,us); if (n==3 && a[1]=="git" && a[2]=="base_map") print a[3]}' | sort -u)
|
|
298
303
|
head_ref="${HEAD_ARG:-$(git -C "$ROOT" branch --show-current 2>/dev/null || true)}"
|
|
299
304
|
if [[ -n "$head_ref" ]]; then
|
|
300
|
-
|
|
305
|
+
# the --head readout below prints this line; avoid printing it twice
|
|
306
|
+
[[ -n "$HEAD_ARG" ]] || note " base for '${head_ref}': $(base_for_head "$head_ref")"
|
|
301
307
|
cur="$head_ref"; hops=0
|
|
302
308
|
while [[ -n "$cur" ]] && (( hops < 8 )); do
|
|
303
309
|
next="$(yflat "git${US}base_map${US}${cur}")"
|
|
@@ -367,7 +373,10 @@ if (( CHECK )); then
|
|
|
367
373
|
done < <(hook_patterns)
|
|
368
374
|
|
|
369
375
|
# Resolve for one head, so nobody has to merge maps in their head.
|
|
370
|
-
if [[ -n "$HEAD_ARG"
|
|
376
|
+
if [[ -n "$HEAD_ARG" ]]; then
|
|
377
|
+
if [[ "$TOPOLOGY" == "repo" ]]; then
|
|
378
|
+
note " base for '$HEAD_ARG': $(base_for_head "$HEAD_ARG")"
|
|
379
|
+
fi
|
|
371
380
|
for point in before_create after_create before_merge after_merge; do
|
|
372
381
|
resolved="$(hooks_for_head_point "$HEAD_ARG" "$point")"
|
|
373
382
|
note " head '$HEAD_ARG' → $point: $( [[ -n "$resolved" ]] && printf '%s' "$resolved" || printf 'none' )"
|