Fix format script diff file only (#6007)
author오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>
Tue, 30 Jul 2019 11:49:11 +0000 (20:49 +0900)
committer이한종/On-Device Lab(SR)/Engineer/삼성전자 <hanjoung.lee@samsung.com>
Tue, 30 Jul 2019 11:49:11 +0000 (20:49 +0900)
To get correct updated files when master is update after branch out, count new commits after branch out from master and compare with branch out commit

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
infra/command/format

index 39b3b22..5fb5e90 100644 (file)
@@ -152,12 +152,13 @@ FILES_TO_CHECK=$(git ls-files)
 if [[ "${CHECK_DIFF_ONLY}" = "1" ]]; then
   MASTER_EXIST=$(git rev-parse --verify master)
   CURRENT_BRANCH=$(git branch | grep \* | cut -d ' ' -f2-)
+  DIFF_COMMITS=`git log --graph --oneline master..HEAD | wc -l`
   if [[ -z "${MASTER_EXIST}" ]]; then
     echo "Cannot found local master branch"
   elif [[ "${CURRENT_BRANCH}" = "master" ]]; then
     echo "Current branch is master"
   else
-    FILES_TO_CHECK=$(git diff --name-only master)
+    FILES_TO_CHECK=$(git diff --name-only HEAD~${DIFF_COMMITS}..HEAD)
   fi
 fi