Merge branch 'jc/reupdate' into next
* jc/reupdate: update-index --again: take optional pathspecs update-index --again update-index: plug memory leak from prefix_path() checkout-index: plug memory leak from prefix_path() update-index --unresolve: work from a subdirectory.
This commit is contained in:
Junio C Hamano
commit
aadc81c13b
@ -15,7 +15,7 @@ SYNOPSIS
|
||||
[--cacheinfo <mode> <object> <file>]\*
|
||||
[--chmod=(+|-)x]
|
||||
[--assume-unchanged | --no-assume-unchanged]
|
||||
[--really-refresh] [--unresolve]
|
||||
[--really-refresh] [--unresolve] [--again]
|
||||
[--info-only] [--index-info]
|
||||
[-z] [--stdin]
|
||||
[--verbose]
|
||||
@ -80,6 +80,10 @@ OPTIONS
|
||||
filesystem that has very slow lstat(2) system call
|
||||
(e.g. cifs).
|
||||
|
||||
--again::
|
||||
Runs `git-update-index` itself on the paths whose index
|
||||
entries are different from those from the `HEAD` commit.
|
||||
|
||||
--unresolve::
|
||||
Restores the 'unmerged' or 'needs updating' state of a
|
||||
file during a merge if it was cleared by accident.
|
||||
|
||||
@ -270,12 +270,16 @@ int main(int argc, char **argv)
|
||||
/* Check out named files first */
|
||||
for ( ; i < argc; i++) {
|
||||
const char *arg = argv[i];
|
||||
const char *p;
|
||||
|
||||
if (all)
|
||||
die("git-checkout-index: don't mix '--all' and explicit filenames");
|
||||
if (read_from_stdin)
|
||||
die("git-checkout-index: don't mix '--stdin' and explicit filenames");
|
||||
checkout_file(prefix_path(prefix, prefix_length, arg));
|
||||
p = prefix_path(prefix, prefix_length, arg);
|
||||
checkout_file(p);
|
||||
if (p != arg)
|
||||
free((char*)p);
|
||||
}
|
||||
|
||||
if (read_from_stdin) {
|
||||
@ -285,6 +289,8 @@ int main(int argc, char **argv)
|
||||
strbuf_init(&buf);
|
||||
while (1) {
|
||||
char *path_name;
|
||||
const char *p;
|
||||
|
||||
read_line(&buf, stdin, line_termination);
|
||||
if (buf.eof)
|
||||
break;
|
||||
@ -292,7 +298,10 @@ int main(int argc, char **argv)
|
||||
path_name = unquote_c_style(buf.buf, NULL);
|
||||
else
|
||||
path_name = buf.buf;
|
||||
checkout_file(prefix_path(prefix, prefix_length, path_name));
|
||||
p = prefix_path(prefix, prefix_length, path_name);
|
||||
checkout_file(p);
|
||||
if (p != path_name)
|
||||
free((char *)p);
|
||||
if (path_name != buf.buf)
|
||||
free(path_name);
|
||||
}
|
||||
|
||||
82
t/t2101-update-index-reupdate.sh
Executable file
82
t/t2101-update-index-reupdate.sh
Executable file
@ -0,0 +1,82 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2006 Junio C Hamano
|
||||
#
|
||||
|
||||
test_description='git-update-index --again test.
|
||||
'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success 'update-index --add' \
|
||||
'echo hello world >file1 &&
|
||||
echo goodbye people >file2 &&
|
||||
git-update-index --add file1 file2 &&
|
||||
git-ls-files -s >current &&
|
||||
cmp current - <<\EOF
|
||||
100644 3b18e512dba79e4c8300dd08aeb37f8e728b8dad 0 file1
|
||||
100644 9db8893856a8a02eaa73470054b7c1c5a7c82e47 0 file2
|
||||
EOF'
|
||||
|
||||
test_expect_success 'update-index --again' \
|
||||
'rm -f file1 &&
|
||||
echo hello everybody >file2 &&
|
||||
if git-update-index --again
|
||||
then
|
||||
echo should have refused to remove file1
|
||||
exit 1
|
||||
else
|
||||
echo happy - failed as expected
|
||||
fi &&
|
||||
git-ls-files -s >current &&
|
||||
cmp current - <<\EOF
|
||||
100644 3b18e512dba79e4c8300dd08aeb37f8e728b8dad 0 file1
|
||||
100644 9db8893856a8a02eaa73470054b7c1c5a7c82e47 0 file2
|
||||
EOF'
|
||||
|
||||
test_expect_success 'update-index --remove --again' \
|
||||
'git-update-index --remove --again &&
|
||||
git-ls-files -s >current &&
|
||||
cmp current - <<\EOF
|
||||
100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
|
||||
EOF'
|
||||
|
||||
test_expect_success 'first commit' 'git-commit -m initial'
|
||||
|
||||
test_expect_success 'update-index again' \
|
||||
'mkdir -p dir1 &&
|
||||
echo hello world >dir1/file3 &&
|
||||
echo goodbye people >file2 &&
|
||||
git-update-index --add file2 dir1/file3 &&
|
||||
echo hello everybody >file2
|
||||
echo happy >dir1/file3 &&
|
||||
git-update-index --again &&
|
||||
git-ls-files -s >current &&
|
||||
cmp current - <<\EOF
|
||||
100644 53ab446c3f4e42ce9bb728a0ccb283a101be4979 0 dir1/file3
|
||||
100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
|
||||
EOF'
|
||||
|
||||
test_expect_success 'update-index --update from subdir' \
|
||||
'echo not so happy >file2 &&
|
||||
cd dir1 &&
|
||||
cat ../file2 >file3 &&
|
||||
git-update-index --again &&
|
||||
cd .. &&
|
||||
git-ls-files -s >current &&
|
||||
cmp current - <<\EOF
|
||||
100644 d7fb3f695f06c759dbf3ab00046e7cc2da22d10f 0 dir1/file3
|
||||
100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
|
||||
EOF'
|
||||
|
||||
test_expect_success 'update-index --update with pathspec' \
|
||||
'echo very happy >file2 &&
|
||||
cat file2 >dir1/file3 &&
|
||||
git-update-index --again dir1/ &&
|
||||
git-ls-files -s >current &&
|
||||
cmp current - <<\EOF
|
||||
100644 594fb5bb1759d90998e2bf2a38261ae8e243c760 0 dir1/file3
|
||||
100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
|
||||
EOF'
|
||||
|
||||
test_done
|
||||
@ -374,12 +374,12 @@ static void update_one(const char *path, const char *prefix, int prefix_length)
|
||||
const char *p = prefix_path(prefix, prefix_length, path);
|
||||
if (!verify_path(p)) {
|
||||
fprintf(stderr, "Ignoring path %s\n", path);
|
||||
return;
|
||||
goto free_return;
|
||||
}
|
||||
if (mark_valid_only) {
|
||||
if (mark_valid(p))
|
||||
die("Unable to mark file %s", path);
|
||||
return;
|
||||
goto free_return;
|
||||
}
|
||||
cache_tree_invalidate_path(active_cache_tree, path);
|
||||
|
||||
@ -387,11 +387,14 @@ static void update_one(const char *path, const char *prefix, int prefix_length)
|
||||
if (remove_file_from_cache(p))
|
||||
die("git-update-index: unable to remove %s", path);
|
||||
report("remove '%s'", path);
|
||||
return;
|
||||
goto free_return;
|
||||
}
|
||||
if (add_file_to_cache(p))
|
||||
die("Unable to process file %s", path);
|
||||
report("add '%s'", path);
|
||||
free_return:
|
||||
if (p != path)
|
||||
free((char*)p);
|
||||
}
|
||||
|
||||
static void read_index_info(int line_termination)
|
||||
@ -485,7 +488,7 @@ static void read_index_info(int line_termination)
|
||||
}
|
||||
|
||||
static const char update_index_usage[] =
|
||||
"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--ignore-missing] [-z] [--verbose] [--] <file>...";
|
||||
"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--again] [--ignore-missing] [-z] [--verbose] [--] <file>...";
|
||||
|
||||
static unsigned char head_sha1[20];
|
||||
static unsigned char merge_head_sha1[20];
|
||||
@ -500,11 +503,13 @@ static struct cache_entry *read_one_ent(const char *which,
|
||||
struct cache_entry *ce;
|
||||
|
||||
if (get_tree_entry(ent, path, sha1, &mode)) {
|
||||
error("%s: not in %s branch.", path, which);
|
||||
if (which)
|
||||
error("%s: not in %s branch.", path, which);
|
||||
return NULL;
|
||||
}
|
||||
if (mode == S_IFDIR) {
|
||||
error("%s: not a blob in %s branch.", path, which);
|
||||
if (which)
|
||||
error("%s: not a blob in %s branch.", path, which);
|
||||
return NULL;
|
||||
}
|
||||
size = cache_entry_size(namelen);
|
||||
@ -589,7 +594,8 @@ static void read_head_pointers(void)
|
||||
}
|
||||
}
|
||||
|
||||
static int do_unresolve(int ac, const char **av)
|
||||
static int do_unresolve(int ac, const char **av,
|
||||
const char *prefix, int prefix_length)
|
||||
{
|
||||
int i;
|
||||
int err = 0;
|
||||
@ -601,11 +607,57 @@ static int do_unresolve(int ac, const char **av)
|
||||
|
||||
for (i = 1; i < ac; i++) {
|
||||
const char *arg = av[i];
|
||||
err |= unresolve_one(arg);
|
||||
const char *p = prefix_path(prefix, prefix_length, arg);
|
||||
err |= unresolve_one(p);
|
||||
if (p != arg)
|
||||
free((char*)p);
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
static int do_reupdate(int ac, const char **av,
|
||||
const char *prefix, int prefix_length)
|
||||
{
|
||||
/* Read HEAD and run update-index on paths that are
|
||||
* merged and already different between index and HEAD.
|
||||
*/
|
||||
int pos;
|
||||
int has_head = 1;
|
||||
char **pathspec = get_pathspec(prefix, av + 1);
|
||||
|
||||
if (read_ref(git_path("HEAD"), head_sha1))
|
||||
/* If there is no HEAD, that means it is an initial
|
||||
* commit. Update everything in the index.
|
||||
*/
|
||||
has_head = 0;
|
||||
redo:
|
||||
for (pos = 0; pos < active_nr; pos++) {
|
||||
struct cache_entry *ce = active_cache[pos];
|
||||
struct cache_entry *old = NULL;
|
||||
int save_nr;
|
||||
|
||||
if (ce_stage(ce) || !ce_path_match(ce, pathspec))
|
||||
continue;
|
||||
if (has_head)
|
||||
old = read_one_ent(NULL, head_sha1,
|
||||
ce->name, ce_namelen(ce), 0);
|
||||
if (old && ce->ce_mode == old->ce_mode &&
|
||||
!memcmp(ce->sha1, old->sha1, 20)) {
|
||||
free(old);
|
||||
continue; /* unchanged */
|
||||
}
|
||||
/* Be careful. The working tree may not have the
|
||||
* path anymore, in which case, under 'allow_remove',
|
||||
* or worse yet 'allow_replace', active_nr may decrease.
|
||||
*/
|
||||
save_nr = active_nr;
|
||||
update_one(ce->name + prefix_length, prefix, prefix_length);
|
||||
if (save_nr != active_nr)
|
||||
goto redo;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int main(int argc, const char **argv)
|
||||
{
|
||||
int i, newfd, entries, has_errors = 0, line_termination = '\n';
|
||||
@ -717,7 +769,15 @@ int main(int argc, const char **argv)
|
||||
break;
|
||||
}
|
||||
if (!strcmp(path, "--unresolve")) {
|
||||
has_errors = do_unresolve(argc - i, argv + i);
|
||||
has_errors = do_unresolve(argc - i, argv + i,
|
||||
prefix, prefix_length);
|
||||
if (has_errors)
|
||||
active_cache_changed = 0;
|
||||
goto finish;
|
||||
}
|
||||
if (!strcmp(path, "--again")) {
|
||||
has_errors = do_reupdate(argc - i, argv + i,
|
||||
prefix, prefix_length);
|
||||
if (has_errors)
|
||||
active_cache_changed = 0;
|
||||
goto finish;
|
||||
@ -743,6 +803,7 @@ int main(int argc, const char **argv)
|
||||
strbuf_init(&buf);
|
||||
while (1) {
|
||||
char *path_name;
|
||||
const char *p;
|
||||
read_line(&buf, stdin, line_termination);
|
||||
if (buf.eof)
|
||||
break;
|
||||
@ -750,11 +811,12 @@ int main(int argc, const char **argv)
|
||||
path_name = unquote_c_style(buf.buf, NULL);
|
||||
else
|
||||
path_name = buf.buf;
|
||||
update_one(path_name, prefix, prefix_length);
|
||||
if (set_executable_bit) {
|
||||
const char *p = prefix_path(prefix, prefix_length, path_name);
|
||||
p = prefix_path(prefix, prefix_length, path_name);
|
||||
update_one(p, NULL, 0);
|
||||
if (set_executable_bit)
|
||||
chmod_path(set_executable_bit, p);
|
||||
}
|
||||
if (p != path_name)
|
||||
free((char*) p);
|
||||
if (path_name != buf.buf)
|
||||
free(path_name);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user