From patchwork Tue Apr 9 15:27:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 13622879 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 44CAB131BCF for ; Tue, 9 Apr 2024 15:27:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712676451; cv=none; b=T9v0NAdvve/sK9ama2nH9e2HqkcUGEF6m0IWG+FMAAUn7hsUqwd9DYYjkbf6IRCge7bOY8F95OGurD409idFhBstW5NBTuFwQocIwQ0zzjEG9X/wj636zhWsxcdZ04Ll6mwwBcqcx8Dby3Oe0lm1G6lNft9Pk+6wkTH/y2RStSk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712676451; c=relaxed/simple; bh=Z3sYYijTxa+GwnpoP+l+4vyWeDXaFCqxMuFhMbymduc=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=lhslkfUR+LONXSk0fncZuhbmHNG1mAPHU3OPUMAcCMXg3ndKGAcnMXVCWXoCWG+1bJY4E3inuv9upFXa1ac0+Gn7pZwRIJg6wXU4P29cSNxXJJZGS1mPI4FuOCAb/03FN5NQwvL6vGKmv/m+yQWS4ak6EzBz1iN+vpGamVGOv54= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gMaKCJVV; arc=none smtp.client-ip=209.85.208.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gMaKCJVV" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-2d715638540so68718751fa.3 for ; Tue, 09 Apr 2024 08:27:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712676447; x=1713281247; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=xijI6kamVk/h1DZUuNsIQ0lYH7wQTTd+kWE1Ogpl/xY=; b=gMaKCJVVGyt3vMFdIHkmOoLuDrDRwVer07qsOyorHQg4G1BynEKjaAYDqoUigoaX/X kpDCTJvrxUeSXKAZ+geitnUMb05/MRbHd04F1S7PBPBoDLFIiVESnLHJFudEfawmPfnW 6Faa7tAVebifSwL7Z8sEdFiIkKKsv9NrlNWddFXzTdPBf4kyTHdJVXdvMz8s6E6iNqzS 7s/rt4MyK2XdFQ6WbWQ5Gl1XCkjUxuZt9kjp80oh67UqHHEn5LYLFY0wCbJXzFD7MGCW KYodYGBsgJCAREB55uMdgmgfLcSkm66cMu8mM7Ew9rEBZ20izx5OoCeF2rFVxgg8/t8K BWvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712676447; x=1713281247; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xijI6kamVk/h1DZUuNsIQ0lYH7wQTTd+kWE1Ogpl/xY=; b=d7ZmKfWiUVbpxpwIxxRwWgoyxbLduvGlYKPR6WVY1qt1SH4F2GHAkO1N6tp6D+jgs3 I2MjnOWTdM6Sq4xPvvZCm/79tdMVmqRiX4EYlscnE9AjvvwGDMm3UNnefkjUV7Mnjsp9 b5rPjdE/i/ps84BJSlkmJrWi3tRyqHZ5GXvhRVpIofic9tcxIyAEMZW5qh1Jq39oxBIR mLIfb6Z2YkaIsz9PQBxr7Xud1Qfdota/fgDP8n1bJvXnkNBDN8fA4irELCuM1ijoij36 pFwN5/9ysZEWmYTkYmwwBVF9cQl4sjksEEeyyE0/SG6UZ2H9ufOLXtt6urBbmvAlK8bR Yz/Q== X-Gm-Message-State: AOJu0Yw7NDBzXBrx0kwARNF7l+BlBtVbyyCG6Nv112WkcMmbKmmYroJJ wv1PWMb3rEt1QFlp2ziatmUx6EDzMyEfi1CTPh0HNmn7sSS45SmzuxDsrj9W X-Google-Smtp-Source: AGHT+IHyRwy2mZ82KP8BJ11QJHCkNqlhl7POWeIAWXN3Y7SUpdTGjXjKEIHIOmACbGyxGflV0TXS/w== X-Received: by 2002:a2e:bc11:0:b0:2d8:901f:7f50 with SMTP id b17-20020a2ebc11000000b002d8901f7f50mr145721ljf.9.1712676446706; Tue, 09 Apr 2024 08:27:26 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n30-20020a05600c3b9e00b0041690a1c9desm5295981wms.30.2024.04.09.08.27.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Apr 2024 08:27:26 -0700 (PDT) Message-Id: <35d4178d106daf4bd1407b1fc8ba6029a6dce288.1712676444.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 09 Apr 2024 15:27:22 +0000 Subject: [PATCH 1/3] t3428: modernize test setup Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Phillip Wood , Phillip Wood From: Phillip Wood From: Phillip Wood Perform the setup in a dedicated test so the later tests can be run independently. Also avoid running git upstream of a pipe and take advantage of test_commit. Signed-off-by: Phillip Wood --- t/t3428-rebase-signoff.sh | 42 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/t/t3428-rebase-signoff.sh b/t/t3428-rebase-signoff.sh index e1b1e947647..975b859ce09 100755 --- a/t/t3428-rebase-signoff.sh +++ b/t/t3428-rebase-signoff.sh @@ -8,37 +8,37 @@ This test runs git rebase --signoff and make sure that it works. TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh -# A simple file to commit -cat >file <expected-initial-signed <expected-initial-signed <<-EOF && + Initial empty commit -Signed-off-by: $(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/") -EOF + Signed-off-by: $ident + EOF -# Expected commit message after rebase --signoff -cat >expected-signed <expected-signed <<-EOF && + first -Signed-off-by: $(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/") -EOF + Signed-off-by: $ident + EOF -# Expected commit message after rebase without --signoff (or with --no-signoff) -cat >expected-unsigned <expected-unsigned <<-EOF && + first + EOF + git config alias.rbs "rebase --signoff" +' # We configure an alias to do the rebase --signoff so that # on the next subtest we can show that --no-signoff overrides the alias test_expect_success 'rebase --signoff adds a sign-off line' ' - git commit --allow-empty -m "Initial empty commit" && - git add file && git commit -m first && - git config alias.rbs "rebase --signoff" && git rbs HEAD^ && git cat-file commit HEAD | sed -e "1,/^\$/d" > actual && test_cmp expected-signed actual From patchwork Tue Apr 9 15:27:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 13622880 Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AE59135A67 for ; Tue, 9 Apr 2024 15:27:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712676452; cv=none; b=gflzC5rlbPLhdmBIFGW03dmhLymrjDQu5OzLNt82QM2uYTyPr3dyFxDOoUk1ZLvCf4P005nf1kp4KR/c3Z4GgQ1FfpN1hqqLVgEfM2QIPzOFVgSMzN91O0pSyxgScmdMLN2dOorvgSI/ZS5gthoT3v5K2FMxMsgN4lVuzmCRU+E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712676452; c=relaxed/simple; bh=M1n+9PQ5yXVzKdBGNcIkxxZJYQtGJwNks/tEN7cF9a4=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=KFzF+sQuzmYswQPHRjOey6rof3FypePDYZvxW0DKBlIqV3wHXiSOFh3fUtyWAsAWjKdj0S1N1DeyTNFMcwUx4e9NnU0H4EQWfIR4dGZClAESA6Xztel7xDG8i0+2QkVMCBWEr+IK1ziI9FR8DhIKshCerZpRQnnidtfLQ+OGD24= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WPZ8+pI3; arc=none smtp.client-ip=209.85.208.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WPZ8+pI3" Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-2d718ee7344so66631021fa.2 for ; Tue, 09 Apr 2024 08:27:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712676448; x=1713281248; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=DgaQiAtaj7gZ8OzahGDQGjPM8jvy3RoAAcZTzCwC9jQ=; b=WPZ8+pI3KJBrCqYapkRIkBkM31wcx+POsuokPJDXgUvQvv5OSzPy4WKOb1+r/pIbYG AN6tSBzg6A4MxRNkH1AIXEZOhdtaJ+xW8OhhzHk8+X0P2rwJnDAOZHPG131aopEmr1nB hAZynsbncW/BL81yvsUDqlzQnM8rMt93+CLASWVCbU3konDHGxdr8dKMBcEWwUm9WtxQ VxC1PF31RvR0xnJg0qtnQaNonjF6aqRzfYg7LUJDuDi62fHko2HIICBdFl+wUmuQEKfL d0u7LylVBcexfdys+OWBJnZOz7MDzRhVYM22FF7XwyfLn1ThKgjicUnbxIDTv4mHO1Rm khow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712676448; x=1713281248; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DgaQiAtaj7gZ8OzahGDQGjPM8jvy3RoAAcZTzCwC9jQ=; b=F7LCw3uhe37trpHx18shn80PAGCHWOHBdBfTTuwnGyQ5CyPF8mqhCQn434EXNT24k6 35ja08ULAzDmzS7UdzSscXEeNWy+FigdzcwunCP9+EDl62uoeBA1aCB0uPGnX0XKbm9E Wirfu99mryadPWIT0YJ5awqKWHBSXNJKLDpSXCQI2HDU4O6+cn8p34MnTuszXF491Yr5 BFYrgIQJTgiyj10S4f7sQrIyNM4aq3axTo8ZK3T2azjINIrNduLVPTrv3uD4KUKjLRwL QlbvrJzTloLZ1oYHtxAvc9XhTqw/P2cajW5VSv6ztbFwID2GBkaVcb27NeGQC73kzNcw gn4A== X-Gm-Message-State: AOJu0YyjYiOR0mATeL3UR/AF1HcIrQ2MUtpgRi2dsQj7NJLwxj9wRZtK L4cBW4HDldpQ6SmTSarnQN+d+zd6UcnHr50CyKncmTM9dza/cONwZKrnM1wz X-Google-Smtp-Source: AGHT+IFj946tMsJ4Td9sod+WLkDRkFjyPHafQZUuEOvBe7fzHl8fJwgGFkohhUJBkRpncVNsiCf8Lw== X-Received: by 2002:a05:651c:19a8:b0:2d8:60a4:d06 with SMTP id bx40-20020a05651c19a800b002d860a40d06mr139882ljb.40.1712676447474; Tue, 09 Apr 2024 08:27:27 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id s11-20020a05600c45cb00b004162d06768bsm18420437wmo.21.2024.04.09.08.27.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Apr 2024 08:27:27 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Tue, 09 Apr 2024 15:27:23 +0000 Subject: [PATCH 2/3] t3428: use test_commit_message Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Phillip Wood , Phillip Wood From: Phillip Wood From: Phillip Wood Using a helper function makes the tests shorter and avoids running "git cat-file" upstream of a pipe. Signed-off-by: Phillip Wood --- t/t3428-rebase-signoff.sh | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/t/t3428-rebase-signoff.sh b/t/t3428-rebase-signoff.sh index 975b859ce09..133e54114f6 100755 --- a/t/t3428-rebase-signoff.sh +++ b/t/t3428-rebase-signoff.sh @@ -40,15 +40,13 @@ test_expect_success 'setup' ' # on the next subtest we can show that --no-signoff overrides the alias test_expect_success 'rebase --signoff adds a sign-off line' ' git rbs HEAD^ && - git cat-file commit HEAD | sed -e "1,/^\$/d" > actual && - test_cmp expected-signed actual + test_commit_message HEAD expected-signed ' test_expect_success 'rebase --no-signoff does not add a sign-off line' ' git commit --amend -m "first" && git rbs --no-signoff HEAD^ && - git cat-file commit HEAD | sed -e "1,/^\$/d" > actual && - test_cmp expected-unsigned actual + test_commit_message HEAD expected-unsigned ' test_expect_success 'rebase --exec --signoff adds a sign-off line' ' @@ -56,30 +54,25 @@ test_expect_success 'rebase --exec --signoff adds a sign-off line' ' git commit --amend -m "first" && git rebase --exec "touch exec" --signoff HEAD^ && test_path_is_file exec && - git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && - test_cmp expected-signed actual + test_commit_message HEAD expected-signed ' test_expect_success 'rebase --root --signoff adds a sign-off line' ' git commit --amend -m "first" && git rebase --root --keep-empty --signoff && - git cat-file commit HEAD^ | sed -e "1,/^\$/d" >actual && - test_cmp expected-initial-signed actual && - git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && - test_cmp expected-signed actual + test_commit_message HEAD^ expected-initial-signed && + test_commit_message HEAD expected-signed ' test_expect_success 'rebase -i --signoff fails' ' git commit --amend -m "first" && git rebase -i --signoff HEAD^ && - git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && - test_cmp expected-signed actual + test_commit_message HEAD expected-signed ' test_expect_success 'rebase -m --signoff fails' ' git commit --amend -m "first" && git rebase -m --signoff HEAD^ && - git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && - test_cmp expected-signed actual + test_commit_message HEAD expected-signed ' test_done From patchwork Tue Apr 9 15:27:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 13622881 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 82DF613666C for ; Tue, 9 Apr 2024 15:27:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712676452; cv=none; b=cu/Xd60LZz16VxJTt1RoK5e63hiX4GPazU6KPkiBKGoYjA1hzWWKrH1ozzmkpEvzDymMern2IwO2k3B4ceQtp031Y0CFFiJY8ALOxSRDNMTfr6NQG8ez/svBOlGDyl+7ma4qoU7EWEApQpg0CFs7fY3ubSFUppei+n5TPcioE8Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712676452; c=relaxed/simple; bh=bVlNJ1upc4nkSJLc7LiPjDdnQCJTCb+XcJxAe0jtdCA=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=p4CNjXf1axhJCP3GqPSooVg7C5d8Nky9pp9815oLMGrecA7q7n0l5Ve+qjsgfRg0OHvfj7gxJ7a1bOq0caYz7WU7U9JIkpcjG+BLGWlzqX+K+x5cUqXyC6Ip3IFhQIlSkyi4hQ087W0WknA+tL2TTqwbGQPMcx532Tay2bj2w8o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lJcWALET; arc=none smtp.client-ip=209.85.221.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lJcWALET" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-3455ff1339dso2041765f8f.0 for ; Tue, 09 Apr 2024 08:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712676448; x=1713281248; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=0KcOBl2WV1JSS54lzJoJy+oNGcpVou5d+bWNc95IFz0=; b=lJcWALETHpuZaBRMyDBgXGW0S3kDwtjCHWKFbpVIyFanpcKVIgk1lSPnmUXw7LI8UG 1kgOW1AZGAvTfQZqtKOpye6kBw6QEnDkP6igJsLGyD8AZDdgfaulRad4qjUcLmvT42vn AV5o3jK6E7o75MTUpcjV2jwLctls521MqNGIp3DZhnUk7QJEQav2ou5qtWssDZTd3Nef nsU1Msn910dsyHqWtN1Y4KcSss6PhJYPNNNIC2JiA2PjNhwafosvNejLysr9upqkvYNC X78oOFTpcMzTWztX0TopfaPZhmG3CamKoYMmpGTMKMNEtkuondEXV2q+EFNlhJowZDWB m/oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712676448; x=1713281248; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0KcOBl2WV1JSS54lzJoJy+oNGcpVou5d+bWNc95IFz0=; b=uSvU3p+9InvgQOP3apwgiao9a60OaeaEYIdfyyEBXCtUozz64WkloajiayQxgyzSdw VpI6b9v7mftnOYkA72TSA4VDCuuJ+Ctu+xEA2gtoA5WUIwB+CGTXGhGW7h/rBb/jkNxw Ioi4UIcUr1GFu/CgG1zoS7Z/9R6auSk8skwkSiU7laNoJwZcnGietkoDD4V1ir7GAnnM toK/vhMcn0JK2i5+/ybtEqZfEgpoUjxY1zCM4ryB/+hv42AtLCTNzjxEPbL3B/8iAVGy bjV9t5FPj/iErDTPP5mnvucfzDmMCsk240G6B5LzXgZ6ZZ4xeQy1Y2pVJdpzYPzFTEjD fSmg== X-Gm-Message-State: AOJu0YzZilB12Z0B12Al8y+gzkkSOitVAZTnq3G9LhxbXKvcdPOst4h9 SDy8w+S4lXQyc/rwMR373p+HM/YOjOTynlXuRgQHvlLtYomeps/PBm0VxCJc X-Google-Smtp-Source: AGHT+IFT0nhCDEoizUte26ftNCmLVHe0tGnOc/LF5IsVABA1RH9Xt8r2UTdJp8KWsEDMGf+PtiVvqA== X-Received: by 2002:adf:f3d0:0:b0:341:8412:a6e7 with SMTP id g16-20020adff3d0000000b003418412a6e7mr45978wrp.18.1712676448196; Tue, 09 Apr 2024 08:27:28 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z6-20020a5d44c6000000b003438f4eef2dsm11715741wrr.63.2024.04.09.08.27.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Apr 2024 08:27:27 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Tue, 09 Apr 2024 15:27:24 +0000 Subject: [PATCH 3/3] t3428: restore coverage for "apply" backend Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Phillip Wood , Phillip Wood From: Phillip Wood From: Phillip Wood This test file assumes the "apply" backend is the default which is not the case since 2ac0d6273f (rebase: change the default backend from "am" to "merge", 2020-02-15). Make sure the "apply" backend is tested by specifying it explicitly. Signed-off-by: Phillip Wood --- t/t3428-rebase-signoff.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t3428-rebase-signoff.sh b/t/t3428-rebase-signoff.sh index 133e54114f6..1bebd1ce74a 100755 --- a/t/t3428-rebase-signoff.sh +++ b/t/t3428-rebase-signoff.sh @@ -38,8 +38,8 @@ test_expect_success 'setup' ' # We configure an alias to do the rebase --signoff so that # on the next subtest we can show that --no-signoff overrides the alias -test_expect_success 'rebase --signoff adds a sign-off line' ' - git rbs HEAD^ && +test_expect_success 'rebase --apply --signoff adds a sign-off line' ' + git rbs --apply HEAD^ && test_commit_message HEAD expected-signed '