diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-29 08:54:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-29 08:54:54 (GMT) |
| commit | 7061cf0f205e86613c3a3306fdfedf2a5dcc8a65 (patch) | |
| tree | e0595e44fc820032fd5ee942a031439f2e6da3b1 /builtin-mv.c | |
| parent | ac64a722072bb348476a8a029de9a82073e07fba (diff) | |
| parent | a633fca0c056aa221d23493c276d3713191621b3 (diff) | |
| download | git-7061cf0f205e86613c3a3306fdfedf2a5dcc8a65.zip git-7061cf0f205e86613c3a3306fdfedf2a5dcc8a65.tar.gz git-7061cf0f205e86613c3a3306fdfedf2a5dcc8a65.tar.bz2 | |
Merge branch 'lt/setup' into __/setup-n-mv
This merges the new built-in calling convention code into Johannes's
builtin-mv topic in order to resolve their conflicts early on.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-mv.c')
| -rw-r--r-- | builtin-mv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-mv.c b/builtin-mv.c index 42c2e39..62ae937 100644 --- a/builtin-mv.c +++ b/builtin-mv.c @@ -56,11 +56,10 @@ static const char *add_slash(const char *path) static struct lock_file lock_file; -int cmd_mv(int argc, const char **argv, char **envp) +int cmd_mv(int argc, const char **argv, const char *prefix) { int i, newfd, count; int verbose = 0, show_only = 0, force = 0, ignore_errors = 0; - const char *prefix = setup_git_directory(); const char **source, **destination, **dest_path; enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX } *modes; struct stat st; |