diff options
| -rwxr-xr-x | src/third_party/wiredtiger/dist/s_clang-format | 12 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/dist/s_clang-format b/src/third_party/wiredtiger/dist/s_clang-format index 80de76b7c36..28f68531963 100755 --- a/src/third_party/wiredtiger/dist/s_clang-format +++ b/src/third_party/wiredtiger/dist/s_clang-format @@ -18,8 +18,16 @@ download_clang_format() { fi } -# Find the top-level WiredTiger directory and move to there. -cd `git rev-parse --show-toplevel` || exit 1 +# Find the top-level WiredTiger directory. +dest_dir=$(git rev-parse --show-toplevel) + +# If this is a MongoDB source tree, move to the WiredTiger subtree. +git_repo_str=$(git config remote.origin.url) +is_mongo_repo=$(echo "$git_repo_str" | grep "mongodb/mongo") +if [ -n "$is_mongo_repo" ] ; then + dest_dir="$dest_dir/src/third_party/wiredtiger" +fi +cd "$dest_dir" || exit 1 # Override existing Clang Format versions in the PATH. export PATH="${PWD}/dist":$PATH diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 9a5e99ab4cb..c3b705358e2 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "d5568ab33033bf075ba69fd1261c0d18c84c752f" + "commit": "408727cf197d5171b6109c968908a134da63eff6" } |