projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fmt-patch: understand old <his> notation
[git.git]
/
update-index.c
diff --git
a/update-index.c
b/update-index.c
index
64f4c49
..
d63f8ac
100644
(file)
--- a/
update-index.c
+++ b/
update-index.c
@@
-329,7
+329,7
@@
static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
return 0;
}
return 0;
}
-static
int
chmod_path(int flip, const char *path)
+static
void
chmod_path(int flip, const char *path)
{
int pos;
struct cache_entry *ce;
{
int pos;
struct cache_entry *ce;
@@
-337,21
+337,24
@@
static int chmod_path(int flip, const char *path)
pos = cache_name_pos(path, strlen(path));
if (pos < 0)
pos = cache_name_pos(path, strlen(path));
if (pos < 0)
-
return -1
;
+
goto fail
;
ce = active_cache[pos];
mode = ntohl(ce->ce_mode);
if (!S_ISREG(mode))
ce = active_cache[pos];
mode = ntohl(ce->ce_mode);
if (!S_ISREG(mode))
-
return -1
;
+
goto fail
;
switch (flip) {
case '+':
ce->ce_mode |= htonl(0111); break;
case '-':
ce->ce_mode &= htonl(~0111); break;
default:
switch (flip) {
case '+':
ce->ce_mode |= htonl(0111); break;
case '-':
ce->ce_mode &= htonl(~0111); break;
default:
-
return -1
;
+
goto fail
;
}
active_cache_changed = 1;
}
active_cache_changed = 1;
- return 0;
+ report("chmod %cx '%s'", flip, path);
+ return;
+ fail:
+ die("git-update-index: cannot chmod %cx '%s'", flip, path);
}
static struct cache_file cache_file;
}
static struct cache_file cache_file;
@@
-361,23
+364,26
@@
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);
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);
}
if (mark_valid_only) {
if (mark_valid(p))
die("Unable to mark file %s", path);
- return;
+
goto free_
return;
}
if (force_remove) {
if (remove_file_from_cache(p))
die("git-update-index: unable to remove %s", path);
report("remove '%s'", path);
}
if (force_remove) {
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);
}
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)
}
static void read_index_info(int line_termination)
@@
-470,7
+476,7
@@
static void read_index_info(int line_termination)
}
static const char update_index_usage[] =
}
static const char update_index_usage[] =
-"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--
cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] [--index-info
] [--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
] [--ignore-missing] [-z] [--verbose] [--] <file>...";
static unsigned char head_sha1[20];
static unsigned char merge_head_sha1[20];
static unsigned char head_sha1[20];
static unsigned char merge_head_sha1[20];
@@
-573,7
+579,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;
{
int i;
int err = 0;
@@
-585,7
+592,10
@@
static int do_unresolve(int ac, const char **av)
for (i = 1; i < ac; i++) {
const char *arg = av[i];
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;
}
}
return err;
}
@@
-597,6
+607,7
@@
int main(int argc, const char **argv)
int read_from_stdin = 0;
const char *prefix = setup_git_directory();
int prefix_length = prefix ? strlen(prefix) : 0;
int read_from_stdin = 0;
const char *prefix = setup_git_directory();
int prefix_length = prefix ? strlen(prefix) : 0;
+ char set_executable_bit = 0;
git_config(git_default_config);
git_config(git_default_config);
@@
-663,8
+674,7
@@
int main(int argc, const char **argv)
!strcmp(path, "--chmod=+x")) {
if (argc <= i+1)
die("git-update-index: %s <path>", path);
!strcmp(path, "--chmod=+x")) {
if (argc <= i+1)
die("git-update-index: %s <path>", path);
- if (chmod_path(path[8], argv[++i]))
- die("git-update-index: %s cannot chmod %s", path, argv[i]);
+ set_executable_bit = path[8];
continue;
}
if (!strcmp(path, "--assume-unchanged")) {
continue;
}
if (!strcmp(path, "--assume-unchanged")) {
@@
-701,7
+711,8
@@
int main(int argc, const char **argv)
break;
}
if (!strcmp(path, "--unresolve")) {
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 (has_errors)
active_cache_changed = 0;
goto finish;
@@
-719,12
+730,15
@@
int main(int argc, const char **argv)
die("unknown option %s", path);
}
update_one(path, prefix, prefix_length);
die("unknown option %s", path);
}
update_one(path, prefix, prefix_length);
+ if (set_executable_bit)
+ chmod_path(set_executable_bit, path);
}
if (read_from_stdin) {
struct strbuf buf;
strbuf_init(&buf);
while (1) {
char *path_name;
}
if (read_from_stdin) {
struct strbuf buf;
strbuf_init(&buf);
while (1) {
char *path_name;
+ const char *p;
read_line(&buf, stdin, line_termination);
if (buf.eof)
break;
read_line(&buf, stdin, line_termination);
if (buf.eof)
break;
@@
-732,7
+746,12
@@
int main(int argc, const char **argv)
path_name = unquote_c_style(buf.buf, NULL);
else
path_name = buf.buf;
path_name = unquote_c_style(buf.buf, NULL);
else
path_name = buf.buf;
- update_one(path_name, prefix, prefix_length);
+ 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);
}
if (path_name != buf.buf)
free(path_name);
}