diff options
author | Junio C Hamano <junkio@cox.net> | 2005-08-17 15:38:47 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-08-17 15:38:47 -0700 |
commit | 942bc9c4805e7d4d5f23c86df36977aa4fdb9f7d (patch) | |
tree | d366e1279e2cc08d0882d61e946c764d2ffaf81c /update-cache.c | |
parent | Merge changes from master. (diff) | |
parent | Make rebase script saner. (diff) | |
download | tgif-942bc9c4805e7d4d5f23c86df36977aa4fdb9f7d.tar.xz |
Merge from master for misc fixes.
Diffstat (limited to 'update-cache.c')
-rw-r--r-- | update-cache.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/update-cache.c b/update-cache.c index 1fcc59a9c0..63815ed658 100644 --- a/update-cache.c +++ b/update-cache.c @@ -321,6 +321,7 @@ int main(int argc, char **argv) { int i, newfd, entries, has_errors = 0; int allow_options = 1; + const char *prefix = setup_git_directory(); newfd = hold_index_file_for_update(&cache_file, get_index_file()); if (newfd < 0) @@ -381,6 +382,7 @@ int main(int argc, char **argv) } die("unknown option %s", path); } + path = prefix_path(prefix, prefix ? strlen(prefix) : 0, path); if (!verify_path(path)) { fprintf(stderr, "Ignoring path %s\n", argv[i]); continue; |