From f7997575c4d9c7fa7cee4e11c97d80a10a08cc00 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Wed, 4 Jun 2008 10:52:20 +1000 Subject: [PATCH] Be consistent about quoting and indentation --- update_trees | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/update_trees b/update_trees index bca7152..a1925e6 100755 --- a/update_trees +++ b/update_trees @@ -65,17 +65,19 @@ for name in $quilters; do execute git branch -D "quilt/$name" execute git checkout -b "quilt/$name" "$rbase" || sh -i || { - [ -f "$sfile.orig" ] && mv -f $sfile.orig $sfile + [ -f "$sfile.orig" ] && + mv -f "$sfile.orig" "$sfile" exit 1 } author=$(grep -v '^#' ../real_control | awk -F ' ' '$3=="'"$name"'" { printf("%s", $1); }' | sed 's/,.*$//') execute git quiltimport --author "$author" --patches "../quilt/$name" || sh -i || { - [ -f "$sfile.orig" ] && mv -f $sfile.orig $sfile + [ -f "$sfile.orig" ] && + mv -f "$sfile.orig" "$sfile" exit 1 } [ -f "$sfile.orig" ] && - mv -f $sfile.orig $sfile + mv -f "$sfile.orig" "$sfile" done git checkout master -- 2.47.3