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.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 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 B55581F597 for ; Tue, 24 Jul 2018 16:34:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388603AbeGXRlp (ORCPT ); Tue, 24 Jul 2018 13:41:45 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:41607 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388590AbeGXRlo (ORCPT ); Tue, 24 Jul 2018 13:41:44 -0400 Received: by mail-wr1-f68.google.com with SMTP id j5-v6so4765455wrr.8 for ; Tue, 24 Jul 2018 09:34:27 -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=Le7dG/44FCN/VKOSR4hrx9MsULhjMe2q3cBQfO4Ay30=; b=GPF6I6fhPDm9l4iOqjv2UTX8cO6roX6/hOBkb5Vim7k12Iuq356wGKBIUWA9+T/CzN 2xOiilYDvaZZTmzOKEZsx9NtMH2iRUH7sI2VGH7fYsA9eZyW84WCePn6VyUZi4oM19yI J9MlTZ09hiI/C+cS0ZcdICMmVVIHSgEPdsBto8XghdGCerGrWgW46+kTN1BqSFFzk21T ikRHAmI0LknITUt2YPnviJNMxzz/m5RvCYHrjcEBMXP4pVnzDmoWXhWbdchH53FYPjK0 DpQRuqfkFM4JiFnPBZ4QRaO8Pf/3F+io9ok0CL/LIIytLy7h2SIg/2br1XN6S4K3ZFkU FTFw== 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=Le7dG/44FCN/VKOSR4hrx9MsULhjMe2q3cBQfO4Ay30=; b=qHTgsGe/QKL2z9LwWnqOlOMx2VWEGn8avI4Qd9sUi1b+9ms4eefcoCfsC1kBIiZawi rNLu26WwseOxjxvVyUcCV9+lm9hSh1fbwfg22Cg2BE0qwxQq0g9qyAErkx+fPCFJecS3 8R7W9THxFpMwbcBqEqejf734YidTtnANMFtqxYokHF7oE1hDmVw1QtRxfMc8SlPx04to URHPqu9nDAE9U9LZxbkxI1/xjYNMCYq9H/DuddlBb8mK9r5dUgNxGXeIeTihlvVrnXXC ZQGnd6H9cj+5FW7gmr9rEcqB1g2lkSXDvYhjHcwyrOICMM2ozitANaC30TE8T9hu4lgW /V6Q== X-Gm-Message-State: AOUpUlFKMal7lXtGF37LmVJEltO6QtGlEzGUUvDrBIzJJZc4CIXAb0gb icqlUd8o1LXEkkRTi8NJ/MoC28fR X-Google-Smtp-Source: AAOMgpfxnMpHrs+K9pqjsAHQJFdWVl9L4PQ9SbLgEWpg0KD3WjwuiwHZE5n4BI2tl37cAJdxBffEQg== X-Received: by 2002:adf:9f13:: with SMTP id l19-v6mr12245962wrf.206.1532450066167; Tue, 24 Jul 2018 09:34:26 -0700 (PDT) Received: from localhost.localdomain (AToulouse-658-1-75-221.w92-156.abo.wanadoo.fr. [92.156.127.221]) by smtp.googlemail.com with ESMTPSA id x124-v6sm1899091wmg.38.2018.07.24.09.34.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jul 2018 09:34:25 -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 v4 10/20] t3404: todo list with commented-out commands only aborts Date: Tue, 24 Jul 2018 18:32:11 +0200 Message-Id: <20180724163221.15201-11-alban.gruin@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180724163221.15201-1-alban.gruin@gmail.com> References: <20180710121557.6698-1-alban.gruin@gmail.com> <20180724163221.15201-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 --- New patch. 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 d392160ba9..7755b68092 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