From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brian Gesiak Subject: [PATCH 3/3] branch: die when setting branch as own upstream Date: Sat, 1 Mar 2014 21:23:44 +0900 Message-ID: <1393676624-67687-1-git-send-email-modocache@gmail.com> References: <1393676356-67203-1-git-send-email-modocache@gmail.com> Cc: Brian Gesiak To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Mar 01 13:23:50 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WJixK-0002w6-GB for gcvg-git-2@plane.gmane.org; Sat, 01 Mar 2014 13:23:50 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753106AbaCAMXp (ORCPT ); Sat, 1 Mar 2014 07:23:45 -0500 Received: from mail-pb0-f54.google.com ([209.85.160.54]:55747 "EHLO mail-pb0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753091AbaCAMXk (ORCPT ); Sat, 1 Mar 2014 07:23:40 -0500 Received: by mail-pb0-f54.google.com with SMTP id ma3so1791753pbc.27 for ; Sat, 01 Mar 2014 04:23:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UbYGk4qUy4zdk4mqOVe6lOnJwvRkIWSt7xxlbbZrco4=; b=Nx3iWPuRdHiNkg49HX4p11qHNhrtNcQ8I5M7XLTYPqMdpdqV0rHjMCEXeL/FLDOC3b U3lbNS5i5xG8GVgxK9ZNELJ6qq/xKTH+sf0thfSzHQBgV3OX6+12TAIrbc6xihk0AGqT iMsA8mvCCFg/wH9u3cfbITz75Lfp3VmrjqHshutg6A6ErPyIBY0KopZppNXLnkihmPVS nG7+rT6piueWCacTwPKBnpUaZguqN5VWwc2zN1JhHrkh90TwYG/4g6AlGcyUlxMWNpGp wRhPLRx1Pbn51cesvVqs7CHhDv1EI7V6A4vOsf3yMKIfekar2IdOS+S3r6u7KK9sx+PL N4cw== X-Received: by 10.68.236.9 with SMTP id uq9mr9437284pbc.10.1393676620061; Sat, 01 Mar 2014 04:23:40 -0800 (PST) Received: from localhost.localdomain (p1157-ipbf5204marunouchi.tokyo.ocn.ne.jp. [118.8.132.157]) by mx.google.com with ESMTPSA id dc4sm15893961pbc.34.2014.03.01.04.23.38 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 01 Mar 2014 04:23:39 -0800 (PST) X-Mailer: git-send-email 1.8.3.4 (Apple Git-47) In-Reply-To: <1393676356-67203-1-git-send-email-modocache@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Branch set as own upstream using one of the following commands returns immediately with an exit code of 0: - `git branch --set-upstream-to foo refs/heads/foo` - `git branch --force --track foo foo` Since neither of these actions currently set the upstream, an exit code of 0 is misleading. Instead, exit with a status code indicating failure by using the die function. Signed-off-by: Brian Gesiak --- branch.c | 9 ++------- t/t3200-branch.sh | 6 +++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/branch.c b/branch.c index e163f3c..9bac8b5 100644 --- a/branch.c +++ b/branch.c @@ -54,13 +54,8 @@ void install_branch_config(int flag, const char *local, const char *origin, cons struct strbuf key = STRBUF_INIT; int rebasing = should_setup_rebase(origin); - if (shortname - && !strcmp(local, shortname) - && !origin) { - warning(_("Not setting branch %s as its own upstream."), - local); - return; - } + if (shortname && !strcmp(local, shortname) && !origin) + die(_("Not setting branch %s as its own upstream."), local); strbuf_addf(&key, "branch.%s.remote", local); git_config_set(key.buf, origin ? origin : "."); diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 6164126..3ac493f 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -507,10 +507,10 @@ EOF test_cmp expected actual ' -test_expect_success '--set-upstream-to shows warning if used to set branch as own upstream' ' - git branch --set-upstream-to refs/heads/my13 my13 2>actual && +test_expect_success '--set-upstream-to fails if used to set branch as own upstream' ' + test_must_fail git branch --set-upstream-to refs/heads/my13 my13 2>actual && cat >expected <