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=-4.1 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 C21E01F404 for ; Fri, 10 Aug 2018 16:52:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729740AbeHJTXK (ORCPT ); Fri, 10 Aug 2018 15:23:10 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33090 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729651AbeHJTXK (ORCPT ); Fri, 10 Aug 2018 15:23:10 -0400 Received: by mail-wm0-f66.google.com with SMTP id r24-v6so1956332wmh.0 for ; Fri, 10 Aug 2018 09:52:31 -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=rVAM3FWeB82pnbPbPMTUjhFZYqbgroZ8ocyXiihmYNk=; b=IZ9o3nWtj96VEN54h52Dtmg1Z9EZoIS52fzUdC+zWY1DZcDxOHWgcCoblgPLXkhuwm /fRSE3AKSSBBNWKVIHQj8DmMx2FcakQZd36OQndK7t5Kjvmc07Qbd7rHFpmYKCcBpGJX ddz/LJRRyUtsoAz4aekdl8s188Ksmvogl5utDFD+rvllrq09ityNRK3Wm2dEuiELZ4EF EbWeJubiEBj2K1YB9ZkFNhjvB2ignEFltRjM9g1KQ1kopHiv4+SzHqbh5KUxQ3AHCsla apuvIQnz/2wJkEvOuwjHc66vMZw/iqYfcEr7Q7yGaznP1LlrIipLzP5t51xBw4aEjXDH a9FQ== 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=rVAM3FWeB82pnbPbPMTUjhFZYqbgroZ8ocyXiihmYNk=; b=tRjOYNvwRJvg2MAyfUa/7dCaYpYCfim/VpOs6Es25v4NhPNoL+aslL+tzLHXk8v4l7 FsgUm8MvbCWw3WfFDV+JtZahEZe42Cr+JCuX79cX2g+T4p/4DnEG7TEGzq7O/vS+7uM2 HWjXmwTFr+/KBvTyLjFC8Su6age+LyK0Bdk6/am+H9IQKV3B4CH1h+momvj3XLmd0eT/ K4t8OgEZsRYGzy5K8EAbr8QZ1f4fBrmTlJTm/00qtxCDsyj3iJP++BklpLhxMbzpS+Ss 9dIUFVBcHHoYr1FRCSII43hJosKlP9j84UTEYlFMRHXppZ3DS15cDF2WBy59NTRwhwFk /Hdw== X-Gm-Message-State: AOUpUlE4Ol7cYb1zUeYjGYlg15QxIG59md73Iqzi7lGrIcey6bb46hfi ZiPXXL+YGAVLoMXmqQ8TUCdN2I6F X-Google-Smtp-Source: AA+uWPyxw19wvqcpzanfki2gmsARJyI12ugp2eGqbcGpsTp/TvHuwqF+R/drVkWyOgusC2B0juIhIA== X-Received: by 2002:a1c:9550:: with SMTP id x77-v6mr1928023wmd.135.1533919950385; Fri, 10 Aug 2018 09:52:30 -0700 (PDT) Received: from localhost.localdomain (AToulouse-658-1-25-156.w86-222.abo.wanadoo.fr. [86.222.24.156]) by smtp.googlemail.com with ESMTPSA id i125-v6sm3108302wmd.23.2018.08.10.09.52.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Aug 2018 09:52:29 -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 v6 10/20] t3404: todo list with commented-out commands only aborts Date: Fri, 10 Aug 2018 18:51:37 +0200 Message-Id: <20180810165147.4779-11-alban.gruin@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180810165147.4779-1-alban.gruin@gmail.com> References: <20180731180003.5421-1-alban.gruin@gmail.com> <20180810165147.4779-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 v5. 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