mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jn/git-cmd-h-bypass-setup'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2010-12-12 21:49:50 -08:00
parent 4443091d96 9c7c27eeab
commit 6758af89e4
14 changed files with 193 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/update-index.c
View File

@ -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() */