From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) 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,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id E29FF1F452 for ; Tue, 28 Aug 2018 12:11:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727940AbeH1QCl (ORCPT ); Tue, 28 Aug 2018 12:02:41 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:38159 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727854AbeH1QCl (ORCPT ); Tue, 28 Aug 2018 12:02:41 -0400 Received: by mail-wm0-f67.google.com with SMTP id t25-v6so1759377wmi.3 for ; Tue, 28 Aug 2018 05:11:18 -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; bh=m0NGeWs7P3cs7I7nv+i2CtvFtPHghUxVEU13oKeDSjk=; b=A/XRjJEVbS4ZZONvmpVjqVvoKF1YKFCy8vz7b6Dm3wvTEo0KfYbNw/NlE/lUlh3NqV yykqTn3azU+TQ95bh9GId6D8CLSyt2hqmNtzAlNna0T4JCCKqkLRyyNjfyE2KD+EOXqi tImPzRBH4WNondMDLzdjf0FTlNhJ8qLfkoRbQrE8cqNiVvLlzmNIzZTDRz+b6yCNQWT8 1ezP7iAXOv6fSnUvNHgO2xKKbC9HA/f0n2JaMveRdDO+CRkFE/t4QIlJ8OyJ5PlPeZlA wmO4qfkWecd7nX11zJ6cigDuIv6+iyAGf4IHjYkizC6Dt/5AlISUCc2j896G4fYI4dmw /9TA== 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; bh=m0NGeWs7P3cs7I7nv+i2CtvFtPHghUxVEU13oKeDSjk=; b=fz9fbh/Ky1FMP95TD0W+5ycdW9AMxk4oFIbqjHN8IUzddVbJ9+hzOf6Ydtf4s6O6wa wA/H3G5WVTPkhgJnlzH+M9HmgfmsxmTfC0DOZ4oMua51OSrkMJNAljNCAmTtx2TbS9i5 xKwB1VnY4pZKx1qjPoIM1DMcF4gyFnER6lDh2u4nuKp1DaKH4G9zpyk/QzL/hxx0y+xP rIpfbVjiSQG2WviHnxFlFrskIVBixSwA382xhoOl8VupJFeRlhWeKpZN2NzM8rxwxCe8 VG5RfhAevlvRDpyUOcsTvj9akfn4mQglOJkvvoGeuShS2JIMZGiY8Fjn8D7iMwY/9k/e WA3g== X-Gm-Message-State: APzg51B5zTIxo98JZe4FRCfxNoLAmddPA1ZmtdqEDQBZXbphC43VGFrF cyowQMv7P8A4jp/MtPzuEFYFkeSY X-Google-Smtp-Source: ANB0VdatmamLzhe2M2nWnKov1AQEAcXSANvYrhIaCla4yjiWeGQAH0P1YNXjS2lHQyN9P6NXNuJz6w== X-Received: by 2002:a1c:c44a:: with SMTP id u71-v6mr1167545wmf.43.1535458277522; Tue, 28 Aug 2018 05:11:17 -0700 (PDT) Received: from localhost.localdomain (AToulouse-658-1-33-140.w86-221.abo.wanadoo.fr. [86.221.112.140]) by smtp.googlemail.com with ESMTPSA id y206-v6sm1702790wmg.14.2018.08.28.05.11.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Aug 2018 05:11:16 -0700 (PDT) From: Alban Gruin To: git@vger.kernel.org Cc: Stefan Beller , Christian Couder , Pratik Karki , Johannes Schindelin , phillip.wood@dunelm.org.uk, gitster@pobox.com, Alban Gruin Subject: [GSoC][PATCH v7 10/20] t3404: todo list with commented-out commands only aborts Date: Tue, 28 Aug 2018 14:10:35 +0200 Message-Id: <20180828121045.14933-11-alban.gruin@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180828121045.14933-1-alban.gruin@gmail.com> References: <20180810165147.4779-1-alban.gruin@gmail.com> <20180828121045.14933-1-alban.gruin@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org If the todo list generated by `--make-script` is empty, complete_action() writes a noop, but if it has only commented-out commands, it will abort with the message "Nothing to do", and does not launch the editor. This adds a new test to ensure that complete_action() behaves this way. Signed-off-by: Alban Gruin --- No changes since v6. t/t3404-rebase-interactive.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 01616901bd..496d88d7d6 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -75,6 +75,16 @@ test_expect_success 'rebase --keep-empty' ' test_line_count = 6 actual ' +cat > expect <actual 2>&1 && + test_i18ncmp expect actual +' + test_expect_success 'rebase -i with the exec command' ' git checkout master && ( -- 2.18.0