send-pack: support pushing from a shallow clone via http

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 664dd20f407dffed002d63b8dab5a83079463445..cc257448177993dfec888e9b4a18320c116a469b 100644 (file)
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -209,9 +209,6 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
            (send_all && args.send_mirror))
                usage(send_pack_usage);
 
            (send_all && args.send_mirror))
                usage(send_pack_usage);
 

-       if (is_repository_shallow() && args.stateless_rpc)
-               die("attempt to push from a shallow repository");
-

        if (remote_name) {
                remote = remote_get(remote_name);
                if (!remote_has_url(remote, dest)) {
        if (remote_name) {
                remote = remote_get(remote_name);
                if (!remote_has_url(remote, dest)) {

diff --git a/send-pack.c b/send-pack.c
index cd536b4ed5436b9bd63e0649618508f5fdf7ec4e..848d15e9b5f62ae90c69b8894adf22c29348148b 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -175,6 +175,21 @@ static int sideband_demux(int in, int out, void *data)
        return ret;
 }
 
        return ret;
 }
 

+static int advertise_shallow_grafts_cb(const struct commit_graft *graft, void *cb)
+{
+       struct strbuf *sb = cb;
+       if (graft->nr_parent == -1)
+               packet_buf_write(sb, "shallow %s\n", sha1_to_hex(graft->sha1));
+       return 0;
+}
+
+void advertise_shallow_grafts_buf(struct strbuf *sb)
+{
+       if (!is_repository_shallow())
+               return;
+       for_each_commit_graft(advertise_shallow_grafts_cb, sb);
+}
+

 int send_pack(struct send_pack_args *args,
              int fd[], struct child_process *conn,
              struct ref *remote_refs,
 int send_pack(struct send_pack_args *args,
              int fd[], struct child_process *conn,
              struct ref *remote_refs,


@@ -215,7 +230,7 @@ int send_pack(struct send_pack_args *args,
        }
 
        if (!args->dry_run)
        }
 
        if (!args->dry_run)

-               advertise_shallow_grafts(out);
+               advertise_shallow_grafts_buf(&req_buf);

 
        /*
         * Finally, tell the other end!
 
        /*
         * Finally, tell the other end!


@@ -276,7 +291,7 @@ int send_pack(struct send_pack_args *args,
        }
 
        if (args->stateless_rpc) {
        }
 
        if (args->stateless_rpc) {

-               if (!args->dry_run && cmds_sent) {
+               if (!args->dry_run && (cmds_sent || is_repository_shallow())) {

                        packet_buf_flush(&req_buf);
                        send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
                }
                        packet_buf_flush(&req_buf);
                        send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
                }

diff --git a/t/t5538-push-shallow.sh b/t/t5538-push-shallow.sh
index 866621a74575d90e190a034a91fb12ddd96de125..0a6e40f144a767cba03818cffca8b8b2aa6a16e2 100755 (executable)
--- a/t/t5538-push-shallow.sh
+++ b/t/t5538-push-shallow.sh
@@ -154,5 +154,30 @@ EOF
        )
 '
 
        )
 '
 

+test_expect_success 'push from shallow repo via http' '
+       mv "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" shallow-upstream.git &&
+       git clone --bare --no-local full "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+       (
+       cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+       git config http.receivepack true
+       ) &&
+       commit 10 &&
+       git push $HTTPD_URL/smart/repo.git +master:refs/remotes/top/master &&
+       (
+       cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+       git fsck &&
+       git log --format=%s top/master >actual &&
+       cat <<EOF >expect &&
+10
+1
+4
+3
+2
+1
+EOF
+       test_cmp expect actual
+       )
+'
+

 stop_httpd
 test_done
 stop_httpd
 test_done