From: Jonathan Nieder <jrnieder@gmail•com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail•com>
Cc: git@vger•kernel.org, Junio C Hamano <gitster@pobox•com>,
Matthieu Moy <Matthieu.Moy@imag•fr>
Subject: [PATCH 6/7] merge -h: show usage even with corrupt index
Date: Fri, 22 Oct 2010 01:49:45 -0500 [thread overview]
Message-ID: <20101022064945.GG6081@burratino> (raw)
In-Reply-To: <20101022063837.GA6081@burratino>
From: Nguyễn Thái Ngọc Duy <pclouds@gmail•com>
Part of a campaign to make sure "git <command> -h" works correctly
when run from distractingly bad repositories.
[jn: with rewritten log message and tests]
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail•com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail•com>
---
builtin/merge.c | 2 ++
t/t7600-merge.sh | 11 +++++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 5f65c0c..584c94f 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -909,6 +909,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
const char *best_strategy = NULL, *wt_strategy = NULL;
struct commit_list **remotes = &remoteheads;
+ if (argc == 2 && !strcmp(argv[1], "-h"))
+ usage_with_options(builtin_merge_usage, builtin_merge_options);
if (read_cache_unmerged()) {
die_resolve_conflict("merge");
}
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index b4f40e4..b147a1b 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -144,6 +144,17 @@ test_expect_success 'test option parsing' '
test_must_fail git merge
'
+test_expect_success 'merge -h with invalid index' '
+ mkdir broken &&
+ (
+ cd broken &&
+ git init &&
+ >.git/index &&
+ test_expect_code 129 git merge -h 2>usage
+ ) &&
+ grep "[Uu]sage: git merge" broken/usage
+'
+
test_expect_success 'reject non-strategy with a git-merge-foo name' '
test_must_fail git merge -s index c1
'
--
1.7.2.3
next prev parent reply other threads:[~2010-10-22 6:53 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-20 3:11 [PATCH v2 1/4] setup_git_env: print the true $GIT_DIR for debugging Nguyễn Thái Ngọc Duy
2010-10-20 3:11 ` [PATCH v2 2/4] run_builtin(): save "-h" detection result for later use Nguyễn Thái Ngọc Duy
2010-10-21 22:57 ` Junio C Hamano
2010-10-22 1:47 ` Nguyen Thai Ngoc Duy
2010-10-20 3:11 ` [PATCH v2 3/4] builtins: utilize startup_info->help where possible Nguyễn Thái Ngọc Duy
2010-10-20 3:12 ` [PATCH v2 4/4] builtins: check for startup_info->help, print and exit early Nguyễn Thái Ngọc Duy
2010-10-22 6:38 ` [PATCH en/and-cascade-tests 0/7] Jonathan Nieder
2010-10-22 6:42 ` [PATCH 1/7] branch -h: show usage even in an invalid repository Jonathan Nieder
2010-10-22 18:30 ` Junio C Hamano
2010-10-24 7:20 ` Jonathan Nieder
2010-10-24 8:13 ` [RFC/PATCH 0/4] update-index: migrate to parse-options API Jonathan Nieder
2010-10-24 8:15 ` [PATCH 1/4] parse-options: allow git commands to invent new option types Jonathan Nieder
2010-10-25 10:31 ` Stephen Boyd
2010-11-29 4:03 ` Jonathan Nieder
2010-10-24 8:15 ` [PATCH 2/4] parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION Jonathan Nieder
2010-10-24 8:16 ` [PATCH 3/4] setup: save prefix (original cwd relative to toplevel) in startup_info Jonathan Nieder
2010-10-24 8:18 ` [PATCH 4/4] update-index: migrate to parse-options API Jonathan Nieder
2010-10-25 10:30 ` Stephen Boyd
2010-11-30 2:34 ` Jonathan Nieder
2010-10-24 12:50 ` [RFC/PATCH 0/4] " Nguyen Thai Ngoc Duy
2010-10-27 4:19 ` Junio C Hamano
2010-11-30 2:52 ` [PATCH/RFCv2 0/6] " Jonathan Nieder
2010-11-30 2:55 ` [PATCH 1/6] parse-options: sanity check PARSE_OPT_NOARG flag Jonathan Nieder
2010-11-30 8:13 ` Stephen Boyd
2010-12-01 23:01 ` Junio C Hamano
2010-12-03 7:35 ` Stephen Boyd
2010-12-01 23:36 ` Junio C Hamano
2010-11-30 3:04 ` [PATCH 2/6] parse-options: do not infer PARSE_OPT_NOARG from option type Jonathan Nieder
2010-11-30 8:13 ` Stephen Boyd
2010-11-30 3:08 ` [PATCH 3/6] parse-options: allow git commands to invent new option types Jonathan Nieder
2010-11-30 3:09 ` [PATCH 4/6] parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION Jonathan Nieder
2010-11-30 3:10 ` [PATCH 5/6] setup: save prefix (original cwd relative to toplevel) in startup_info Jonathan Nieder
2010-11-30 3:15 ` [PATCH 6/6] update-index: migrate to parse-options API Jonathan Nieder
2010-11-30 8:13 ` Stephen Boyd
2010-11-30 16:00 ` [PATCH] parse-options: always show arghelp when LITERAL_ARGHELP is set Jonathan Nieder
2010-10-22 6:44 ` [PATCH 2/7] checkout-index -h: show usage even in an invalid repository Jonathan Nieder
2010-10-22 6:45 ` [PATCH 3/7] commit/status -h: show usage even with broken configuration Jonathan Nieder
2010-10-22 6:47 ` [PATCH 4/7] gc " Jonathan Nieder
2010-10-22 6:48 ` [PATCH 5/7] ls-files -h: show usage even with corrupt index Jonathan Nieder
2010-10-22 18:30 ` Junio C Hamano
2010-10-22 6:49 ` Jonathan Nieder [this message]
2010-10-22 18:31 ` [PATCH 6/7] merge " Junio C Hamano
2010-10-22 6:51 ` [PATCH 7/7] update-index " Jonathan Nieder
2010-10-22 6:55 ` [PATCH en/and-cascade-tests 0/7] avoid repository access during "git <foo> -h" Jonathan Nieder
2010-10-22 11:23 ` [PATCH en/and-cascade-tests 0/7] Nguyen Thai Ngoc Duy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101022064945.GG6081@burratino \
--to=jrnieder@gmail$(echo .)com \
--cc=Matthieu.Moy@imag$(echo .)fr \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=pclouds@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox