From e9428b6f014a4f8ac4b4182e00fb16c99e98964a Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Fri, 3 Apr 2020 18:58:31 -0700 Subject: [PATCH] devops: fixate diff algorithm to not rely on dev settings (#1663) --- browser_patches/export.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser_patches/export.sh b/browser_patches/export.sh index 0f0b20fa67..2b4e48eb2c 100755 --- a/browser_patches/export.sh +++ b/browser_patches/export.sh @@ -109,7 +109,7 @@ fi CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) NEW_BASE_REVISION=$(git merge-base $REMOTE_BROWSER_UPSTREAM/$BASE_BRANCH $CURRENT_BRANCH) -NEW_DIFF=$(git diff --full-index $NEW_BASE_REVISION $CURRENT_BRANCH) +NEW_DIFF=$(git diff --diff-algorithm=myers --full-index $NEW_BASE_REVISION $CURRENT_BRANCH) # Increment BUILD_NUMBER BUILD_NUMBER=$(cat $EXPORT_PATH/BUILD_NUMBER) BUILD_NUMBER=$((BUILD_NUMBER+1))