diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:50 -0800 |
| commit | 6758af89e4bf3f767e189da3e09c3c939162872d (patch) | |
| tree | d0f25a4cd8c831949748fe9334aaad595e225cd1 /builtin/update-index.c | |
| parent | 4443091d961e91041e64c1675940f0585eeba456 (diff) | |
| parent | 9c7c27eeab73b4c90cf36c6aa06ba6b8b9777629 (diff) | |
| download | git-6758af89e4bf3f767e189da3e09c3c939162872d.tar.gz | |
Merge branch 'jn/git-cmd-h-bypass-setup'
* jn/git-cmd-h-bypass-setup:
update-index -h: show usage even with corrupt index
merge -h: show usage even with corrupt index
ls-files -h: show usage even with corrupt index
gc -h: show usage even with broken configuration
commit/status -h: show usage even with broken configuration
checkout-index -h: show usage even in an invalid repository
branch -h: show usage even in an invalid repository
Conflicts:
builtin/merge.c
Diffstat (limited to 'builtin/update-index.c')
| -rw-r--r-- | builtin/update-index.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c index 62d9f3f0fa..200c7efed1 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() */ |