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.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 327E51F463 for ; Tue, 7 Jan 2020 04:53:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727629AbgAGExn (ORCPT ); Mon, 6 Jan 2020 23:53:43 -0500 Received: from mail-qv1-f49.google.com ([209.85.219.49]:36347 "EHLO mail-qv1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727617AbgAGExk (ORCPT ); Mon, 6 Jan 2020 23:53:40 -0500 Received: by mail-qv1-f49.google.com with SMTP id m14so4110660qvl.3 for ; Mon, 06 Jan 2020 20:53:40 -0800 (PST) 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=jbA3LBz+SdJg67fYbKODcNtdYg8o9uAs+VSX7Ubldpg=; b=U72J9ANn17meyr2e/JvWJk7GYlgitKhCYJGwTdB4HKKSScTqkiOoNVbjPsTNPr4dfu Mbiw/uM6lJvjrkg5+vW4uHjD21pYOgs8S/mWIb+4gSUpJr6b77XWfuVuPuqgZaEuSDyZ We+yHxnxe4z7Lphyu/sXgEiK2v/AKaTA78n3k1YBc6xzOGfeop6WEmIhEhyb6avlc7Dg +5yPMd5NDLuO7h1wBroJpPDvN2yGwytPc4tb2vaQwE49clNKLSp0NIiaBEbNHtK/OFB8 6AHtBaoQuWbiNDhupQJncS0mi4Jwc3svwk8NSTYwvtAcpXQ1vMdbCK1zkXO+1iqZEYJG SvNg== 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=jbA3LBz+SdJg67fYbKODcNtdYg8o9uAs+VSX7Ubldpg=; b=cwLtftFGLAio8Kqhe2AtxgaWKON7MQrwcj155mp8c0gD0oAseV9FJGcyFhsyjJmYGC X/CNnkUKG1+eHI2SwtEIYxzAmTaspLkbUUFFCNoDqDuA0/ViX5JH/NsLDpUS+J2eSb0K YP7NsPQDg0ykK6ONwkMjRZTpbkbochOQRdwQToAxhxSTAsT2JlZ8w9KC6LkJIYSMKFvZ J1lcj2Y3MIIh6YCWKjoh1VMPyPIqc3CIrXwuWUDGJpXvDs104Ogai8MemdOp5dlyj+1o pEjSWtK+gZJKsexGw/bytnjK7MaI0Ara8A7LTX9HywtvGa1KMk9TTZsJU3T+KDq7Z2IK PS8A== X-Gm-Message-State: APjAAAVF6KuIfzDQnsCq8fWwCshXQBAA6kmLfGR5MNV/Xh+e/vXfw3Mp ctvUHVhvSGZlXy8f9PK2vbgiMczZ X-Google-Smtp-Source: APXvYqyzzQ0Q2QTHJDnr1Vh91L4w+NrQlgPkEi5pBYRJJOc+lY2E1N/VsKY66BwiK1waBunClG1ViA== X-Received: by 2002:a05:6214:38c:: with SMTP id l12mr82518743qvy.224.1578372819698; Mon, 06 Jan 2020 20:53:39 -0800 (PST) Received: from archbookpro.lan ([199.249.110.29]) by smtp.gmail.com with ESMTPSA id t2sm21663893qkc.31.2020.01.06.20.53.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 20:53:39 -0800 (PST) From: Denton Liu To: Git Mailing List Cc: Eric Sunshine , Jakub Narebski , Johannes Sixt , Junio C Hamano Subject: [PATCH v2 14/16] t3507: fix indentation Date: Mon, 6 Jan 2020 23:53:11 -0500 Message-Id: <96310b7d289a912fa173dd15d55f3326005402cc.1578372682.git.liu.denton@gmail.com> X-Mailer: git-send-email 2.25.0.rc1.180.g49a268d3eb In-Reply-To: References: 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 We have some test cases which are indented 7-spaces instead of a tab. Reindent with a tab instead. This patch should appear empty with `--ignore-all-space`. Signed-off-by: Denton Liu --- t/t3507-cherry-pick-conflict.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index 9b9b4ca8d4..2a0d119c8a 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -381,23 +381,23 @@ test_expect_success 'failed commit does not clear REVERT_HEAD' ' ' test_expect_success 'successful final commit clears revert state' ' - pristine_detach picked-signed && + pristine_detach picked-signed && - test_must_fail git revert picked-signed base && - echo resolved >foo && - test_path_is_file .git/sequencer/todo && - git commit -a && - test_must_fail test_path_exists .git/sequencer + test_must_fail git revert picked-signed base && + echo resolved >foo && + test_path_is_file .git/sequencer/todo && + git commit -a && + test_must_fail test_path_exists .git/sequencer ' test_expect_success 'reset after final pick clears revert state' ' - pristine_detach picked-signed && + pristine_detach picked-signed && - test_must_fail git revert picked-signed base && - echo resolved >foo && - test_path_is_file .git/sequencer/todo && - git reset && - test_must_fail test_path_exists .git/sequencer + test_must_fail git revert picked-signed base && + echo resolved >foo && + test_path_is_file .git/sequencer/todo && + git reset && + test_must_fail test_path_exists .git/sequencer ' test_expect_success 'revert conflict, diff3 -m style' ' -- 2.25.0.rc1.180.g49a268d3eb