With this, git-checkout-index from a subdirectory works as
expected. Note that "git-checkout-index -a" checks out files
only in the current directory and under.
Signed-off-by: Junio C Hamano <junkio@cox.net>
+static const char *prefix;
+static int prefix_length;
+
static struct checkout state = {
.base_dir = "",
.base_dir_len = 0,
static struct checkout state = {
.base_dir = "",
.base_dir_len = 0,
struct cache_entry *ce = active_cache[i];
if (ce_stage(ce))
continue;
struct cache_entry *ce = active_cache[i];
if (ce_stage(ce))
continue;
+ if (prefix && *prefix &&
+ ( ce_namelen(ce) <= prefix_length ||
+ memcmp(prefix, ce->name, prefix_length) ))
+ continue;
if (checkout_entry(ce, &state) < 0)
errs++;
}
if (checkout_entry(ce, &state) < 0)
errs++;
}
int newfd = -1;
int all = 0;
int newfd = -1;
int all = 0;
+ prefix = setup_git_directory();
+ prefix_length = prefix ? strlen(prefix) : 0;
+
if (read_cache() < 0) {
die("invalid cache");
}
if (read_cache() < 0) {
die("invalid cache");
}
if (all)
die("git-checkout-index: don't mix '--all' and explicit filenames");
if (all)
die("git-checkout-index: don't mix '--all' and explicit filenames");
+ checkout_file(prefix_path(prefix, prefix_length, arg));