On Thu, 27 Sep 2007, Dan Nicholson wrote: > When quiltimport encounters a non-existent patch in the series file, > just skip to the next patch. This matches the behavior of quilt. > > Signed-off-by: Dan Nicholson <dbn.lists@xxxxxxxxx> Acked-by: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx> > --- > git-quiltimport.sh | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/git-quiltimport.sh b/git-quiltimport.sh > index 74a54d5..880c81d 100755 > --- a/git-quiltimport.sh > +++ b/git-quiltimport.sh > @@ -71,6 +71,10 @@ commit=$(git rev-parse HEAD) > > mkdir $tmp_dir || exit 2 > for patch_name in $(grep -v '^#' < "$QUILT_PATCHES/series" ); do > + if ! [ -f "$QUILT_PATCHES/$patch_name" ] ; then > + echo "$patch_name doesn't exist. Skipping." > + continue > + fi > echo $patch_name > git mailinfo "$tmp_msg" "$tmp_patch" \ > <"$QUILT_PATCHES/$patch_name" >"$tmp_info" || exit 3 > -- > 1.5.3.2 With kind regards, Geert Uytterhoeven Software Architect Sony Network and Software Technology Center Europe The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium Phone: +32 (0)2 700 8453 Fax: +32 (0)2 700 8622 E-mail: Geert.Uytterhoeven@xxxxxxxxxxx Internet: http://www.sony-europe.com/ Sony Network and Software Technology Center Europe A division of Sony Service Centre (Europe) N.V. Registered office: Technologielaan 7 · B-1840 Londerzeel · Belgium VAT BE 0413.825.160 · RPR Brussels Fortis Bank Zaventem · Swift GEBABEBB08A · IBAN BE39001382358619
