git.sh: shorter variable names
Signed-off-by: Leah Rowe <leah@libreboot.org>audit2-merge1
parent
6693588857
commit
71a9fcced8
|
@ -124,16 +124,15 @@ git_prep()
|
||||||
|
|
||||||
patch_submodules()
|
patch_submodules()
|
||||||
{
|
{
|
||||||
moddir="${PWD}/config/submodule/$project"
|
mdir="${PWD}/config/submodule/$project"
|
||||||
[ -n "$tree" ] && moddir="$moddir/$tree"
|
[ -n "$tree" ] && mdir="$mdir/$tree"
|
||||||
[ -d "$moddir" ] || return 0
|
[ -d "$mdir" ] || return 0
|
||||||
|
|
||||||
git -C "$tmpgit" submodule status | awk '{print $2}' > \
|
git -C "$tmpgit" submodule status | awk '{print $2}' > \
|
||||||
"$tmpdir/modules" || $err "$moddir: cannot list submodules"
|
"$tmpdir/modules" || $err "$mdir: cannot list submodules"
|
||||||
|
|
||||||
while read -r modsrcdir; do
|
while read -r msrcdir; do
|
||||||
modpatchdir="$moddir/${modsrcdir##*/}/patches"
|
git_am_patches "$tmpgit/$msrcdir" "$mdir/${msrcdir##*/}/patches"
|
||||||
git_am_patches "$tmpgit/$modsrcdir" "$modpatchdir"
|
|
||||||
done < "$tmpdir/modules"
|
done < "$tmpdir/modules"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue