diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-03 19:47:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-03 19:47:46 -0800 |
| commit | 253e772edeb56092e0fad43ec0640658671313c5 (patch) | |
| tree | 8e9278a4ac03353056acd765c04779e01b0ce2f9 /builtin-archive.c | |
| parent | 4808bec6f9b5fe414f0dbc2cc0445f54f28e9e9c (diff) | |
| parent | 7943b3a94f0f862dc9d7dcec6b5639ae5bf027bd (diff) | |
| download | git-253e772edeb56092e0fad43ec0640658671313c5.tar.gz git-253e772edeb56092e0fad43ec0640658671313c5.tar.xz | |
Merge branch 'maint'
* maint:
Unset NO_C99_FORMAT on Cygwin.
Fix a "pointer type missmatch" warning.
Fix some "comparison is always true/false" warnings.
Fix an "implicit function definition" warning.
Fix a "label defined but unreferenced" warning.
Document the config variable format.suffix
git-merge: fail correctly when we cannot fast forward.
builtin-archive: use RUN_SETUP
Fix git-gc usage note
Diffstat (limited to 'builtin-archive.c')
| -rw-r--r-- | builtin-archive.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/builtin-archive.c b/builtin-archive.c index 8ea6cb1ef..2fae885f5 100644 --- a/builtin-archive.c +++ b/builtin-archive.c @@ -252,8 +252,6 @@ int cmd_archive(int argc, const char **argv, const char *prefix) memset(&ar, 0, sizeof(ar)); tree_idx = parse_archive_args(argc, argv, &ar); - if (prefix == NULL) - prefix = setup_git_directory(); argv += tree_idx; parse_treeish_arg(argv, &ar.args, prefix); |