From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.2 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id DCDEA207F8 for ; Wed, 3 May 2017 21:07:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754931AbdECVHx (ORCPT ); Wed, 3 May 2017 17:07:53 -0400 Received: from smtp2-g21.free.fr ([212.27.42.2]:15804 "EHLO smtp2-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751940AbdECVHw (ORCPT ); Wed, 3 May 2017 17:07:52 -0400 Received: from localhost.localdomain (unknown [IPv6:2a01:e35:2ef1:f910:5006:1621:c385:7777]) by smtp2-g21.free.fr (Postfix) with ESMTP id 3E9492003D9; Wed, 3 May 2017 23:07:48 +0200 (CEST) From: Jean-Noel Avila To: git@vger.kernel.org Cc: rashmipai36@gmail.com, Jean-Noel Avila Subject: [PATCH v2 3/3] git-filter-branch: make the error msg when missing branch more open Date: Wed, 3 May 2017 23:07:26 +0200 Message-Id: <20170503210726.24121-3-jn.avila@free.fr> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170503210726.24121-1-jn.avila@free.fr> References: <20170503162931.30721-1-jn.avila@free.fr> <20170503210726.24121-1-jn.avila@free.fr> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org git-filter-branch requires the specification of a branch by one way or another. If no branch appears to have been specified, we know the user got the usage wrong but we don't know what they were trying to do --- e.g. maybe they specified the ref to rewrite but in the wrong place. The safest solution is to just print the usage in this case. Signed-off-by: Jean-Noel Avila --- git-filter-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 2b8cdba15..bda2bae23 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -239,7 +239,7 @@ git rev-parse --no-flags --revs-only --symbolic-full-name \ sed -e '/^^/d' "$tempdir"/raw-heads >"$tempdir"/heads test -s "$tempdir"/heads || - die "Which ref do you want to rewrite?" + usage GIT_INDEX_FILE="$(pwd)/../index" export GIT_INDEX_FILE -- 2.12.0