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.3 required=3.0 tests=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 E412D1F597 for ; Tue, 31 Jul 2018 18:00:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731427AbeGaTmD (ORCPT ); Tue, 31 Jul 2018 15:42:03 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33692 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729598AbeGaTmC (ORCPT ); Tue, 31 Jul 2018 15:42:02 -0400 Received: by mail-wm0-f67.google.com with SMTP id r24-v6so11679308wmh.0 for ; Tue, 31 Jul 2018 11:00:35 -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=EisTRMuZTamOxa6pf3Z3m7Rn8yh1khUa4RX/cf3fyUw=; b=E4CFi7+aNJ6hvAA81a/drYAHfmjzweP8Y3s6yhFb2DCF0TIDcLBlBHUTH1yT+od1cY QMpniXaXV5Zr+y0N7p6j00DRMNDPyUf41uhx7mlfxsYYvM7Qk5wT4aR1y14FlwbC2wWM PvnT2DqSMI3JRS4TVszzAGWaJgkJ6OfpWUvRaEXiGa4rMX1JdY89R4UWhORMRMcXnUgI nO+3wqI/hN2HTa7bCyPisvbV2KM25uze3MhZ0ULhK6oLIz8s6afH09tpZHAWV/XTkPZl jAbutYmQx5PM9mXdk+M5TJy3EOeicIkA87XpTjhTZnOnU/JDcRGtbnlA2ASjbO7z34nB 7SrA== 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=EisTRMuZTamOxa6pf3Z3m7Rn8yh1khUa4RX/cf3fyUw=; b=R4eV9t2CXHTCw24G0a4U7RCPuEWxdYXcP+AhEwwmyPkhh0lJWFbaj6hhjvtiWBxQrK e0a7dPD7xq7sjzQVI/YzYC1zsfG9b5zDDO9Iai6YGavVYQpugp+f1YwbAcp6r4Dw7LpS Rtgm8iuZdVoIJdsnLhxZI6EYM/9GwQ7IYxk48ziWULV6dMZSt2ZpR9BG2d2Dc/iuc6JZ UnRAIj5ID6qMA9G9nhqZB9YMlYIIbbSxrtQps2rF3rydA/u/Pb760upfWaeaTsDoVKnC kNmJ1wOhCHy1qfRY1cXfx9zI5uvJqHt5qUUMYVw+kRAWjlqU6Mqj9QfrQW8wl/zuCgYS Ws4w== X-Gm-Message-State: AOUpUlG+VEa85tX3YrnVaGkWCpbUb/Ax5JT6po2taoijBXc5geIDyMId Y5yXe4yxVIpeT5fvuj7dDYP77+ks X-Google-Smtp-Source: AAOMgpfFV7v7hl9qSCK08aGj9jfIIQfUHCmNIJxM2xqQOjyqdVz6Xhhc5bi40y2f043DFcU8XbwWbQ== X-Received: by 2002:a1c:9550:: with SMTP id x77-v6mr433259wmd.135.1533060034671; Tue, 31 Jul 2018 11:00:34 -0700 (PDT) Received: from localhost.localdomain (AToulouse-658-1-67-118.w92-136.abo.wanadoo.fr. [92.136.29.118]) by smtp.googlemail.com with ESMTPSA id l10-v6sm20756602wrv.23.2018.07.31.11.00.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jul 2018 11:00:33 -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 v5 10/20] t3404: todo list with commented-out commands only aborts Date: Tue, 31 Jul 2018 19:59:53 +0200 Message-Id: <20180731180003.5421-11-alban.gruin@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180731180003.5421-1-alban.gruin@gmail.com> References: <20180724163221.15201-1-alban.gruin@gmail.com> <20180731180003.5421-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 v4. 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