From patchwork Sat Aug 15 16:05:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 11715767 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CEF2C618 for ; Sat, 15 Aug 2020 22:01:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B7C2120639 for ; Sat, 15 Aug 2020 22:01:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="n6jH/BJX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728704AbgHOVv0 (ORCPT ); Sat, 15 Aug 2020 17:51:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728717AbgHOVvY (ORCPT ); Sat, 15 Aug 2020 17:51:24 -0400 Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CF20C025574 for ; Sat, 15 Aug 2020 09:06:28 -0700 (PDT) Received: by mail-lj1-x242.google.com with SMTP id v9so13017000ljk.6 for ; Sat, 15 Aug 2020 09:06:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=st1tO+BI/Oct8X73aTNOqbXEhpW4uy5q+Qup+UN0cKo=; b=n6jH/BJXxNuKW+3IXIpjJj6A2uvlxfSs5hQS0uqZOwz9EZAarJmjaWs1tSeduATHsl 6W2XI7IA9Vc7zutmvfs+XcHGiqn5KHWwKrQXw3s3shG0BICgfR2P5On2BSqtjzofPxi5 gUoIsY/KW1UHnaGHKs0sVVSW1hAEGJ7yoYeGnl5HxB8zkIZpDMaewW4k2BGjYFe+mMw0 Fdow4LbjY56c7lGaM/uFpDb0xjoFGaNxqbcFNcUovWai++KE0Wjhaj5YKgpyqUw87zmo JwbIaEjjrKlGo7Vc0Eaf8MZ+ziYnHoq9gp7aTPy9+0J+08Ult2TPgegyaLGSr5xu3l/v 7V6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=st1tO+BI/Oct8X73aTNOqbXEhpW4uy5q+Qup+UN0cKo=; b=iClkx4NNL5W/p+ImubGf7SxKMY6n5EH1T5C5pg4ZKbMzPMnY0F1PNAmtsd9jUxhgit S7tyv4bp+AivUgMwrlJx5Oy7hjv9lWYAjeAHJRUpqur0gfjG7KVT2suhNVk+BpOKD5ji toUXBtTXYh7TyITmkfJNaEzrqz7g5R0ftTTJpY7xEkhcZbXbZDS6YjVyhktu1jqVxr2L ImBnyzh4l9zBaSTRen8+bBs4eMo3mxFtHnBSAuD6+amTF9y6X+2dA/f5rxw6WxmZHst7 C3WO1iMTv6+YwObxj6XOlng+6EOITRjZtGDbYDs344n7yi6iXw7wBLPV+MXsWJFZkiuR 4hmA== X-Gm-Message-State: AOAM5314EigziVKY4Cjc3owm5qGdAvmiVdrV7gmPTLkSSJukAIj++ND5 NsGAWTd+Xnl76JgxcIg1E/Dfaevhpzs= X-Google-Smtp-Source: ABdhPJwa6ipC9lHTUn2MU6UnJo7aFuqBuCyTORpBA3L+l2X9KmVb0oqAs+X/+Y/V2lxlmVNZOwqJSg== X-Received: by 2002:a2e:810c:: with SMTP id d12mr3522011ljg.34.1597507586269; Sat, 15 Aug 2020 09:06:26 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id a1sm2670493lfb.10.2020.08.15.09.06.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Aug 2020 09:06:25 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "brian m. carlson" , Derrick Stolee , Junio C Hamano Subject: [PATCH v2 1/4] http-protocol.txt: document SHA-256 "want"/"have" format Date: Sat, 15 Aug 2020 18:05:59 +0200 Message-Id: <2e9f6b92946dc2fa645adc72f32d5d05a1720185.1597506837.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.28.0.297.g1956fa8f8d In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Document that rather than always naming objects using SHA-1, we should use whatever has been negotiated using the object-format capability. Signed-off-by: Martin Ågren --- Documentation/technical/http-protocol.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/technical/http-protocol.txt b/Documentation/technical/http-protocol.txt index 51a79e63de..96d89ea9b2 100644 --- a/Documentation/technical/http-protocol.txt +++ b/Documentation/technical/http-protocol.txt @@ -401,8 +401,9 @@ at all in the request stream: The stream is terminated by a pkt-line flush (`0000`). A single "want" or "have" command MUST have one hex formatted -SHA-1 as its value. Multiple SHA-1s MUST be sent by sending -multiple commands. +object name as its value. Multiple object names MUST be sent by sending +multiple commands. Object names MUST be given using the object format +negotiated through the `object-format` capability (default SHA-1). The `have` list is created by popping the first 32 commits from `c_pending`. Less can be supplied if `c_pending` empties. From patchwork Sat Aug 15 16:06:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 11715659 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C3546913 for ; Sat, 15 Aug 2020 21:51:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB807204FD for ; Sat, 15 Aug 2020 21:51:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VTAm8EQ5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728903AbgHOVvn (ORCPT ); Sat, 15 Aug 2020 17:51:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728845AbgHOVvg (ORCPT ); Sat, 15 Aug 2020 17:51:36 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4A82C0A3BDE for ; Sat, 15 Aug 2020 09:06:34 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id i19so6289181lfj.8 for ; Sat, 15 Aug 2020 09:06:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sc2iWXxtSrkDE4h5N1PJMTikEIGT/lg3/YHIVDfPGV8=; b=VTAm8EQ5f6h+tcHuBLrH5vcPq28eONIEnmjMqB4WZhYrIZHhqvx/fVzFP7HVs3K9W6 PcjDu/FFgIfbOtaNKvFCZv14BuSmfZIYbG/QQseOUgek8KLc0TdAU6IOnql40nqCMzpl 3pc+tI1FwiXt3WWk6mTYFL05xssbQyMqemKL0KjqLo1nK/LlNNCwxrcMgfbbR4x5SePY 3PVWFL4CWzeFjcKuKHkiwiUqcIPXh1odoR63UPXv3ofEpG6OH4LPwBMmOUQ5SXbeg5Wi yI0dsNm/LS0vzm/Iu5NXunkrhg3qlUChypsqnf4ZijQ2YFiLsmIV4Nfc3uZoFeS6GY2G pZ/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sc2iWXxtSrkDE4h5N1PJMTikEIGT/lg3/YHIVDfPGV8=; b=VcXIMg9aIzomehty+WPPf68fNBMq0WQf3yO+/8Ap6xPAewlcGPWVGtOcsIZM116It8 pkhz1DmU3+o65mv18d9/d5CvSfpGu0K6hiflp2zZ1YbFu005kXl94f5xNdx6F32WSCgv vTbkdwidJxStgLZsfmY/ZkwP2GtYToXCEGlIZ7mZUVvMwcqEmLwsbce6MRnxhLnSsTv/ 6rFa3AOi1zfGlrCz7EPwkcTImqBq6WuDgeXV6+zPJFEcC/OklDthXFaetymn008+eMQ1 d/KYgMXBGCdaN7SAPbGHQAs1lowoG3loVzT+IlLSkZTLfEvtnsFyvQuAJAhGhC119jhV vTyA== X-Gm-Message-State: AOAM532hY4Gvcm0AcRkOINFqRePmVcpuoaaHI3T+kBIeHTjW4/GbpmQj J8xAjA88zmxj5vSsi2U9exRVA1Elwlo= X-Google-Smtp-Source: ABdhPJxsBEsgws3L9Zr2BsNrn6WBJcUGCN06rUCo1TL8Z7siP24ahgvEzZhIUIs9leDZzHRT46esXw== X-Received: by 2002:a19:c3d7:: with SMTP id t206mr3671242lff.177.1597507589099; Sat, 15 Aug 2020 09:06:29 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id a1sm2670493lfb.10.2020.08.15.09.06.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Aug 2020 09:06:28 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "brian m. carlson" , Derrick Stolee , Junio C Hamano Subject: [PATCH v2 2/4] index-format.txt: document SHA-256 index format Date: Sat, 15 Aug 2020 18:06:00 +0200 Message-Id: <14bd0d93620a917f5373ccef2867184ab7bb0811.1597506837.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.28.0.297.g1956fa8f8d In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Document that in SHA-1 repositories, we use SHA-1 and in SHA-256 repositories, we use SHA-256, then replace all other uses of "SHA-1" with something more neutral. Avoid referring to "160-bit" hash values. Signed-off-by: Martin Ågren --- Documentation/technical/index-format.txt | 34 +++++++++++++----------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt index faa25c5c52..f9a3644711 100644 --- a/Documentation/technical/index-format.txt +++ b/Documentation/technical/index-format.txt @@ -3,8 +3,11 @@ Git index format == The Git index file has the following format - All binary numbers are in network byte order. Version 2 is described - here unless stated otherwise. + All binary numbers are in network byte order. + In a repository using the traditional SHA-1, checksums and object IDs + (object names) mentioned below are all computed using SHA-1. Similarly, + in SHA-256 repositories, these values are computed using SHA-256. + Version 2 is described here unless stated otherwise. - A 12-byte header consisting of @@ -32,8 +35,7 @@ Git index format Extension data - - 160-bit SHA-1 over the content of the index file before this - checksum. + - Hash checksum over the content of the index file before this checksum. == Index entry @@ -80,7 +82,7 @@ Git index format 32-bit file size This is the on-disk size from stat(2), truncated to 32-bit. - 160-bit SHA-1 for the represented object + Object name for the represented object A 16-bit 'flags' field split into (high to low bits) @@ -160,8 +162,8 @@ Git index format - A newline (ASCII 10); and - - 160-bit object name for the object that would result from writing - this span of index as a tree. + - Object name for the object that would result from writing this span + of index as a tree. An entry can be in an invalidated state and is represented by having a negative number in the entry_count field. In this case, there is no @@ -198,7 +200,7 @@ Git index format stage 1 to 3 (a missing stage is represented by "0" in this field); and - - At most three 160-bit object names of the entry in stages from 1 to 3 + - At most three object names of the entry in stages from 1 to 3 (nothing is written for a missing stage). === Split index @@ -211,8 +213,8 @@ Git index format The extension consists of: - - 160-bit SHA-1 of the shared index file. The shared index file path - is $GIT_DIR/sharedindex.. If all 160 bits are zero, the + - Hash of the shared index file. The shared index file path + is $GIT_DIR/sharedindex.. If all bits are zero, the index does not require a shared index file. - An ewah-encoded delete bitmap, each bit represents an entry in the @@ -253,10 +255,10 @@ Git index format - 32-bit dir_flags (see struct dir_struct) - - 160-bit SHA-1 of $GIT_DIR/info/exclude. Null SHA-1 means the file + - Hash of $GIT_DIR/info/exclude. A null hash means the file does not exist. - - 160-bit SHA-1 of core.excludesfile. Null SHA-1 means the file does + - Hash of core.excludesfile. A null hash means the file does not exist. - NUL-terminated string of per-dir exclude file name. This usually @@ -285,13 +287,13 @@ The remaining data of each directory block is grouped by type: - An ewah bitmap, the n-th bit records "check-only" bit of read_directory_recursive() for the n-th directory. - - An ewah bitmap, the n-th bit indicates whether SHA-1 and stat data + - An ewah bitmap, the n-th bit indicates whether hash and stat data is valid for the n-th directory and exists in the next data. - An array of stat data. The n-th data corresponds with the n-th "one" bit in the previous ewah bitmap. - - An array of SHA-1. The n-th SHA-1 corresponds with the n-th "one" bit + - An array of hashes. The n-th hash corresponds with the n-th "one" bit in the previous ewah bitmap. - One NUL. @@ -330,12 +332,12 @@ The remaining data of each directory block is grouped by type: - 32-bit offset to the end of the index entries - - 160-bit SHA-1 over the extension types and their sizes (but not + - Hash over the extension types and their sizes (but not their contents). E.g. if we have "TREE" extension that is N-bytes long, "REUC" extension that is M-bytes long, followed by "EOIE", then the hash would be: - SHA-1("TREE" + + + Hash("TREE" + + "REUC" + ) == Index Entry Offset Table From patchwork Sat Aug 15 16:06:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 11715681 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D405F913 for ; Sat, 15 Aug 2020 21:53:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BCB26206B6 for ; Sat, 15 Aug 2020 21:53:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kKmd8uVJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729221AbgHOVxO (ORCPT ); Sat, 15 Aug 2020 17:53:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729096AbgHOVwn (ORCPT ); Sat, 15 Aug 2020 17:52:43 -0400 Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD592C025575 for ; Sat, 15 Aug 2020 09:06:33 -0700 (PDT) Received: by mail-lj1-x241.google.com with SMTP id t23so13021016ljc.3 for ; Sat, 15 Aug 2020 09:06:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bSXUzHrsp5+czKqabMJHrVPCaZGWcEcvsQY5uNE3Occ=; b=kKmd8uVJoZyYPbFwDqD1fj7xUXY87oX/oaZ81T8s0ORLjrYD+NXtVOm+esGDWWAjJ+ Q/8EAfml3nMNQcvrD5w4E+5hN5NhAni4Ns5mgQnmLJd7BNWjILVe9D8tcngJT2A5aSx1 CUdskD2glNuTJsdfOT5Tdi7wCdNUgiyj+EBDbla3A+K0OQBAjsEsaqxpD9v19nknxEKh aKSfFB6oaJJXVfmNnQx9iN8CsnO+eliUL26PIo1H3nc3hZA9Vi1Jrq/IbNHdzuLzz/OV 77AmSOUGJE1ZktY7JjgeKK4jYdhLwv3eIIDsAWD3LVK77ch/haTUjFLhFxwubv//2L3P iydQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bSXUzHrsp5+czKqabMJHrVPCaZGWcEcvsQY5uNE3Occ=; b=trk31KEroq1gO6N3Sp7WIGov9NMLBplvBITVjsDa0/zyKpCea16nUak56rTusMFFCG hNcQI88gwTKWgloQfbtLDEu1yxX5g156sch+52+8x3xOb927sputgGCCw34djui6WW7h UKoJdk6GVMi4JJ8YWKBDf/m5Wpaa14DCqns1YgfQqf8gdp4Yh/Nn+DxmHA8Y1MvntYkc KkI8t6Yjq1Csq/eLrg7wecNlP8QEzXyTp/i0DEbvS4Banmk9hW5MWzj9VKIh7qo4HhWj volpgF9IkDjlvzDFeO6Ki6oofGTPRKjBEhnzLiM5PXw2k3RpSg9ea0aDwCNSsPme7hxC ydew== X-Gm-Message-State: AOAM531NT1N70zQFOddotlCt8y4xq66HrGbBPJQsEBKklNR4dIIJ2OoN A3gzMs9Vkt2NOHLJrc3QiOiOJ78J5PQ= X-Google-Smtp-Source: ABdhPJyM3t6GnHQyOv71K0jfwkB/gC3Kvg3IKKsUeVw2AiiLRfJDZ076/tZystCGrEPp1wusgvZRHw== X-Received: by 2002:a2e:3802:: with SMTP id f2mr3372712lja.212.1597507591897; Sat, 15 Aug 2020 09:06:31 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id a1sm2670493lfb.10.2020.08.15.09.06.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Aug 2020 09:06:31 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "brian m. carlson" , Derrick Stolee , Junio C Hamano Subject: [PATCH v2 3/4] protocol-capabilities.txt: clarify "allow-x-sha1-in-want" re SHA-256 Date: Sat, 15 Aug 2020 18:06:01 +0200 Message-Id: <2e82be9e365d5157a604a599d764fa39664ab684.1597506837.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.28.0.297.g1956fa8f8d In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Two of our capabilities contain "sha1" in their names, but that's historical. Clarify that object names are still to be given using whatever object format has been negotiated using the "object-format" capability. Signed-off-by: Martin Ågren --- Documentation/technical/protocol-capabilities.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Documentation/technical/protocol-capabilities.txt b/Documentation/technical/protocol-capabilities.txt index 36ccd14f97..124d716807 100644 --- a/Documentation/technical/protocol-capabilities.txt +++ b/Documentation/technical/protocol-capabilities.txt @@ -324,15 +324,19 @@ allow-tip-sha1-in-want ---------------------- If the upload-pack server advertises this capability, fetch-pack may -send "want" lines with SHA-1s that exist at the server but are not -advertised by upload-pack. +send "want" lines with object names that exist at the server but are not +advertised by upload-pack. For historical reasons, the name of this +capability contains "sha1". Object names are always given using the +object format negotiated through the 'object-format' capability. allow-reachable-sha1-in-want ---------------------------- If the upload-pack server advertises this capability, fetch-pack may -send "want" lines with SHA-1s that exist at the server but are not -advertised by upload-pack. +send "want" lines with object names that exist at the server but are not +advertised by upload-pack. For historical reasons, the name of this +capability contains "sha1". Object names are always given using the +object format negotiated through the 'object-format' capability. push-cert= ----------------- From patchwork Sat Aug 15 16:06:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 11715741 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 81A9A913 for ; Sat, 15 Aug 2020 21:58:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 671F122BED for ; Sat, 15 Aug 2020 21:58:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Lfe4CtrV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729495AbgHOV6B (ORCPT ); Sat, 15 Aug 2020 17:58:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728960AbgHOVwA (ORCPT ); Sat, 15 Aug 2020 17:52:00 -0400 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34B6EC0A3BE0 for ; Sat, 15 Aug 2020 09:06:38 -0700 (PDT) Received: by mail-lj1-x243.google.com with SMTP id h19so12986423ljg.13 for ; Sat, 15 Aug 2020 09:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V5gv5K9TkWLpRShrsSODi5U1FnGFWzDOBRPbR69Y/jQ=; b=Lfe4CtrV2eKpzGMviWiX3dhC1ItZBUDMBOB5bsGwvqvrzOfAxDZvVHcEC7vITug3Hp jLLxsQQ6lVYjpGc+MouzopNjQXgNCGfhFIKGR0I8LtER3Ts0HB7YDHDQrn5PD80lwYli CH0DBpkaf8gTrYoPbaRvEEiePgu+F3H6QIHBqea/Zv38cpEomL/6KdviEpDSiiNzi5TS +i5wccAMKiepbTunWBc9qNtvwEauwH6jM0Han9T3uyyHjRdzJSJozhZG2o8OMcn7mcTZ XZfcxj9NKYGDeuzkQCJvzpgF8AYcN/jHVaV3JffQr5tWsBxiBOmn7JWRvK/NJn+0xk0S upyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=V5gv5K9TkWLpRShrsSODi5U1FnGFWzDOBRPbR69Y/jQ=; b=pfPn6SdwVxMAsQIHwzwQZJHoIZUQZvnFb4qm4ry+ox6jLM+KeySiag7XRChQUeclkr 2WyKClFN0bLfe3KvmWBp8u6F/vRfNeu1HVH2iaAVFt4okUjxoWjrFKFyjf8oYvjyHYL9 ND4xqudmAjNM03YoHnDD8O9xZ7qswiKb+NiC+1I9QCZzQPMPGMjMsm+O/lKCJYEAQVpY D8vwfSpOUMqXRhFVLMfReWw+jTWdizWBGkqirulOE6qqWjaSXMESTcgds8K/hBxM8W78 sDO+oMxz5zzHGQlswEuaDVSXmNqlvp8b52cUzdTbHR9YZ0nqUDjlIoe2/c6jL8lu5co8 LTTA== X-Gm-Message-State: AOAM530yk+okVHFRh0+q+oENz6SkO+1NkkpejWGTnQPpgFa6RFiXK9bU F6RgEh5t7Lm9ycoa7Vari82giQL112A= X-Google-Smtp-Source: ABdhPJztUrS7HPDay1HR3Vjm7lWFJRt917AMwCL/HhARTWO/oeFOLAIZKNFbtiTp1g1ByWpNT8UjGA== X-Received: by 2002:a2e:95cc:: with SMTP id y12mr3423032ljh.138.1597507596440; Sat, 15 Aug 2020 09:06:36 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id a1sm2670493lfb.10.2020.08.15.09.06.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Aug 2020 09:06:35 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "brian m. carlson" , Derrick Stolee , Junio C Hamano Subject: [PATCH v2 4/4] shallow.txt: document SHA-256 shallow format Date: Sat, 15 Aug 2020 18:06:02 +0200 Message-Id: <8680fc1af6714b1d97b81b824184679593213d91.1597506837.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.28.0.297.g1956fa8f8d In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Similar to recent commits, document that we list object names rather than SHA-1s. Signed-off-by: Martin Ågren --- Documentation/technical/shallow.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/technical/shallow.txt b/Documentation/technical/shallow.txt index 01dedfe9ff..f3738baa0f 100644 --- a/Documentation/technical/shallow.txt +++ b/Documentation/technical/shallow.txt @@ -13,7 +13,7 @@ pretend as if they are root commits (e.g. "git log" traversal stops after showing them; "git fsck" does not complain saying the commits listed on their "parent" lines do not exist). -Each line contains exactly one SHA-1. When read, a commit_graft +Each line contains exactly one object name. When read, a commit_graft will be constructed, which has nr_parent < 0 to make it easier to discern from user provided grafts.