ofed_scripts/strip.sh: Fixed git am for new git versions

git version 2.14.1 and higher fails to apply backport patches
where the index field looks like: index xxxxxxx..xxxxxxx xxxxxx
So, changed strip.sh to leave the mode field of the patch index untouched.

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>

diff --git a/ofed_scripts/strip.sh b/ofed_scripts/strip.sh
index f9d15c894492d17e0b70bdda24fc7223c16ed46c..bbbfeae01c0315ee34fc35d089a5b89d73cb69f2 100755 (executable)
--- a/ofed_scripts/strip.sh
+++ b/ofed_scripts/strip.sh
@@ -1,4 +1,30 @@
 #!/bin/bash
+#
+# Copyright (c) 2017 Mellanox Technologies. All rights reserved.
+#
+# This Software is licensed under one of the following licenses:
+#
+# 1) under the terms of the "Common Public License 1.0" a copy of which is
+#    available from the Open Source Initiative, see
+#    http://www.opensource.org/licenses/cpl.php.
+#
+# 2) under the terms of the "The BSD License" a copy of which is
+#    available from the Open Source Initiative, see
+#    http://www.opensource.org/licenses/bsd-license.php.
+#
+# 3) under the terms of the "GNU General Public License (GPL) Version 2" a
+#    copy of which is available from the Open Source Initiative, see
+#    http://www.opensource.org/licenses/gpl-license.php.
+#
+# Licensee has the right to choose one of the above licenses.
+#
+# Redistributions of source code must retain the above copyright
+# notice and one of the license notices.
+#
+# Redistributions in binary form must reproduce both the above copyright
+# notice, one of the license notices in the documentation
+# and/or other materials provided with the distribution.
+#
 
 tmpfile='mktemp' || exit 1
 
@@ -14,7 +40,6 @@ if [ ! "$last" == "-- " ]; then
 fi
 
 head -n -3 $1 | \
-       sed -e "s/^index [[:xdigit:]]\{7\}\.\.[[:xdigit:]]\{7\} [[:digit:]]\{6\}$/index xxxxxxx..xxxxxxx xxxxxx/" | \
+       sed -e "s/^index [[:xdigit:]]\+\.\.[[:xdigit:]]\+/index xxxxxxx..xxxxxxx/" | \
        grep -v "^From " | \
        grep -v "^Date: " > $tmpfile && mv $1 $1.orig && mv $tmpfile $1
-