2005-04-10 00:53:05 +08:00
|
|
|
/*
|
|
|
|
|
* Check-out files from the "current cache directory"
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 2005 Linus Torvalds
|
|
|
|
|
*
|
|
|
|
|
*/
|
2007-07-15 07:14:45 +08:00
|
|
|
#include "builtin.h"
|
2014-10-01 18:28:42 +08:00
|
|
|
#include "lockfile.h"
|
2006-03-01 10:43:33 +08:00
|
|
|
#include "quote.h"
|
2006-04-25 12:18:58 +08:00
|
|
|
#include "cache-tree.h"
|
2008-10-18 09:17:23 +08:00
|
|
|
#include "parse-options.h"
|
2005-04-10 00:53:05 +08:00
|
|
|
|
2006-03-05 16:24:15 +08:00
|
|
|
#define CHECKOUT_ALL 4
|
|
|
|
|
static int line_termination = '\n';
|
2005-12-07 16:29:51 +08:00
|
|
|
static int checkout_stage; /* default to checkout stage0 */
|
2006-03-05 16:24:15 +08:00
|
|
|
static int to_tempfile;
|
2013-10-24 01:52:42 +08:00
|
|
|
static char topath[4][TEMPORARY_FILENAME_LENGTH + 1];
|
2005-11-26 16:22:48 +08:00
|
|
|
|
2006-07-09 02:34:02 +08:00
|
|
|
static struct checkout state;
|
2005-04-10 00:53:05 +08:00
|
|
|
|
checkout-index: fix --temp relative path mangling
checkout-index --temp only properly prints relative paths which are
descendants of the current directory. Paths in ancestor or sibling
directories (or their children) are often printed in mangled form. For
example:
mkdir a bbb &&
>file &&
>bbb/file &&
git update-index --add file bbb/file &&
cd a &&
git checkout-index --temp ../file ../bbb/file
prints:
.merge_file_ooblek le
.merge_file_igloo0 b/file
rather than the correct:
.merge_file_ooblek ../file
.merge_file_igloo0 ../bbb/file
Internally, given the above example, checkout-index prefixes each input
argument with the name of the current directory ("a/", in this case),
and then assumes that it can simply skip forward by strlen("a/") bytes
to recover the original name. This works for files in the current
directory or its descendants, but fails for files in ancestors or
siblings (or their children) due to path normalization.
For instance, given "../file", "a/" is prepended, giving "a/../file".
Path normalization folds out "a/../", resulting in "file". Attempting
to recover the original name by skipping strlen("a/") bytes gives the
incorrect "le" rather than the desired "../file".
Fix this by taking advantage of write_name_quoted_relative() to recover
the original name properly, rather than assuming that it can be
recovered by skipping strlen(prefix) bytes.
As a bonus, this also fixes a bug in which checkout-index --temp
accessed and printed memory beyond the end-of-string. For instance,
within a subdirectory named "subdirectory", and given argument
"../file", prefixing would give "subdirectory/../file", which would
become "file" after normalization. checkout-index would then attempt to
recover the original name by skipping strlen("subdirectory/") bytes of
"file", which placed it well beyond end-of-string. Despite this error,
it often appeared to give the correct result, but only due to an
accident of implementation which left an apparently correct copy of the
path in memory following the normalized value. In particular, handed
"subdirectory/../file", in-place processing by normalize_path_copy_len()
resulted in "file\0rectory/../file". When checkout-index skipped
strlen("subdirectory/") bytes, it ended up back at "../file" and thus
appeared to give the correct answer, despite being past end-of-string.
Reported-by: Russ Cox <rsc@golang.org>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-12-24 17:43:16 +08:00
|
|
|
static void write_tempfile_record(const char *name, const char *prefix)
|
2006-03-05 16:24:15 +08:00
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (CHECKOUT_ALL == checkout_stage) {
|
|
|
|
|
for (i = 1; i < 4; i++) {
|
|
|
|
|
if (i > 1)
|
|
|
|
|
putchar(' ');
|
|
|
|
|
if (topath[i][0])
|
|
|
|
|
fputs(topath[i], stdout);
|
|
|
|
|
else
|
|
|
|
|
putchar('.');
|
|
|
|
|
}
|
|
|
|
|
} else
|
|
|
|
|
fputs(topath[checkout_stage], stdout);
|
|
|
|
|
|
|
|
|
|
putchar('\t');
|
checkout-index: fix --temp relative path mangling
checkout-index --temp only properly prints relative paths which are
descendants of the current directory. Paths in ancestor or sibling
directories (or their children) are often printed in mangled form. For
example:
mkdir a bbb &&
>file &&
>bbb/file &&
git update-index --add file bbb/file &&
cd a &&
git checkout-index --temp ../file ../bbb/file
prints:
.merge_file_ooblek le
.merge_file_igloo0 b/file
rather than the correct:
.merge_file_ooblek ../file
.merge_file_igloo0 ../bbb/file
Internally, given the above example, checkout-index prefixes each input
argument with the name of the current directory ("a/", in this case),
and then assumes that it can simply skip forward by strlen("a/") bytes
to recover the original name. This works for files in the current
directory or its descendants, but fails for files in ancestors or
siblings (or their children) due to path normalization.
For instance, given "../file", "a/" is prepended, giving "a/../file".
Path normalization folds out "a/../", resulting in "file". Attempting
to recover the original name by skipping strlen("a/") bytes gives the
incorrect "le" rather than the desired "../file".
Fix this by taking advantage of write_name_quoted_relative() to recover
the original name properly, rather than assuming that it can be
recovered by skipping strlen(prefix) bytes.
As a bonus, this also fixes a bug in which checkout-index --temp
accessed and printed memory beyond the end-of-string. For instance,
within a subdirectory named "subdirectory", and given argument
"../file", prefixing would give "subdirectory/../file", which would
become "file" after normalization. checkout-index would then attempt to
recover the original name by skipping strlen("subdirectory/") bytes of
"file", which placed it well beyond end-of-string. Despite this error,
it often appeared to give the correct result, but only due to an
accident of implementation which left an apparently correct copy of the
path in memory following the normalized value. In particular, handed
"subdirectory/../file", in-place processing by normalize_path_copy_len()
resulted in "file\0rectory/../file". When checkout-index skipped
strlen("subdirectory/") bytes, it ended up back at "../file" and thus
appeared to give the correct answer, despite being past end-of-string.
Reported-by: Russ Cox <rsc@golang.org>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-12-24 17:43:16 +08:00
|
|
|
write_name_quoted_relative(name, prefix, stdout, line_termination);
|
2006-03-05 16:24:15 +08:00
|
|
|
|
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
|
topath[i][0] = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
checkout-index: fix --temp relative path mangling
checkout-index --temp only properly prints relative paths which are
descendants of the current directory. Paths in ancestor or sibling
directories (or their children) are often printed in mangled form. For
example:
mkdir a bbb &&
>file &&
>bbb/file &&
git update-index --add file bbb/file &&
cd a &&
git checkout-index --temp ../file ../bbb/file
prints:
.merge_file_ooblek le
.merge_file_igloo0 b/file
rather than the correct:
.merge_file_ooblek ../file
.merge_file_igloo0 ../bbb/file
Internally, given the above example, checkout-index prefixes each input
argument with the name of the current directory ("a/", in this case),
and then assumes that it can simply skip forward by strlen("a/") bytes
to recover the original name. This works for files in the current
directory or its descendants, but fails for files in ancestors or
siblings (or their children) due to path normalization.
For instance, given "../file", "a/" is prepended, giving "a/../file".
Path normalization folds out "a/../", resulting in "file". Attempting
to recover the original name by skipping strlen("a/") bytes gives the
incorrect "le" rather than the desired "../file".
Fix this by taking advantage of write_name_quoted_relative() to recover
the original name properly, rather than assuming that it can be
recovered by skipping strlen(prefix) bytes.
As a bonus, this also fixes a bug in which checkout-index --temp
accessed and printed memory beyond the end-of-string. For instance,
within a subdirectory named "subdirectory", and given argument
"../file", prefixing would give "subdirectory/../file", which would
become "file" after normalization. checkout-index would then attempt to
recover the original name by skipping strlen("subdirectory/") bytes of
"file", which placed it well beyond end-of-string. Despite this error,
it often appeared to give the correct result, but only due to an
accident of implementation which left an apparently correct copy of the
path in memory following the normalized value. In particular, handed
"subdirectory/../file", in-place processing by normalize_path_copy_len()
resulted in "file\0rectory/../file". When checkout-index skipped
strlen("subdirectory/") bytes, it ended up back at "../file" and thus
appeared to give the correct answer, despite being past end-of-string.
Reported-by: Russ Cox <rsc@golang.org>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-12-24 17:43:16 +08:00
|
|
|
static int checkout_file(const char *name, const char *prefix)
|
2005-04-10 00:53:05 +08:00
|
|
|
{
|
2005-12-07 16:29:51 +08:00
|
|
|
int namelen = strlen(name);
|
|
|
|
|
int pos = cache_name_pos(name, namelen);
|
|
|
|
|
int has_same_name = 0;
|
2006-03-05 16:24:15 +08:00
|
|
|
int did_checkout = 0;
|
|
|
|
|
int errs = 0;
|
2005-12-07 16:29:51 +08:00
|
|
|
|
|
|
|
|
if (pos < 0)
|
|
|
|
|
pos = -pos - 1;
|
|
|
|
|
|
|
|
|
|
while (pos < active_nr) {
|
|
|
|
|
struct cache_entry *ce = active_cache[pos];
|
2005-12-14 13:39:56 +08:00
|
|
|
if (ce_namelen(ce) != namelen ||
|
2005-12-07 16:29:51 +08:00
|
|
|
memcmp(ce->name, name, namelen))
|
|
|
|
|
break;
|
|
|
|
|
has_same_name = 1;
|
|
|
|
|
pos++;
|
2006-03-05 16:24:15 +08:00
|
|
|
if (ce_stage(ce) != checkout_stage
|
|
|
|
|
&& (CHECKOUT_ALL != checkout_stage || !ce_stage(ce)))
|
|
|
|
|
continue;
|
|
|
|
|
did_checkout = 1;
|
|
|
|
|
if (checkout_entry(ce, &state,
|
|
|
|
|
to_tempfile ? topath[ce_stage(ce)] : NULL) < 0)
|
|
|
|
|
errs++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (did_checkout) {
|
|
|
|
|
if (to_tempfile)
|
checkout-index: fix --temp relative path mangling
checkout-index --temp only properly prints relative paths which are
descendants of the current directory. Paths in ancestor or sibling
directories (or their children) are often printed in mangled form. For
example:
mkdir a bbb &&
>file &&
>bbb/file &&
git update-index --add file bbb/file &&
cd a &&
git checkout-index --temp ../file ../bbb/file
prints:
.merge_file_ooblek le
.merge_file_igloo0 b/file
rather than the correct:
.merge_file_ooblek ../file
.merge_file_igloo0 ../bbb/file
Internally, given the above example, checkout-index prefixes each input
argument with the name of the current directory ("a/", in this case),
and then assumes that it can simply skip forward by strlen("a/") bytes
to recover the original name. This works for files in the current
directory or its descendants, but fails for files in ancestors or
siblings (or their children) due to path normalization.
For instance, given "../file", "a/" is prepended, giving "a/../file".
Path normalization folds out "a/../", resulting in "file". Attempting
to recover the original name by skipping strlen("a/") bytes gives the
incorrect "le" rather than the desired "../file".
Fix this by taking advantage of write_name_quoted_relative() to recover
the original name properly, rather than assuming that it can be
recovered by skipping strlen(prefix) bytes.
As a bonus, this also fixes a bug in which checkout-index --temp
accessed and printed memory beyond the end-of-string. For instance,
within a subdirectory named "subdirectory", and given argument
"../file", prefixing would give "subdirectory/../file", which would
become "file" after normalization. checkout-index would then attempt to
recover the original name by skipping strlen("subdirectory/") bytes of
"file", which placed it well beyond end-of-string. Despite this error,
it often appeared to give the correct result, but only due to an
accident of implementation which left an apparently correct copy of the
path in memory following the normalized value. In particular, handed
"subdirectory/../file", in-place processing by normalize_path_copy_len()
resulted in "file\0rectory/../file". When checkout-index skipped
strlen("subdirectory/") bytes, it ended up back at "../file" and thus
appeared to give the correct answer, despite being past end-of-string.
Reported-by: Russ Cox <rsc@golang.org>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-12-24 17:43:16 +08:00
|
|
|
write_tempfile_record(name, prefix);
|
2006-03-05 16:24:15 +08:00
|
|
|
return errs > 0 ? -1 : 0;
|
2005-04-10 00:53:05 +08:00
|
|
|
}
|
2005-12-07 16:29:51 +08:00
|
|
|
|
|
|
|
|
if (!state.quiet) {
|
2008-09-09 18:28:30 +08:00
|
|
|
fprintf(stderr, "git checkout-index: %s ", name);
|
2005-12-07 16:29:51 +08:00
|
|
|
if (!has_same_name)
|
|
|
|
|
fprintf(stderr, "is not in the cache");
|
|
|
|
|
else if (checkout_stage)
|
|
|
|
|
fprintf(stderr, "does not exist at stage %d",
|
|
|
|
|
checkout_stage);
|
|
|
|
|
else
|
|
|
|
|
fprintf(stderr, "is unmerged");
|
|
|
|
|
fputc('\n', stderr);
|
|
|
|
|
}
|
|
|
|
|
return -1;
|
2005-04-10 00:53:05 +08:00
|
|
|
}
|
|
|
|
|
|
2006-08-15 04:20:12 +08:00
|
|
|
static void checkout_all(const char *prefix, int prefix_length)
|
2005-04-10 00:53:05 +08:00
|
|
|
{
|
2005-10-04 03:44:48 +08:00
|
|
|
int i, errs = 0;
|
2009-05-01 17:06:36 +08:00
|
|
|
struct cache_entry *last_ce = NULL;
|
2005-04-10 00:53:05 +08:00
|
|
|
|
|
|
|
|
for (i = 0; i < active_nr ; i++) {
|
|
|
|
|
struct cache_entry *ce = active_cache[i];
|
2006-03-05 16:24:15 +08:00
|
|
|
if (ce_stage(ce) != checkout_stage
|
|
|
|
|
&& (CHECKOUT_ALL != checkout_stage || !ce_stage(ce)))
|
2005-04-18 09:39:14 +08:00
|
|
|
continue;
|
2005-11-26 16:22:48 +08:00
|
|
|
if (prefix && *prefix &&
|
2005-12-07 16:29:51 +08:00
|
|
|
(ce_namelen(ce) <= prefix_length ||
|
|
|
|
|
memcmp(prefix, ce->name, prefix_length)))
|
2005-11-26 16:22:48 +08:00
|
|
|
continue;
|
2006-03-05 16:24:15 +08:00
|
|
|
if (last_ce && to_tempfile) {
|
|
|
|
|
if (ce_namelen(last_ce) != ce_namelen(ce)
|
|
|
|
|
|| memcmp(last_ce->name, ce->name, ce_namelen(ce)))
|
checkout-index: fix --temp relative path mangling
checkout-index --temp only properly prints relative paths which are
descendants of the current directory. Paths in ancestor or sibling
directories (or their children) are often printed in mangled form. For
example:
mkdir a bbb &&
>file &&
>bbb/file &&
git update-index --add file bbb/file &&
cd a &&
git checkout-index --temp ../file ../bbb/file
prints:
.merge_file_ooblek le
.merge_file_igloo0 b/file
rather than the correct:
.merge_file_ooblek ../file
.merge_file_igloo0 ../bbb/file
Internally, given the above example, checkout-index prefixes each input
argument with the name of the current directory ("a/", in this case),
and then assumes that it can simply skip forward by strlen("a/") bytes
to recover the original name. This works for files in the current
directory or its descendants, but fails for files in ancestors or
siblings (or their children) due to path normalization.
For instance, given "../file", "a/" is prepended, giving "a/../file".
Path normalization folds out "a/../", resulting in "file". Attempting
to recover the original name by skipping strlen("a/") bytes gives the
incorrect "le" rather than the desired "../file".
Fix this by taking advantage of write_name_quoted_relative() to recover
the original name properly, rather than assuming that it can be
recovered by skipping strlen(prefix) bytes.
As a bonus, this also fixes a bug in which checkout-index --temp
accessed and printed memory beyond the end-of-string. For instance,
within a subdirectory named "subdirectory", and given argument
"../file", prefixing would give "subdirectory/../file", which would
become "file" after normalization. checkout-index would then attempt to
recover the original name by skipping strlen("subdirectory/") bytes of
"file", which placed it well beyond end-of-string. Despite this error,
it often appeared to give the correct result, but only due to an
accident of implementation which left an apparently correct copy of the
path in memory following the normalized value. In particular, handed
"subdirectory/../file", in-place processing by normalize_path_copy_len()
resulted in "file\0rectory/../file". When checkout-index skipped
strlen("subdirectory/") bytes, it ended up back at "../file" and thus
appeared to give the correct answer, despite being past end-of-string.
Reported-by: Russ Cox <rsc@golang.org>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-12-24 17:43:16 +08:00
|
|
|
write_tempfile_record(last_ce->name, prefix);
|
2006-03-05 16:24:15 +08:00
|
|
|
}
|
|
|
|
|
if (checkout_entry(ce, &state,
|
|
|
|
|
to_tempfile ? topath[ce_stage(ce)] : NULL) < 0)
|
2005-10-04 03:44:48 +08:00
|
|
|
errs++;
|
2006-03-05 16:24:15 +08:00
|
|
|
last_ce = ce;
|
2005-04-10 00:53:05 +08:00
|
|
|
}
|
2006-03-05 16:24:15 +08:00
|
|
|
if (last_ce && to_tempfile)
|
checkout-index: fix --temp relative path mangling
checkout-index --temp only properly prints relative paths which are
descendants of the current directory. Paths in ancestor or sibling
directories (or their children) are often printed in mangled form. For
example:
mkdir a bbb &&
>file &&
>bbb/file &&
git update-index --add file bbb/file &&
cd a &&
git checkout-index --temp ../file ../bbb/file
prints:
.merge_file_ooblek le
.merge_file_igloo0 b/file
rather than the correct:
.merge_file_ooblek ../file
.merge_file_igloo0 ../bbb/file
Internally, given the above example, checkout-index prefixes each input
argument with the name of the current directory ("a/", in this case),
and then assumes that it can simply skip forward by strlen("a/") bytes
to recover the original name. This works for files in the current
directory or its descendants, but fails for files in ancestors or
siblings (or their children) due to path normalization.
For instance, given "../file", "a/" is prepended, giving "a/../file".
Path normalization folds out "a/../", resulting in "file". Attempting
to recover the original name by skipping strlen("a/") bytes gives the
incorrect "le" rather than the desired "../file".
Fix this by taking advantage of write_name_quoted_relative() to recover
the original name properly, rather than assuming that it can be
recovered by skipping strlen(prefix) bytes.
As a bonus, this also fixes a bug in which checkout-index --temp
accessed and printed memory beyond the end-of-string. For instance,
within a subdirectory named "subdirectory", and given argument
"../file", prefixing would give "subdirectory/../file", which would
become "file" after normalization. checkout-index would then attempt to
recover the original name by skipping strlen("subdirectory/") bytes of
"file", which placed it well beyond end-of-string. Despite this error,
it often appeared to give the correct result, but only due to an
accident of implementation which left an apparently correct copy of the
path in memory following the normalized value. In particular, handed
"subdirectory/../file", in-place processing by normalize_path_copy_len()
resulted in "file\0rectory/../file". When checkout-index skipped
strlen("subdirectory/") bytes, it ended up back at "../file" and thus
appeared to give the correct answer, despite being past end-of-string.
Reported-by: Russ Cox <rsc@golang.org>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-12-24 17:43:16 +08:00
|
|
|
write_tempfile_record(last_ce->name, prefix);
|
2005-10-04 03:44:48 +08:00
|
|
|
if (errs)
|
|
|
|
|
/* we have already done our error reporting.
|
|
|
|
|
* exit with the same code as die().
|
|
|
|
|
*/
|
|
|
|
|
exit(128);
|
2005-04-10 00:53:05 +08:00
|
|
|
}
|
|
|
|
|
|
2008-10-18 09:17:23 +08:00
|
|
|
static const char * const builtin_checkout_index_usage[] = {
|
2015-01-13 15:44:47 +08:00
|
|
|
N_("git checkout-index [<options>] [--] [<file>...]"),
|
2008-10-18 09:17:23 +08:00
|
|
|
NULL
|
|
|
|
|
};
|
2005-07-14 11:25:07 +08:00
|
|
|
|
2006-06-07 03:51:49 +08:00
|
|
|
static struct lock_file lock_file;
|
2005-08-13 23:29:32 +08:00
|
|
|
|
2008-10-18 09:17:23 +08:00
|
|
|
static int option_parse_u(const struct option *opt,
|
|
|
|
|
const char *arg, int unset)
|
|
|
|
|
{
|
|
|
|
|
int *newfd = opt->value;
|
|
|
|
|
|
|
|
|
|
state.refresh_cache = 1;
|
2014-06-13 20:19:34 +08:00
|
|
|
state.istate = &the_index;
|
2008-10-18 09:17:23 +08:00
|
|
|
if (*newfd < 0)
|
|
|
|
|
*newfd = hold_locked_index(&lock_file, 1);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int option_parse_z(const struct option *opt,
|
|
|
|
|
const char *arg, int unset)
|
|
|
|
|
{
|
|
|
|
|
if (unset)
|
|
|
|
|
line_termination = '\n';
|
|
|
|
|
else
|
|
|
|
|
line_termination = 0;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int option_parse_prefix(const struct option *opt,
|
|
|
|
|
const char *arg, int unset)
|
|
|
|
|
{
|
|
|
|
|
state.base_dir = arg;
|
|
|
|
|
state.base_dir_len = strlen(arg);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int option_parse_stage(const struct option *opt,
|
|
|
|
|
const char *arg, int unset)
|
|
|
|
|
{
|
|
|
|
|
if (!strcmp(arg, "all")) {
|
|
|
|
|
to_tempfile = 1;
|
|
|
|
|
checkout_stage = CHECKOUT_ALL;
|
|
|
|
|
} else {
|
|
|
|
|
int ch = arg[0];
|
|
|
|
|
if ('1' <= ch && ch <= '3')
|
|
|
|
|
checkout_stage = arg[0] - '0';
|
|
|
|
|
else
|
|
|
|
|
die("stage should be between 1 and 3 or all");
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2006-08-04 16:23:19 +08:00
|
|
|
int cmd_checkout_index(int argc, const char **argv, const char *prefix)
|
2005-04-10 00:53:05 +08:00
|
|
|
{
|
2005-10-18 08:32:12 +08:00
|
|
|
int i;
|
2005-05-16 05:23:12 +08:00
|
|
|
int newfd = -1;
|
2005-10-18 08:32:12 +08:00
|
|
|
int all = 0;
|
2006-03-01 10:43:33 +08:00
|
|
|
int read_from_stdin = 0;
|
2006-08-04 16:23:19 +08:00
|
|
|
int prefix_length;
|
2008-10-18 09:17:23 +08:00
|
|
|
int force = 0, quiet = 0, not_new = 0;
|
|
|
|
|
struct option builtin_checkout_index_options[] = {
|
2013-08-03 19:51:19 +08:00
|
|
|
OPT_BOOL('a', "all", &all,
|
2012-08-20 20:32:55 +08:00
|
|
|
N_("check out all files in the index")),
|
|
|
|
|
OPT__FORCE(&force, N_("force overwrite of existing files")),
|
2010-11-09 03:54:48 +08:00
|
|
|
OPT__QUIET(&quiet,
|
2012-08-20 20:31:58 +08:00
|
|
|
N_("no warning for existing files and files not in index")),
|
2013-08-03 19:51:25 +08:00
|
|
|
OPT_BOOL('n', "no-create", ¬_new,
|
2012-08-20 20:31:58 +08:00
|
|
|
N_("don't checkout new files")),
|
2008-10-18 09:17:23 +08:00
|
|
|
{ OPTION_CALLBACK, 'u', "index", &newfd, NULL,
|
2012-08-20 20:31:58 +08:00
|
|
|
N_("update stat information in the index file"),
|
2008-10-18 09:17:23 +08:00
|
|
|
PARSE_OPT_NOARG, option_parse_u },
|
|
|
|
|
{ OPTION_CALLBACK, 'z', NULL, NULL, NULL,
|
2012-08-20 20:31:58 +08:00
|
|
|
N_("paths are separated with NUL character"),
|
2008-10-18 09:17:23 +08:00
|
|
|
PARSE_OPT_NOARG, option_parse_z },
|
2013-08-03 19:51:19 +08:00
|
|
|
OPT_BOOL(0, "stdin", &read_from_stdin,
|
2012-08-20 20:31:58 +08:00
|
|
|
N_("read list of paths from the standard input")),
|
2013-08-03 19:51:19 +08:00
|
|
|
OPT_BOOL(0, "temp", &to_tempfile,
|
2012-08-20 20:31:58 +08:00
|
|
|
N_("write the content to temporary files")),
|
|
|
|
|
OPT_CALLBACK(0, "prefix", NULL, N_("string"),
|
|
|
|
|
N_("when creating files, prepend <string>"),
|
2008-10-18 09:17:23 +08:00
|
|
|
option_parse_prefix),
|
|
|
|
|
OPT_CALLBACK(0, "stage", NULL, NULL,
|
2012-08-20 20:31:58 +08:00
|
|
|
N_("copy out the files from named stage"),
|
2008-10-18 09:17:23 +08:00
|
|
|
option_parse_stage),
|
|
|
|
|
OPT_END()
|
|
|
|
|
};
|
2005-04-10 00:53:05 +08:00
|
|
|
|
2010-10-22 14:44:01 +08:00
|
|
|
if (argc == 2 && !strcmp(argv[1], "-h"))
|
|
|
|
|
usage_with_options(builtin_checkout_index_usage,
|
|
|
|
|
builtin_checkout_index_options);
|
2008-05-15 01:46:53 +08:00
|
|
|
git_config(git_default_config, NULL);
|
2006-08-04 16:23:19 +08:00
|
|
|
state.base_dir = "";
|
2005-11-26 16:22:48 +08:00
|
|
|
prefix_length = prefix ? strlen(prefix) : 0;
|
|
|
|
|
|
2005-04-10 00:53:05 +08:00
|
|
|
if (read_cache() < 0) {
|
2005-04-13 17:28:48 +08:00
|
|
|
die("invalid cache");
|
2005-04-10 00:53:05 +08:00
|
|
|
}
|
|
|
|
|
|
2009-05-24 02:53:12 +08:00
|
|
|
argc = parse_options(argc, argv, prefix, builtin_checkout_index_options,
|
2008-10-18 09:17:23 +08:00
|
|
|
builtin_checkout_index_usage, 0);
|
|
|
|
|
state.force = force;
|
|
|
|
|
state.quiet = quiet;
|
|
|
|
|
state.not_new = not_new;
|
2005-10-18 08:32:12 +08:00
|
|
|
|
2006-03-05 16:24:15 +08:00
|
|
|
if (state.base_dir_len || to_tempfile) {
|
2005-10-18 08:32:12 +08:00
|
|
|
/* when --prefix is specified we do not
|
|
|
|
|
* want to update cache.
|
|
|
|
|
*/
|
|
|
|
|
if (state.refresh_cache) {
|
2006-06-07 03:51:49 +08:00
|
|
|
rollback_lock_file(&lock_file);
|
2008-01-17 03:12:46 +08:00
|
|
|
newfd = -1;
|
2005-10-18 08:32:12 +08:00
|
|
|
}
|
|
|
|
|
state.refresh_cache = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check out named files first */
|
2008-10-18 09:17:23 +08:00
|
|
|
for (i = 0; i < argc; i++) {
|
2005-10-18 08:32:12 +08:00
|
|
|
const char *arg = argv[i];
|
2015-05-05 03:11:54 +08:00
|
|
|
char *p;
|
2005-10-18 08:32:12 +08:00
|
|
|
|
|
|
|
|
if (all)
|
2008-09-01 00:39:19 +08:00
|
|
|
die("git checkout-index: don't mix '--all' and explicit filenames");
|
2006-03-01 10:43:33 +08:00
|
|
|
if (read_from_stdin)
|
2008-09-01 00:39:19 +08:00
|
|
|
die("git checkout-index: don't mix '--stdin' and explicit filenames");
|
2006-05-06 13:38:06 +08:00
|
|
|
p = prefix_path(prefix, prefix_length, arg);
|
checkout-index: fix --temp relative path mangling
checkout-index --temp only properly prints relative paths which are
descendants of the current directory. Paths in ancestor or sibling
directories (or their children) are often printed in mangled form. For
example:
mkdir a bbb &&
>file &&
>bbb/file &&
git update-index --add file bbb/file &&
cd a &&
git checkout-index --temp ../file ../bbb/file
prints:
.merge_file_ooblek le
.merge_file_igloo0 b/file
rather than the correct:
.merge_file_ooblek ../file
.merge_file_igloo0 ../bbb/file
Internally, given the above example, checkout-index prefixes each input
argument with the name of the current directory ("a/", in this case),
and then assumes that it can simply skip forward by strlen("a/") bytes
to recover the original name. This works for files in the current
directory or its descendants, but fails for files in ancestors or
siblings (or their children) due to path normalization.
For instance, given "../file", "a/" is prepended, giving "a/../file".
Path normalization folds out "a/../", resulting in "file". Attempting
to recover the original name by skipping strlen("a/") bytes gives the
incorrect "le" rather than the desired "../file".
Fix this by taking advantage of write_name_quoted_relative() to recover
the original name properly, rather than assuming that it can be
recovered by skipping strlen(prefix) bytes.
As a bonus, this also fixes a bug in which checkout-index --temp
accessed and printed memory beyond the end-of-string. For instance,
within a subdirectory named "subdirectory", and given argument
"../file", prefixing would give "subdirectory/../file", which would
become "file" after normalization. checkout-index would then attempt to
recover the original name by skipping strlen("subdirectory/") bytes of
"file", which placed it well beyond end-of-string. Despite this error,
it often appeared to give the correct result, but only due to an
accident of implementation which left an apparently correct copy of the
path in memory following the normalized value. In particular, handed
"subdirectory/../file", in-place processing by normalize_path_copy_len()
resulted in "file\0rectory/../file". When checkout-index skipped
strlen("subdirectory/") bytes, it ended up back at "../file" and thus
appeared to give the correct answer, despite being past end-of-string.
Reported-by: Russ Cox <rsc@golang.org>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-12-24 17:43:16 +08:00
|
|
|
checkout_file(p, prefix);
|
2015-05-05 03:11:54 +08:00
|
|
|
free(p);
|
2005-04-10 00:53:05 +08:00
|
|
|
}
|
2005-05-16 05:23:12 +08:00
|
|
|
|
2006-03-01 10:43:33 +08:00
|
|
|
if (read_from_stdin) {
|
2008-10-10 03:12:12 +08:00
|
|
|
struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
|
2007-09-20 06:42:14 +08:00
|
|
|
|
2006-03-01 10:43:33 +08:00
|
|
|
if (all)
|
2008-09-01 00:39:19 +08:00
|
|
|
die("git checkout-index: don't mix '--all' and '--stdin'");
|
2007-09-20 06:42:14 +08:00
|
|
|
|
|
|
|
|
while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
|
2015-05-05 03:11:54 +08:00
|
|
|
char *p;
|
2007-09-20 06:42:14 +08:00
|
|
|
if (line_termination && buf.buf[0] == '"') {
|
|
|
|
|
strbuf_reset(&nbuf);
|
|
|
|
|
if (unquote_c_style(&nbuf, buf.buf, NULL))
|
|
|
|
|
die("line is badly quoted");
|
|
|
|
|
strbuf_swap(&buf, &nbuf);
|
|
|
|
|
}
|
|
|
|
|
p = prefix_path(prefix, prefix_length, buf.buf);
|
checkout-index: fix --temp relative path mangling
checkout-index --temp only properly prints relative paths which are
descendants of the current directory. Paths in ancestor or sibling
directories (or their children) are often printed in mangled form. For
example:
mkdir a bbb &&
>file &&
>bbb/file &&
git update-index --add file bbb/file &&
cd a &&
git checkout-index --temp ../file ../bbb/file
prints:
.merge_file_ooblek le
.merge_file_igloo0 b/file
rather than the correct:
.merge_file_ooblek ../file
.merge_file_igloo0 ../bbb/file
Internally, given the above example, checkout-index prefixes each input
argument with the name of the current directory ("a/", in this case),
and then assumes that it can simply skip forward by strlen("a/") bytes
to recover the original name. This works for files in the current
directory or its descendants, but fails for files in ancestors or
siblings (or their children) due to path normalization.
For instance, given "../file", "a/" is prepended, giving "a/../file".
Path normalization folds out "a/../", resulting in "file". Attempting
to recover the original name by skipping strlen("a/") bytes gives the
incorrect "le" rather than the desired "../file".
Fix this by taking advantage of write_name_quoted_relative() to recover
the original name properly, rather than assuming that it can be
recovered by skipping strlen(prefix) bytes.
As a bonus, this also fixes a bug in which checkout-index --temp
accessed and printed memory beyond the end-of-string. For instance,
within a subdirectory named "subdirectory", and given argument
"../file", prefixing would give "subdirectory/../file", which would
become "file" after normalization. checkout-index would then attempt to
recover the original name by skipping strlen("subdirectory/") bytes of
"file", which placed it well beyond end-of-string. Despite this error,
it often appeared to give the correct result, but only due to an
accident of implementation which left an apparently correct copy of the
path in memory following the normalized value. In particular, handed
"subdirectory/../file", in-place processing by normalize_path_copy_len()
resulted in "file\0rectory/../file". When checkout-index skipped
strlen("subdirectory/") bytes, it ended up back at "../file" and thus
appeared to give the correct answer, despite being past end-of-string.
Reported-by: Russ Cox <rsc@golang.org>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-12-24 17:43:16 +08:00
|
|
|
checkout_file(p, prefix);
|
2015-05-05 03:11:54 +08:00
|
|
|
free(p);
|
2006-03-01 10:43:33 +08:00
|
|
|
}
|
2007-09-20 06:42:14 +08:00
|
|
|
strbuf_release(&nbuf);
|
2007-09-17 17:19:04 +08:00
|
|
|
strbuf_release(&buf);
|
2006-03-01 10:43:33 +08:00
|
|
|
}
|
|
|
|
|
|
2005-10-18 08:32:12 +08:00
|
|
|
if (all)
|
2006-08-04 16:23:19 +08:00
|
|
|
checkout_all(prefix, prefix_length);
|
2005-10-18 08:32:12 +08:00
|
|
|
|
2005-05-16 05:23:12 +08:00
|
|
|
if (0 <= newfd &&
|
2014-06-13 20:19:23 +08:00
|
|
|
write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
|
2006-06-07 03:51:49 +08:00
|
|
|
die("Unable to write new index file");
|
2005-04-10 00:53:05 +08:00
|
|
|
return 0;
|
|
|
|
|
}
|
