libxfs-apply: don't add duplicate headers

When we're backporting patches from libxfs, don't add a S-o-b header if
there's already one at the end of the headers of the patch being ported.

That way, we avoid things like:
 Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
 Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/tools/libxfs-apply b/tools/libxfs-apply
index 3258272d6189de17cc95593d4f5604894d65ed5d..9271db3801983fb1d82f2bccb88bb097fe96b124 100755 (executable)
--- a/tools/libxfs-apply
+++ b/tools/libxfs-apply
@@ -193,6 +193,14 @@ filter_xfsprogs_patch()
        rm -f $_libxfs_files
 }
 
+add_header()
+{
+       local hdr="$1"
+       local hdrfile="$2"
+
+       tail -n 1 "$hdrfile" | grep -q "^${hdr}$" || echo "$hdr" >> "$hdrfile"
+}
+
 fixup_header_format()
 {
        local _source=$1
@@ -280,13 +288,13 @@ fixup_header_format()
        sed -i '${/^[[:space:]]*$/d;}' $_hdr.new
 
        # Add Signed-off-by: header if specified
-       if [ ! -z ${SIGNED_OFF_BY+x} ]; then 
-               echo "Signed-off-by: $SIGNED_OFF_BY" >> $_hdr.new
+       if [ ! -z ${SIGNED_OFF_BY+x} ]; then
+               add_header "Signed-off-by: $SIGNED_OFF_BY" $_hdr.new
        else    # get it from git config if present
                SOB_NAME=`git config --get user.name`
                SOB_EMAIL=`git config --get user.email`
                if [ ! -z ${SOB_NAME+x} ]; then
-                       echo "Signed-off-by: $SOB_NAME <$SOB_EMAIL>" >> $_hdr.new
+                       add_header "Signed-off-by: $SOB_NAME <$SOB_EMAIL>" $_hdr.new
                fi
        fi