From 7f9e1f8d0f737cb6c8653778a31e7a6b325308d8 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 5 May 2008 16:25:20 +1000 Subject: [PATCH] Use the first contact as the author if quiltimport cannot find another --- update_trees | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/update_trees b/update_trees index 32f9b77..7cfab7f 100755 --- a/update_trees +++ b/update_trees @@ -12,7 +12,7 @@ log() execute() { log "$" $@ - $@ 2>&1 | tee -a ../quilt-import.log + "$@" 2>&1 | tee -a ../quilt-import.log } quilters=$(grep -v '^#' ../real_control | awk -F ' ' '$2=="quilt" { print $3; }') @@ -58,8 +58,8 @@ for name in $quilters; do [ -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 --patches "../quilt/$name" || sh -i || { + 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 exit 1 } -- 2.39.5