summaryrefslogtreecommitdiff
path: root/include/git.sh
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-12-22 13:05:32 +0000
committerLeah Rowe <leah@libreboot.org>2023-12-23 02:52:30 +0000
commitb0e5fc9d9c8f648b2b98c48d126cf8e6e828ddd4 (patch)
tree4b9de2046d8923e7e38754276bf3911741d9a54b /include/git.sh
parentb111f4840a043a7337937c001e1f82b7af3302f2 (diff)
lbmk scripts: general code cleanup
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include/git.sh')
-rwxr-xr-xinclude/git.sh16
1 files changed, 5 insertions, 11 deletions
diff --git a/include/git.sh b/include/git.sh
index 1d63f99c..274b5f3f 100755
--- a/include/git.sh
+++ b/include/git.sh
@@ -120,32 +120,26 @@ clone_project()
git_reset_rev()
{
- (
- cd "${1}" || err "git_reset_rev: !cd ${1}"
- git reset --hard ${2} || err "!git reset ${1} <- ${2}"
+ git -C "${1}" reset --hard ${2} || err "!git reset ${1} <- ${2}"
if [ "${project}" != "coreboot" ] && [ "${project}" != "u-boot" ] && \
- [ -f ".gitmodules" ]; then
- git submodule update --init --checkout || \
+ [ -f "${1}/.gitmodules" ]; then
+ git -C "${1}" submodule update --init --checkout || \
err "git_reset_rev ${1}: can't download submodules"
fi
- ) || err "git reset fail"
}
git_am_patches()
{
sdir="${1}" # assumed to be absolute path
patchdir="${2}" # ditto
- (
- cd "${sdir}" || err "git_am_patches: !cd ${sdir}"
for patch in "${patchdir}/"*; do
[ -L "${patch}" ] && continue
[ -f "${patch}" ] || continue
- git am "${patch}" || patchfail="y"
+ git -C "${sdir}" am "${patch}" || patchfail="y"
[ "${patchfail}" != "y" ] && continue
- git am --abort || err "${sdir}: !git am --abort"
+ git -C "${sdir}" am --abort || err "${sdir}: !git am --abort"
err "!git am ${patch} -> ${sdir}"
done
- ) || err "PATCH FAILURE"
for patches in "${patchdir}/"*; do
[ -L "${patches}" ] && continue
[ ! -d "${patches}" ] && continue