projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pack-objects: improve path grouping heuristics.
[git.git]
/
checkout-index.c
diff --git
a/checkout-index.c
b/checkout-index.c
index
7b78715
..
9876af6
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;
@@
-133,7
+134,7
@@
static int checkout_file(const char *name)
static int checkout_all(void)
{
int i, errs = 0;
static int checkout_all(void)
{
int i, errs = 0;
- struct cache_entry* last_ce =
0
;
+ struct cache_entry* last_ce =
NULL
;
for (i = 0; i < active_nr ; i++) {
struct cache_entry *ce = active_cache[i];
for (i = 0; i < active_nr ; i++) {
struct cache_entry *ce = active_cache[i];
@@
-269,12
+270,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
+289,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
+298,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);
}