From 88f35ffdedd09a63802d9c4fdeedff11db692f55 Mon Sep 17 00:00:00 2001 From: Alois Mahdal Date: Sep 18 2018 12:17:38 +0000 Subject: Adjust oracle based on git version --- diff --git a/src/sanity/request-pull/test b/src/sanity/request-pull/test index b6bfa36..7e8eb10 100644 --- a/src/sanity/request-pull/test +++ b/src/sanity/request-pull/test @@ -43,6 +43,11 @@ jat__pstarts -C bobsclone "create pull request" git request-pull origin/master "file://${PWD}" jat__pend +O_REPOLINK="file://$PWD/bobsclone" +case $(git --version | cut -d' ' -f3) in + 1.*) O_REPOLINK+=" master" ;; +esac + jat__pstartt jat__cmd -h "no err were seen" -S 1 \ test -s git.err @@ -57,7 +62,7 @@ jat__pstartt jat__cmd -h "Commit summmary is correct" \ grep -qF '2 files changed, 2 insertions(+)' git.out jat__cmd -h "Commit summmary is correct" \ - grep -qF "file://$PWD/bobsclone master" git.out + grep -qF "$O_REPOLINK" git.out jat__pend jat__pstartd