diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-05 16:34:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-05 16:34:51 -0700 |
| commit | 77e6f5bc1009aa588a3b2235758bf5be13b23d85 (patch) | |
| tree | cb040ac72459291eda6adf1aa9f10778bc54cdbf /builtin-archive.c | |
| parent | 33580fbd308593e36395926fd35b501976ad322a (diff) | |
| parent | b5da24679ec73f458988523dce9dd17b4e9b0e02 (diff) | |
| download | git-77e6f5bc1009aa588a3b2235758bf5be13b23d85.tar.gz | |
Merge branch 'maint'
* maint:
Fix lseek(2) calls with args 2 and 3 swapped
Honor -p<n> when applying git diffs
Fix dependency of common-cmds.h
Fix renaming branch without config file
DESTDIR support for git/contrib/emacs
gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches
Document --left-right option to rev-list.
Revert "builtin-archive: use RUN_SETUP"
rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email.
rerere: make sorting really stable.
Fix t4200-rerere for white-space from "wc -l"
Diffstat (limited to 'builtin-archive.c')
| -rw-r--r-- | builtin-archive.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-archive.c b/builtin-archive.c index 2fae885f5c..8ea6cb1efc 100644 --- a/builtin-archive.c +++ b/builtin-archive.c @@ -252,6 +252,8 @@ 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); |