From 2c8b9a4d0482c41d37a9f0dfd7fc4f4a2cbee23f Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 7 Feb 2020 02:58:24 +0000 Subject: [PATCH 1/2] test: link-check against merge base Fixes #977 --- scripts/link-check-git-diff.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/link-check-git-diff.sh b/scripts/link-check-git-diff.sh index 79e56817ee..3697b3f4df 100755 --- a/scripts/link-check-git-diff.sh +++ b/scripts/link-check-git-diff.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash set -euxo pipefail -$(dirname "$0")/link-check.sh <(git diff origin/master -U0) +$(dirname "$0")/link-check.sh <(git diff $(git merge-base HEAD origin/master) -U0) From 17bdb0e225ed38e85bab6a63a18839eb87f03305 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 7 Feb 2020 03:04:36 +0000 Subject: [PATCH 2/2] test: link-check diff additions only --- scripts/link-check-git-diff.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/link-check-git-diff.sh b/scripts/link-check-git-diff.sh index 3697b3f4df..fe09ea5326 100755 --- a/scripts/link-check-git-diff.sh +++ b/scripts/link-check-git-diff.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash set -euxo pipefail -$(dirname "$0")/link-check.sh <(git diff $(git merge-base HEAD origin/master) -U0) +$(dirname "$0")/link-check.sh <(git diff $(git merge-base HEAD origin/master) -U0 | grep '^\+')