From 691466845e4649e20d73718c479865fa38b362c1 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Mon, 31 Jan 2011 15:00:27 +0100 Subject: [PATCH] otp-get-patches.sh: Remove patch numbering The patch numbering just increases the diff when adding a patch without giving sufficient real benefits to balance that out. --- otp-get-patches.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/otp-get-patches.sh b/otp-get-patches.sh index 835a3ef..65671cd 100755 --- a/otp-get-patches.sh +++ b/otp-get-patches.sh @@ -41,7 +41,7 @@ tmpdir="$(mktemp -d --tmpdir="$PWD")" # Generate patch files pushd "$otp_dir" -git format-patch -o "$tmpdir" "${otp_upstream}..${otp_fedora}" > "$tmpdir/patch-list.txt" +git format-patch -N -o "$tmpdir" "${otp_upstream}..${otp_fedora}" > "$tmpdir/patch-list.txt" popd test -s "$tmpdir/patch-list.txt" @@ -57,7 +57,7 @@ do comment="$(sed -n 's/^Fedora-Spec-Comment:\s*//p' "$otppatch")" if test "x$comment" = "x"; then comment="Fedora specific patch"; fi echo "# ${comment}" >> "$tmpdir/patch-list-tags.txt" - echo "# $(sed -n 's/^Subject: \[PATCH /\[/p' "$otppatch")" >> "$tmpdir/patch-list-tags.txt" + echo "# $(sed -n 's/^Subject: \[PATCH\] //p' "$otppatch")" >> "$tmpdir/patch-list-tags.txt" echo "Patch$n: $(basename "$otppatch")" >> "$tmpdir/patch-list-tags.txt" base="$(basename "$patch" ".patch" | sed 's/^00[0-9][0-9]-//')" backupext=".$(echo -n "$base" | tr -c -s '[:alnum:]' '_')"