projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-svn: don't allow commit if svn tree is not current
[git.git]
/
checkout-index.c
diff --git
a/checkout-index.c
b/checkout-index.c
index
dd6a2d8
..
ea40bc2
100644
(file)
--- a/
checkout-index.c
+++ b/
checkout-index.c
@@
-39,6
+39,7
@@
#include "cache.h"
#include "strbuf.h"
#include "quote.h"
#include "cache.h"
#include "strbuf.h"
#include "quote.h"
+#include "cache-tree.h"
#define CHECKOUT_ALL 4
static const char *prefix;
#define CHECKOUT_ALL 4
static const char *prefix;
@@
-167,7
+168,7
@@
static int checkout_all(void)
static const char checkout_cache_usage[] =
"git-checkout-index [-u] [-q] [-a] [-f] [-n] [--stage=[123]|all] [--prefix=<string>] [--temp] [--] <file>...";
static const char checkout_cache_usage[] =
"git-checkout-index [-u] [-q] [-a] [-f] [-n] [--stage=[123]|all] [--prefix=<string>] [--temp] [--] <file>...";
-static struct
cache_file cache
_file;
+static struct
lock_file lock
_file;
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
@@
-210,9
+211,8
@@
int main(int argc, char **argv)
if (!strcmp(arg, "-u") || !strcmp(arg, "--index")) {
state.refresh_cache = 1;
if (newfd < 0)
if (!strcmp(arg, "-u") || !strcmp(arg, "--index")) {
state.refresh_cache = 1;
if (newfd < 0)
- newfd = hold_index_file_for_update
- (&cache_file,
- get_index_file());
+ newfd = hold_lock_file_for_update
+ (&lock_file, get_index_file());
if (newfd < 0)
die("cannot open index.lock file.");
continue;
if (newfd < 0)
die("cannot open index.lock file.");
continue;
@@
-261,7
+261,7
@@
int main(int argc, char **argv)
*/
if (state.refresh_cache) {
close(newfd); newfd = -1;
*/
if (state.refresh_cache) {
close(newfd); newfd = -1;
- rollback_
index_file(&cache
_file);
+ rollback_
lock_file(&lock
_file);
}
state.refresh_cache = 0;
}
}
state.refresh_cache = 0;
}
@@
-269,12
+269,16
@@
int main(int argc, char **argv)
/* Check out named files first */
for ( ; i < argc; i++) {
const char *arg = argv[i];
/* 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");
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 || p > arg + strlen(arg))
+ free((char*)p);
}
if (read_from_stdin) {
}
if (read_from_stdin) {
@@
-284,6
+288,8
@@
int main(int argc, char **argv)
strbuf_init(&buf);
while (1) {
char *path_name;
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;
@@
-291,7
+297,10
@@
int main(int argc, 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;
- checkout_file(prefix_path(prefix, prefix_length, path_name));
+ p = prefix_path(prefix, prefix_length, path_name);
+ checkout_file(p);
+ if (p < path_name || p > path_name + strlen(path_name))
+ free((char *)p);
if (path_name != buf.buf)
free(path_name);
}
if (path_name != buf.buf)
free(path_name);
}
@@
-302,7
+311,7
@@
int main(int argc, char **argv)
if (0 <= newfd &&
(write_cache(newfd, active_cache, active_nr) ||
if (0 <= newfd &&
(write_cache(newfd, active_cache, active_nr) ||
- commit_
index_file(&cache
_file)))
- die("Unable to write new
cache
file");
+ commit_
lock_file(&lock
_file)))
+ die("Unable to write new
index
file");
return 0;
}
return 0;
}