diff options
| author | Michele Locati <michele@locati.it> | 2018-03-19 16:11:54 +0100 |
|---|---|---|
| committer | Michele Locati <michele@locati.it> | 2018-03-19 16:11:54 +0100 |
| commit | e06f9133700ea15e13d5a84871e170651772cbab (patch) | |
| tree | 67cbd6f188ec4c37002750288af778bc2e1e5ca5 /test/tests/filter-directory-prune-branches.success | |
| parent | 51eb63f8a10813512e539198671f2b30d4cfe37b (diff) | |
| download | incremental-git-filter-branch-e06f9133700ea15e13d5a84871e170651772cbab.tar.gz incremental-git-filter-branch-e06f9133700ea15e13d5a84871e170651772cbab.tar.bz2 incremental-git-filter-branch-e06f9133700ea15e13d5a84871e170651772cbab.zip | |
Disable flock in tests when it's not available
Diffstat (limited to 'test/tests/filter-directory-prune-branches.success')
| -rwxr-xr-x | test/tests/filter-directory-prune-branches.success | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/tests/filter-directory-prune-branches.success b/test/tests/filter-directory-prune-branches.success index 9d39fec..7bd7c0b 100755 --- a/test/tests/filter-directory-prune-branches.success +++ b/test/tests/filter-directory-prune-branches.success @@ -4,7 +4,7 @@ initializeRepositories -"${BIN_MAIN}" --workdir "${DIR_TEMP}" -- "${DIR_SOURCE}" '--prune-empty --subdirectory-filter subdir' "${DIR_DESTINATION}" +"${BIN_MAIN}" ${BIN_MAIN_OPTIONS} --workdir "${DIR_TEMP}" -- "${DIR_SOURCE}" '--prune-empty --subdirectory-filter subdir' "${DIR_DESTINATION}" echo 'Fetching initial branches' actualBranches="$(getBranchList "${DIR_DESTINATION}")" @@ -15,7 +15,7 @@ then exit 1 fi -"${BIN_MAIN}" --workdir "${DIR_TEMP}" --branch-blacklist 'slave' --prune-branches -- "${DIR_SOURCE}" '--prune-empty --subdirectory-filter subdir' "${DIR_DESTINATION}" +"${BIN_MAIN}" ${BIN_MAIN_OPTIONS} --workdir "${DIR_TEMP}" --branch-blacklist 'slave' --prune-branches -- "${DIR_SOURCE}" '--prune-empty --subdirectory-filter subdir' "${DIR_DESTINATION}" echo 'Fetching final branches' actualBranches="$(getBranchList "${DIR_DESTINATION}")" |