From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id B5B161F4C0 for ; Mon, 28 Oct 2019 00:59:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729136AbfJ1A7k (ORCPT ); Sun, 27 Oct 2019 20:59:40 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:54342 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729001AbfJ1A7k (ORCPT ); Sun, 27 Oct 2019 20:59:40 -0400 Received: from camp.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:b610:a2f0:36c1:12e3]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by injection.crustytoothpaste.net (Postfix) with ESMTPSA id AA27D62063; Mon, 28 Oct 2019 00:59:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1572224378; bh=v+qOBlhknk2JmCEKxVPu22ZOeyUBzrkh2PeLVzN8pEM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Reply-To: Subject:Date:To:CC:Resent-Date:Resent-From:Resent-To:Resent-Cc: In-Reply-To:References:Content-Type:Content-Disposition; b=IQz+9H08zbADqA75orVePuc2bB2+U9I9xMCJp5TS1ig0fFvHSJ1HyNXMdPDMXK0Tp 671UnierlwBXH7G7OD7hJJSGvROtRcmqz/MvW/gwZ2jnEujEmT7kbJvCY6JizKIYan ACdyXgbpU8C1gAcGrreuC42hFsDZFkKL6/ZUonN0iwq3+RG2BWkTXSySmi4JAfs1TX wFX0KxuUMe+5W2td/YXndEhuFYkxcSfUTPNfdpnqLyhzU00adCiuqCmHJqqetFtsfz WkyNRlZNL2DMe3CzpNsz1+qVGQMe90GGtZd+f+5NqfzFjK7gtZvxjZcja0yU5e4Aq0 8RecpPdZcWcpgd03qgpz8ns/OLmQiOrP7ZzeWMjYNB4BlW9fDKTjrkuanu6tIzFUrh 6M0SAjvXac+5xESVSlBuLGtGKVuwYuL3+9aHQUfP9sfwugp/eqJVf2J5GRuQ7uyY9O bZwP2TQ+/W3jPXam+rfZQw9LYaFdFUOUL67+TUflBDXqY5Sc3nl From: "brian m. carlson" To: Cc: Derrick Stolee , Stefan Beller , Johannes Schindelin Subject: [PATCH v2 15/15] t4048: abstract away SHA-1-specific constants Date: Mon, 28 Oct 2019 00:59:07 +0000 Message-Id: <20191028005907.24985-16-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665 In-Reply-To: <20191028005907.24985-1-sandals@crustytoothpaste.net> References: <20191028005907.24985-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Adjust the test so that it computes variables for object IDs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4048-diff-combined-binary.sh | 58 ++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/t/t4048-diff-combined-binary.sh b/t/t4048-diff-combined-binary.sh index 87a8949500..7f9ad9fa3d 100755 --- a/t/t4048-diff-combined-binary.sh +++ b/t/t4048-diff-combined-binary.sh @@ -9,24 +9,27 @@ test_expect_success 'setup binary merge conflict' ' git commit -m one && echo twoQ2 | q_to_nul >binary && git commit -a -m two && + two=$(git rev-parse --short HEAD:binary) && git checkout -b branch-binary HEAD^ && echo threeQ3 | q_to_nul >binary && git commit -a -m three && + three=$(git rev-parse --short HEAD:binary) && test_must_fail git merge master && echo resolvedQhooray | q_to_nul >binary && - git commit -a -m resolved + git commit -a -m resolved && + res=$(git rev-parse --short HEAD:binary) ' -cat >expect <<'EOF' +cat >expect <expect <<'EOF' +cat >expect <expect <<'EOF' +cat >expect <.gitattributes ' -cat >expect <<'EOF' +cat >expect <expect <<'EOF' +cat >expect <expect <<'EOF' +cat >expect <expect <<'EOF' +cat >expect <expect <<'EOF' +cat >expect <expect <<'EOF' +cat >expect <expect <<'EOF' +cat >expect <expect <<'EOF' +cat >expect <