diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-30 13:34:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-30 13:34:52 -0700 |
| commit | 3fe5dbf57f2512d29cb72c68bdab98957fda7bb3 (patch) | |
| tree | 7fd683371f8812f08e5384f55dcadf099e90f3c4 /builtin-cat-file.c | |
| parent | 522a98caa5b9b6b99e08c6c72665d59342d6d5e2 (diff) | |
| parent | 7061cf0f205e86613c3a3306fdfedf2a5dcc8a65 (diff) | |
| download | git-3fe5dbf57f2512d29cb72c68bdab98957fda7bb3.tar.gz | |
Merge branch '__/setup-n-mv'
* __/setup-n-mv:
Call setup_git_directory() much earlier
Call setup_git_directory() early
Diffstat (limited to 'builtin-cat-file.c')
| -rw-r--r-- | builtin-cat-file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-cat-file.c b/builtin-cat-file.c index 4d36817e5f..814fb0743f 100644 --- a/builtin-cat-file.c +++ b/builtin-cat-file.c @@ -94,7 +94,7 @@ static int pprint_tag(const unsigned char *sha1, const char *buf, unsigned long return 0; } -int cmd_cat_file(int argc, const char **argv, char **envp) +int cmd_cat_file(int argc, const char **argv, const char *prefix) { unsigned char sha1[20]; char type[20]; @@ -102,7 +102,6 @@ int cmd_cat_file(int argc, const char **argv, char **envp) unsigned long size; int opt; - setup_git_directory(); git_config(git_default_config); if (argc != 3) usage("git-cat-file [-t|-s|-e|-p|<type>] <sha1>"); |