From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by dpdk.org (Postfix) with ESMTP id 1AD4E5B34 for ; Mon, 30 Jul 2018 18:24:50 +0200 (CEST) Received: from 1.general.paelzer.uk.vpn ([10.172.196.172] helo=lap.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fkAyY-0000yv-01; Mon, 30 Jul 2018 16:24:50 +0000 From: Christian Ehrhardt To: Luca Boccassi , dpdk stable Cc: Christian Ehrhardt Date: Mon, 30 Jul 2018 18:24:47 +0200 Message-Id: <20180730162447.17661-2-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180730162447.17661-1-christian.ehrhardt@canonical.com> References: <20180730162447.17661-1-christian.ehrhardt@canonical.com> Subject: [dpdk-stable] [PATCH 2/2] import: fix duplicate subject lines X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2018 16:24:50 -0000 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 --- 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