[dpdk-stable] [PATCH 2/2] import: fix duplicate subject lines
Christian Ehrhardt
christian.ehrhardt at canonical.com
Mon Jul 30 18:24:47 CEST 2018
In some cases like
7fa7216ed S mem: fix alignment of requested virtual areas (18.05)
d5dd22c9f S mem: fix alignment of requested virtual areas (18.05)
The current scripting will loose the former change.
It will create files based on format-patch and then later on import
them.
But due to the same subject line the later exported change will override
the former change.
Avoid that issue by using the commit-id as suffix for the filenames and
by that ensuring that they will be unique.
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
---
import-commit | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/import-commit b/import-commit
index 8d0763f..218924e 100644
--- a/import-commit
+++ b/import-commit
@@ -21,7 +21,7 @@ init()
exit 1
}
- patch=$($GIT format-patch -o $STABLE_DIR $commit -1)
+ patch=$($GIT format-patch --suffix="-$commit.patch" -o $STABLE_DIR $commit -1)
}
# add "[ upstream commit xxxx ]" tag
--
2.17.1
More information about the stable
mailing list