diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-11 14:56:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-11 14:56:59 -0700 |
| commit | 2de0f39cd27d8ab8eae2e3430b81294f26252693 (patch) | |
| tree | cf9fc811487dc0c43ceb4cdd6a9f5a330054c8e6 | |
| parent | Update draft release notes to 1.8.5 for the second batch of topics (diff) | |
| parent | push: respect --no-thin (diff) | |
| download | tgif-2de0f39cd27d8ab8eae2e3430b81294f26252693.tar.xz | |
Merge branch 'nd/push-no-thin'
"git push --no-thin" was a no-op by mistake.
* nd/push-no-thin:
push: respect --no-thin
| -rw-r--r-- | builtin/push.c | 5 | ||||
| -rw-r--r-- | builtin/receive-pack.c | 8 | ||||
| -rwxr-xr-x | t/t5516-fetch-push.sh | 17 |
3 files changed, 26 insertions, 4 deletions
diff --git a/builtin/push.c b/builtin/push.c index 50bbfd62b1..7b1b66c36a 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -15,7 +15,7 @@ static const char * const push_usage[] = { NULL, }; -static int thin; +static int thin = 1; static int deleterefs; static const char *receivepack; static int verbosity; @@ -315,8 +315,7 @@ static int push_with_options(struct transport *transport, int flags) if (receivepack) transport_set_option(transport, TRANS_OPT_RECEIVEPACK, receivepack); - if (thin) - transport_set_option(transport, TRANS_OPT_THIN, "yes"); + transport_set_option(transport, TRANS_OPT_THIN, thin ? "yes" : NULL); if (!is_empty_cas(&cas)) { if (!transport->smart_options) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 7434d9b4a2..b7e71a04f6 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -39,6 +39,7 @@ static int quiet; static int prefer_ofs_delta = 1; static int auto_update_server_info; static int auto_gc = 1; +static int fix_thin = 1; static const char *head_name; static void *head_name_to_free; static int sent_capabilities; @@ -870,7 +871,8 @@ static const char *unpack(int err_fd) keeper[i++] = "--stdin"; if (fsck_objects) keeper[i++] = "--strict"; - keeper[i++] = "--fix-thin"; + if (fix_thin) + keeper[i++] = "--fix-thin"; keeper[i++] = hdr_arg; keeper[i++] = keep_arg; keeper[i++] = NULL; @@ -976,6 +978,10 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix) stateless_rpc = 1; continue; } + if (!strcmp(arg, "--reject-thin-pack-for-testing")) { + fix_thin = 0; + continue; + } usage(receive_pack_usage); } diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 4691d51b8c..99c32d7539 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -1172,4 +1172,21 @@ test_expect_success 'push --follow-tag only pushes relevant tags' ' test_cmp expect actual ' +test_expect_success 'push --no-thin must produce non-thin pack' ' + cat >>path1 <<\EOF && +keep base version of path1 big enough, compared to the new changes +later, in order to pass size heuristics in +builtin/pack-objects.c:try_delta() +EOF + git commit -am initial && + git init no-thin && + git --git-dir=no-thin/.git config receive.unpacklimit 0 && + git push no-thin/.git refs/heads/master:refs/heads/foo && + echo modified >> path1 && + git commit -am modified && + git repack -adf && + rcvpck="git receive-pack --reject-thin-pack-for-testing" && + git push --no-thin --receive-pack="$rcvpck" no-thin/.git refs/heads/master:refs/heads/foo +' + test_done |