Skip to content

Commit

Permalink
Fix working directory for archiving from git.
Browse files Browse the repository at this point in the history
  - The directory specified no longer matches the directory used for
    fetching.

  - This was overlooked by PR microsoft#19338.
  • Loading branch information
mahge committed Nov 3, 2021
1 parent 7375bb4 commit 8997c89
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/cmake/vcpkg_from_git.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function(vcpkg_from_git)
if(DEFINED arg_TAG)
message(WARNING "The TAG argument to vcpkg_from_git has been deprecated and has no effect.")
endif()


if(NOT DEFINED arg_OUT_SOURCE_PATH)
message(FATAL_ERROR "OUT_SOURCE_PATH must be specified")
Expand Down Expand Up @@ -164,7 +164,7 @@ function(vcpkg_from_git)
vcpkg_execute_required_process(
ALLOW_IN_DOWNLOAD_MODE
COMMAND "${GIT}" archive "${rev_parse_ref}" -o "${temp_archive}"
WORKING_DIRECTORY "${DOWNLOADS}/git-tmp"
WORKING_DIRECTORY "${git_working_directory}"
LOGNAME git-archive
)
file(RENAME "${temp_archive}" "${archive}")
Expand Down

0 comments on commit 8997c89

Please sign in to comment.