]> git.ozlabs.org Git - next-scripts/commitdiff
Use the first contact as the author if quiltimport cannot find another
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 May 2008 06:25:20 +0000 (16:25 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 May 2008 06:25:20 +0000 (16:25 +1000)
update_trees

index 32f9b778d0034c3d62a902061d2d0577d38839d7..7cfab7faaf0be642b4b5e18421449fc208b72116 100755 (executable)
@@ -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
        }