Authentication-Results: mail-b.sr.ht; dkim=pass header.d=gmail.com header.i=@gmail.com Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mail-b.sr.ht (Postfix) with ESMTPS id 702CD11F06D for <~radicle-link/dev@lists.sr.ht>; Thu, 1 Sep 2022 18:07:56 +0000 (UTC) Received: by mail-pj1-f48.google.com with SMTP id w88-20020a17090a6be100b001fbb0f0b013so3485058pjj.5 for <~radicle-link/dev@lists.sr.ht>; Thu, 01 Sep 2022 11:07:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=TIqexolnElO2K+bzZw0A7gbZnM7iiwL66OzFw1b5tqE=; b=pSO6y9/xPq+7cASQoEHke9DVZUOlI37CfvbxwezmDcXpqJugLiIcl1jFa1OWXZsamI psepiop/sfy+4nCSaCuuqreuVPFvutcxOPjxm3GvZqxC7jrmCeg1X0oizJ/Jq/HS3nrx /tngYSVsUcoEJBXN4O0DEUI+SLKZADucq4NxwXTBjhviNOwHo6Ln4JmEG+11aArAa3iR r2p9MwXtOt8Coc/4B0oIIZYlJfs/D8nIkZwAR7OxO+nfz2xn2R+GKHjHWfbHCwwGCNcT Pn+jqgf6x2RuUG9bDLJHoSRSpF/u/ennogp4jO3LHEecMWvNevBgqnIx56JWnfIT+3q6 nrDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=TIqexolnElO2K+bzZw0A7gbZnM7iiwL66OzFw1b5tqE=; b=UtwiSuLOeNOAG8GRVbyrfyfMM8bqC1bpUucDlzXHhjbs6m0Eyg6zCbIWMB2zjlTPHv OamjaJHyBmzR7vXCwhhcx2tCx6aVjWd3lGYOtKoMyvGgzPrSyHvrBn0//EE+2rauW9UY fv0+htkORaBiBnsezbvNDzwkuc2OJQSlM/oANlrF7E2lk27sjW1U00Q5vW/cmNwLounk L6hIobNmIYShQPa7FdFBakCtFYgANpeaoBNsO4cZ8H2yFxWL0sO0z39iWLKpTqfH+6xw 9G31umOK24DqJcarMLsNq8S1HPW2ejLSmYDuCEIb332dJ2jYdtUUtP+/LpgWn+Abq2pI 1vxw== X-Gm-Message-State: ACgBeo2GFr/Cv3gkOlTvw+dYzjZeJ1B8BZKVZWdOnT9lm90hVaixgPBD UToHlDdgQ/pSOpjU5Q6DJebHDkSoHvI= X-Google-Smtp-Source: AA6agR6v24Pbl1ep8lMu+mRbBVaMHvBPsb938c/LQVZ7+zvOcCSOutlTTocVNHfcEJf2JJprcRAOJA== X-Received: by 2002:a17:90a:640c:b0:1f7:6ecf:33b6 with SMTP id g12-20020a17090a640c00b001f76ecf33b6mr378933pjj.3.1662055674710; Thu, 01 Sep 2022 11:07:54 -0700 (PDT) Received: from localhost.localdomain (c-98-207-161-235.hsd1.ca.comcast.net. [98.207.161.235]) by smtp.gmail.com with ESMTPSA id q15-20020a17090311cf00b0016eede528b4sm14256197plh.61.2022.09.01.11.07.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Sep 2022 11:07:54 -0700 (PDT) From: Han Xu To: ~radicle-link/dev@lists.sr.ht Cc: Han Xu Subject: [PATCH radicle-link v8 1/3] fix post_receive to send updated refs in request_pull Date: Thu, 1 Sep 2022 11:07:47 -0700 Message-Id: <20220901180749.7976-2-keepsimple@gmail.com> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220901180749.7976-1-keepsimple@gmail.com> References: <20220825210251.61675-1-keepsimple@gmail.com> <20220901180749.7976-1-keepsimple@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit --- cli/gitd-lib/src/hooks.rs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/cli/gitd-lib/src/hooks.rs b/cli/gitd-lib/src/hooks.rs index 5e928ffd..cf37d71f 100644 --- a/cli/gitd-lib/src/hooks.rs +++ b/cli/gitd-lib/src/hooks.rs @@ -77,6 +77,16 @@ where E: std::error::Error + Send + 'static, P: ProgressReporter, { + // update the signed refs before a possible request_pull, + // so that the peer can receive the latest refs. + let at = update_signed_refs( + reporter, + self.spawner.clone(), + self.pool.clone(), + urn.clone(), + ) + .await?; + if self.post_receive.request_pull { tracing::info!("executing request-pull"); request_pull(reporter, &self.client, &self.seeds, urn.clone()).await?; @@ -87,14 +97,7 @@ where ) .await?; } - let at = match update_signed_refs( - reporter, - self.spawner.clone(), - self.pool.clone(), - urn.clone(), - ) - .await? - { + let at = match at { Some(at) => at, None => return Ok(()), }; -- 2.32.0 (Apple Git-132)