diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-10-22 01:51:00 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-22 11:04:54 -0700 |
| commit | 9c7c27eeab73b4c90cf36c6aa06ba6b8b9777629 (patch) | |
| tree | 3a283a3e76f44e10b504597487ea213babba17ea | |
| parent | da53eec68873e76c68086e405f3f1329d47055b3 (diff) | |
| download | git-9c7c27eeab73b4c90cf36c6aa06ba6b8b9777629.tar.gz git-9c7c27eeab73b4c90cf36c6aa06ba6b8b9777629.tar.xz | |
update-index -h: show usage even with corrupt index
When trying to fix up a corrupt repository, one might prefer that
"update-index -h" print an accurate usage message and exit rather
than reading the repository and complaining about the corruption.
[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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/update-index.c | 3 | ||||
| -rwxr-xr-x | t/t2107-update-index-basic.sh | 32 |
2 files changed, 35 insertions, 0 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c index 3ab214d24..a41d6d74f 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -589,6 +589,9 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) int lock_error = 0; struct lock_file *lock_file; + if (argc == 2 && !strcmp(argv[1], "-h")) + usage(update_index_usage); + git_config(git_default_config, NULL); /* We can't free this memory, it becomes part of a linked list parsed atexit() */ diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh new file mode 100755 index 000000000..33f8be0cd --- /dev/null +++ b/t/t2107-update-index-basic.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +test_description='basic update-index tests + +Tests for command-line parsing and basic operation. +' + +. ./test-lib.sh + +test_expect_success 'update-index --nonsense fails' ' + test_must_fail git update-index --nonsense 2>msg && + cat msg && + test -s msg +' + +test_expect_failure 'update-index --nonsense dumps usage' ' + test_expect_code 129 git update-index --nonsense 2>err && + grep "[Uu]sage: git update-index" err +' + +test_expect_success 'update-index -h with corrupt index' ' + mkdir broken && + ( + cd broken && + git init && + >.git/index && + test_expect_code 129 git update-index -h >usage 2>&1 + ) && + grep "[Uu]sage: git update-index" broken/usage +' + +test_done |