From a0e27a5933aa3357a375692e097aab2b1d30ccfd Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 16 Jun 2015 20:08:43 +0200 Subject: [PATCH] Fix filter_commit in common_translation_update.sh This fixes a problem with propose_translation_update.sh on oslo.concurrency: + git reset -q oslo.concurrency/locale/en_GB/LC_MESSAGES/oslo.concurrency-log-error.po fatal: ambiguous argument 'oslo.concurrency/locale/en_GB/LC_MESSAGES/oslo.concurrency-log-error.po': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git [...] -- [...]' Add the "--" to separate paths to handle deleted files as well. Change-Id: Ifbce50bd851ea0028ebbb948e5173bda5777fc43 --- jenkins/scripts/common_translation_update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/scripts/common_translation_update.sh b/jenkins/scripts/common_translation_update.sh index 40f4856df1..64e02cd7fb 100644 --- a/jenkins/scripts/common_translation_update.sh +++ b/jenkins/scripts/common_translation_update.sh @@ -338,7 +338,7 @@ function filter_commits { # their own. if [ $PO_CHANGE -eq 0 ] ; then for f in $(git diff --cached --name-only) ; do - git reset -q "$f" + git reset -q -- "$f" git checkout -- "$f" done fi