diff options
author | Junio C Hamano <junkio@cox.net> | 2006-07-29 01:54:54 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-07-29 01:54:54 -0700 |
commit | 7061cf0f205e86613c3a3306fdfedf2a5dcc8a65 (patch) | |
tree | e0595e44fc820032fd5ee942a031439f2e6da3b1 /builtin-update-index.c | |
parent | ac64a722072bb348476a8a029de9a82073e07fba (diff) | |
parent | a633fca0c056aa221d23493c276d3713191621b3 (diff) | |
download | git-7061cf0f205e86613c3a3306fdfedf2a5dcc8a65.tar.gz git-7061cf0f205e86613c3a3306fdfedf2a5dcc8a65.tar.xz |
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-update-index.c')
-rw-r--r-- | builtin-update-index.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-update-index.c b/builtin-update-index.c index 1a4200d15..24dca47d8 100644 --- a/builtin-update-index.c +++ b/builtin-update-index.c @@ -476,12 +476,11 @@ static int do_reupdate(int ac, const char **av, return 0; } -int cmd_update_index(int argc, const char **argv, char **envp) +int cmd_update_index(int argc, const char **argv, const char *prefix) { int i, newfd, entries, has_errors = 0, line_termination = '\n'; int allow_options = 1; int read_from_stdin = 0; - const char *prefix = setup_git_directory(); int prefix_length = prefix ? strlen(prefix) : 0; char set_executable_bit = 0; unsigned int refresh_flags = 0; |