undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'xl/record-partial-clone-origin' into maint

Browse Source 
When creating a partial clone, the object filtering criteria is
recorded for the origin of the clone, but this incorrectly used a
hardcoded name "origin" to name that remote; it has been corrected
to honor the "--origin <name>" option.

* xl/record-partial-clone-origin:
  clone: respect user supplied origin name when setting up partial clone
This commit is contained in:
Junio C Hamano 2019-07-25 14:27:12 -07:00
commit 9db52cf44b
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/clone.c
View File

@ -1220,7 +1220,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
remote_head_points_at, &branch_top); remote_head_points_at, &branch_top);
if (filter_options.choice) if (filter_options.choice)
partial_clone_register("origin", &filter_options); partial_clone_register(option_origin, &filter_options);
if (is_local) if (is_local)
clone_local(path, git_dir); clone_local(path, git_dir);

16
t/t5601-clone.sh
View File

@ -630,9 +630,8 @@ test_expect_success CASE_INSENSITIVE_FS 'colliding file detection' '
test_i18ngrep "the following paths have collided" icasefs/warning test_i18ngrep "the following paths have collided" icasefs/warning
' '
partial_clone () { partial_clone_server () {
SERVER="$1" && SERVER="$1" &&
URL="$2" &&
rm -rf "$SERVER" client && rm -rf "$SERVER" client &&
test_create_repo "$SERVER" && test_create_repo "$SERVER" &&
@ -642,8 +641,14 @@ partial_clone () {
test_commit -C "$SERVER" two && test_commit -C "$SERVER" two &&
HASH2=$(git hash-object "$SERVER/two.t") && HASH2=$(git hash-object "$SERVER/two.t") &&
test_config -C "$SERVER" uploadpack.allowfilter 1 && test_config -C "$SERVER" uploadpack.allowfilter 1 &&
test_config -C "$SERVER" uploadpack.allowanysha1inwant 1 && test_config -C "$SERVER" uploadpack.allowanysha1inwant 1
}
partial_clone () {
SERVER="$1" &&
URL="$2" &&
partial_clone_server "${SERVER}" &&
git clone --filter=blob:limit=0 "$URL" client && git clone --filter=blob:limit=0 "$URL" client &&
git -C client fsck && git -C client fsck &&
@ -660,6 +665,11 @@ test_expect_success 'partial clone' '
partial_clone server "file://$(pwd)/server" partial_clone server "file://$(pwd)/server"
' '
test_expect_success 'partial clone with -o' '
partial_clone_server server &&
git clone -o blah --filter=blob:limit=0 "file://$(pwd)/server" client
'
test_expect_success 'partial clone: warn if server does not support object filtering' ' test_expect_success 'partial clone: warn if server does not support object filtering' '
rm -rf server client && rm -rf server client &&
test_create_repo server && test_create_repo server &&