From patchwork Sun Jul 26 19:54:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "brian m. carlson" X-Patchwork-Id: 11686089 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 07FFA1392 for ; Sun, 26 Jul 2020 19:55:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E6FF120719 for ; Sun, 26 Jul 2020 19:55:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="LoE2kq6H" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728089AbgGZTzU (ORCPT ); Sun, 26 Jul 2020 15:55:20 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:40788 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728072AbgGZTzT (ORCPT ); Sun, 26 Jul 2020 15:55:19 -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 4452C607E8; Sun, 26 Jul 2020 19:54:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1595793288; bh=uCrnGBdS9Lu9BL/q9uR2rKu9/6DjL6gl4ER0ChIeMFM=; 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=LoE2kq6HZ6bPletRQA68lV5HTSOtP7jtH3N7juH1Ez5bJxrMsecZRnOy2wqyKJpZD kgDSFALGTa4+02MtGtex7RM4BPkmsC1vvM8EkbR96lNY9UHXDoyCLS+AfvjqdSzofF wioQwJZIryIyMp/m42iFCbR5D5LhrnBB8C/6tkOPgjkES+dLSMvupS9Uxn5JLf8oum r1RtsMxtwz4DcV6odPapVyJMfmc3utcUEJNZUdyu2ASMeFrVi6nbqgh+l6A/JUsv93 Fi50KPfp5K6NftjSJ8F0HmYjJrZHnk+Z+4cL+oVlhDNZpiC9NZIsplrJVzEKAnlo+6 J2gsS4nrEXUM5UOWzoxwF+BWjgQAnCMvwjCIA4zoBc6pjOr9IQ1j/z4hE+Ieo4IQBb czYkk6orMLAG2VIbjBFargy8mExdVr2Yyi1DqbGcco62Omgog83W32bklMm2IVUrCT lEq/ZGLmEoIxuDYyCiPmxYAljyHLd7WaYcafChcgorwq271obzP From: "brian m. carlson" To: Cc: Eric Sunshine Subject: [PATCH v4 16/39] t7506: avoid checking for SHA-1-specific constants Date: Sun, 26 Jul 2020 19:54:01 +0000 Message-Id: <20200726195424.626969-17-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.28.0.rc2.160.gd0b3904b262 In-Reply-To: <20200726195424.626969-1-sandals@crustytoothpaste.net> References: <20200726195424.626969-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Adjust the test to sanitize the diffs and strip out object IDs from them, as it does for other object IDs, since we are not interested in the particular values used. Signed-off-by: brian m. carlson --- t/t7506-status-submodule.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh index 08629a6e70..3fcb44767f 100755 --- a/t/t7506-status-submodule.sh +++ b/t/t7506-status-submodule.sh @@ -22,6 +22,10 @@ sanitize_output () { mv output2 output } +sanitize_diff () { + sed -e "/^index [0-9a-f,]*\.\.[0-9a-f]*/d" "$1" +} + test_expect_success 'setup' ' test_create_repo_with_commit sub && @@ -269,7 +273,6 @@ short_sha1_merge_sub1=$(cd sub1 && git rev-parse --short HEAD) short_sha1_merge_sub2=$(cd sub2 && git rev-parse --short HEAD) cat >diff_expect <<\EOF diff --cc .gitmodules -index badaa4c,44f999a..0000000 --- a/.gitmodules +++ b/.gitmodules @@@ -1,3 -1,3 +1,9 @@@ @@ -286,7 +289,6 @@ EOF cat >diff_submodule_expect <<\EOF diff --cc .gitmodules -index badaa4c,44f999a..0000000 --- a/.gitmodules +++ b/.gitmodules @@@ -1,3 -1,3 +1,9 @@@ @@ -306,7 +308,8 @@ test_expect_success 'diff with merge conflict in .gitmodules' ' cd super && git diff >../diff_actual 2>&1 ) && - test_cmp diff_expect diff_actual + sanitize_diff diff_actual >diff_sanitized && + test_cmp diff_expect diff_sanitized ' test_expect_success 'diff --submodule with merge conflict in .gitmodules' ' @@ -314,7 +317,8 @@ test_expect_success 'diff --submodule with merge conflict in .gitmodules' ' cd super && git diff --submodule >../diff_submodule_actual 2>&1 ) && - test_cmp diff_submodule_expect diff_submodule_actual + sanitize_diff diff_submodule_actual >diff_sanitized && + test_cmp diff_submodule_expect diff_sanitized ' # We'll setup different cases for further testing: