Squashed 'gitstatus/' changes from 96b520b2..260a5f4b
260a5f4b fix a bug in the build script that prevented it from working when using a newer git with init.defaultBranch override in the global config (#242) git-subtree-dir: gitstatus git-subtree-split: 260a5f4bc9776d41d500a51464249ce5e555a99e
This commit is contained in:
parent
96f3ca1733
commit
038de6f78b
29
build
29
build
|
@ -316,16 +316,33 @@ app="$outdir"/usrbin/"$appname"
|
||||||
command strip "$app".tmp
|
command strip "$app".tmp
|
||||||
|
|
||||||
command mkdir -- "$workdir"/repo
|
command mkdir -- "$workdir"/repo
|
||||||
command git -C "$workdir"/repo init
|
printf '[init]\n defaultBranch = master\n' >"$workdir"/.gitconfig
|
||||||
command git -C "$workdir"/repo config user.name "Your Name"
|
(
|
||||||
command git -C "$workdir"/repo config user.email "you@example.com"
|
cd -- "$workdir"/repo
|
||||||
command git -C "$workdir"/repo commit --allow-empty --allow-empty-message --no-gpg-sign -m ''
|
GIT_CONFIG_NOSYSTEM=1 HOME="$workdir" command git init
|
||||||
|
GIT_CONFIG_NOSYSTEM=1 HOME="$workdir" command git config user.name "Your Name"
|
||||||
|
GIT_CONFIG_NOSYSTEM=1 HOME="$workdir" command git config user.email "you@example.com"
|
||||||
|
GIT_CONFIG_NOSYSTEM=1 HOME="$workdir" command git commit \
|
||||||
|
--allow-empty --allow-empty-message --no-gpg-sign -m ''
|
||||||
|
)
|
||||||
|
|
||||||
resp="$(printf "hello\037$workdir/repo\036" | "$app".tmp)"
|
resp="$(printf "hello\037$workdir/repo\036" | "$app".tmp)"
|
||||||
[ -n "$resp" -a -z "${resp##hello*1*$workdir/repo*master*}" ]
|
case "$resp" in
|
||||||
|
hello*1*/repo*master*);;
|
||||||
|
*)
|
||||||
|
>&2 echo 'error: invalid gitstatusd response for a git repo'
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
resp="$(printf 'hello\037\036' | "$app".tmp)"
|
resp="$(printf 'hello\037\036' | "$app".tmp)"
|
||||||
[ -n "$resp" -a -z "${resp##hello*0*}" ]
|
case "$resp" in
|
||||||
|
hello*0*);;
|
||||||
|
*)
|
||||||
|
>&2 echo 'error: invalid gitstatusd response for a non-repo'
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
command mv -f -- "$app".tmp "$app"
|
command mv -f -- "$app".tmp "$app"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue