From patchwork Thu Sep 27 21:56:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alban Gruin X-Patchwork-Id: 10618639 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9468E175A for ; Thu, 27 Sep 2018 22:00:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 870382B8B6 for ; Thu, 27 Sep 2018 22:00:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B1232B8C2; Thu, 27 Sep 2018 22:00:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 24E3E2B8B6 for ; Thu, 27 Sep 2018 22:00:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727722AbeI1EVG (ORCPT ); Fri, 28 Sep 2018 00:21:06 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:54463 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727567AbeI1EVF (ORCPT ); Fri, 28 Sep 2018 00:21:05 -0400 Received: by mail-wm1-f66.google.com with SMTP id c14-v6so303499wmb.4 for ; Thu, 27 Sep 2018 15:00:40 -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 :mime-version:content-transfer-encoding; bh=/iQVSbL0csldgBLUG0vXig5ig/z0ZA7GRNAoqQsJnhM=; b=ftF+rMFbKWEF7heHe3ui2VEMr10pIVrjh5VRPx/hiA07KDx1B0JDF1u1gw7LCLlJZn 6SW+w3h5JPWfCXTyB/5XTbfMk2LZx+WKg3zR6w1nXSX0k/nG1Wgb35VPOjeBYcvnLeGc mt+/2HNkv28UHg5Sl6ePydqwR7DK/zHshZUrORZGKHS/XzbUmnPGbGTqTweC7HiqYnHh a7u9s0YQXzv50s4euj60E9bhm+1lLIX68P+dUxvSuLaC0iU76Kay6/7L/P6grkFZ8/8H tzbh2rRNBqB2fMCRPWlOvP0vbUuU2cuvt1/B33mhNJ8XBHV2aAY2PBYLVDku7H3/C7Zz AqcA== 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=/iQVSbL0csldgBLUG0vXig5ig/z0ZA7GRNAoqQsJnhM=; b=XlUu2MLi/RvikbLpSzsdkSnlMeqZa7PnRfGGfCzDRYsfU/9l2YRRsBMvLe0KMnH5AH Ftl2t/CFCZJT0BFAGkfbmWbKyhK/Dyf7fCufAtAQyoVsPr7pyKAvfgqER6/kTKF4n3Rk JwRuYMj5cqc9FaTDRGWc1arFOgsXqH9+Y9grjViTV4l+VV5HYUyGffoWDRWqALwYgPl8 SpCGMEq17+v6ftrquECUr+y17qxcgYay7ENG+pYgn4yJV1fMjNmet7jG/klYzjjlWWiz 08vY4n9SDSbTHgTaayGmaRKodTer4KE1/awd62emhhdXCxpB/32IYZX/+ayNM4RpwHlp /TvA== X-Gm-Message-State: ABuFfoib2xPXx9wlM2kNdxSYF4zK3afPTlpa1PD/N25INhV2hjR7fZdZ hCXkfmWLWVAJZVb8AkX3VXpYXj02 X-Google-Smtp-Source: ACcGV62FHPxZ+IzWgW3J8hyz9MdhEqr7Bn9F1uD3HGaMMwwO0uhApPHTSwNlBmnmm5/iIW1CpgwoMQ== X-Received: by 2002:a1c:9fc2:: with SMTP id i185-v6mr331586wme.19.1538085639741; Thu, 27 Sep 2018 15:00:39 -0700 (PDT) Received: from localhost.localdomain (AToulouse-658-1-28-140.w86-222.abo.wanadoo.fr. [86.222.27.140]) by smtp.googlemail.com with ESMTPSA id h206-v6sm243153wmf.25.2018.09.27.15.00.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Sep 2018 15:00:38 -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 v8 10/20] t3404: todo list with commented-out commands only aborts Date: Thu, 27 Sep 2018 23:56:00 +0200 Message-Id: <20180927215610.32210-11-alban.gruin@gmail.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180927215610.32210-1-alban.gruin@gmail.com> References: <20180828121045.14933-1-alban.gruin@gmail.com> <20180927215610.32210-1-alban.gruin@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 v7. 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 ff89b6341a..a7fc3cd5be 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 && (