mirror of
https://github.com/git/git.git
synced 2024-05-11 18:16:29 +02:00
Merge branch 'mt/checkout-index-corner-cases'
The error codepath around the "--temp/--prefix" feature of "git checkout-index" has been improved. * mt/checkout-index-corner-cases: checkout-index: omit entries with no tempname from --temp output write_entry(): fix misuses of `path` in error messages
This commit is contained in:
commit
3da165ca28
|
@ -23,22 +23,35 @@ static struct checkout state = CHECKOUT_INIT;
|
||||||
static void write_tempfile_record(const char *name, const char *prefix)
|
static void write_tempfile_record(const char *name, const char *prefix)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
int have_tempname = 0;
|
||||||
|
|
||||||
if (CHECKOUT_ALL == checkout_stage) {
|
if (CHECKOUT_ALL == checkout_stage) {
|
||||||
for (i = 1; i < 4; i++) {
|
for (i = 1; i < 4; i++)
|
||||||
if (i > 1)
|
if (topath[i][0]) {
|
||||||
putchar(' ');
|
have_tempname = 1;
|
||||||
if (topath[i][0])
|
break;
|
||||||
fputs(topath[i], stdout);
|
}
|
||||||
else
|
|
||||||
putchar('.');
|
|
||||||
}
|
|
||||||
} else
|
|
||||||
fputs(topath[checkout_stage], stdout);
|
|
||||||
|
|
||||||
putchar('\t');
|
if (have_tempname) {
|
||||||
write_name_quoted_relative(name, prefix, stdout,
|
for (i = 1; i < 4; i++) {
|
||||||
nul_term_line ? '\0' : '\n');
|
if (i > 1)
|
||||||
|
putchar(' ');
|
||||||
|
if (topath[i][0])
|
||||||
|
fputs(topath[i], stdout);
|
||||||
|
else
|
||||||
|
putchar('.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (topath[checkout_stage][0]) {
|
||||||
|
have_tempname = 1;
|
||||||
|
fputs(topath[checkout_stage], stdout);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (have_tempname) {
|
||||||
|
putchar('\t');
|
||||||
|
write_name_quoted_relative(name, prefix, stdout,
|
||||||
|
nul_term_line ? '\0' : '\n');
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < 4; i++) {
|
for (i = 0; i < 4; i++) {
|
||||||
topath[i][0] = 0;
|
topath[i][0] = 0;
|
||||||
|
|
8
entry.c
8
entry.c
|
@ -282,7 +282,7 @@ static int write_entry(struct cache_entry *ce,
|
||||||
new_blob = read_blob_entry(ce, &size);
|
new_blob = read_blob_entry(ce, &size);
|
||||||
if (!new_blob)
|
if (!new_blob)
|
||||||
return error("unable to read sha1 file of %s (%s)",
|
return error("unable to read sha1 file of %s (%s)",
|
||||||
path, oid_to_hex(&ce->oid));
|
ce->name, oid_to_hex(&ce->oid));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We can't make a real symlink; write out a regular file entry
|
* We can't make a real symlink; write out a regular file entry
|
||||||
|
@ -309,7 +309,7 @@ static int write_entry(struct cache_entry *ce,
|
||||||
new_blob = read_blob_entry(ce, &size);
|
new_blob = read_blob_entry(ce, &size);
|
||||||
if (!new_blob)
|
if (!new_blob)
|
||||||
return error("unable to read sha1 file of %s (%s)",
|
return error("unable to read sha1 file of %s (%s)",
|
||||||
path, oid_to_hex(&ce->oid));
|
ce->name, oid_to_hex(&ce->oid));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -354,7 +354,7 @@ static int write_entry(struct cache_entry *ce,
|
||||||
|
|
||||||
case S_IFGITLINK:
|
case S_IFGITLINK:
|
||||||
if (to_tempfile)
|
if (to_tempfile)
|
||||||
return error("cannot create temporary submodule %s", path);
|
return error("cannot create temporary submodule %s", ce->name);
|
||||||
if (mkdir(path, 0777) < 0)
|
if (mkdir(path, 0777) < 0)
|
||||||
return error("cannot create submodule directory %s", path);
|
return error("cannot create submodule directory %s", path);
|
||||||
sub = submodule_from_ce(ce);
|
sub = submodule_from_ce(ce);
|
||||||
|
@ -365,7 +365,7 @@ static int write_entry(struct cache_entry *ce,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return error("unknown file mode for %s in index", path);
|
return error("unknown file mode for %s in index", ce->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
finish:
|
finish:
|
||||||
|
|
|
@ -32,4 +32,27 @@ test_expect_success 'checkout-index reports errors (stdin)' '
|
||||||
test_i18ngrep not.in.the.cache stderr
|
test_i18ngrep not.in.the.cache stderr
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'checkout-index --temp correctly reports error on missing blobs' '
|
||||||
|
test_when_finished git reset --hard &&
|
||||||
|
missing_blob=$(echo "no such blob here" | git hash-object --stdin) &&
|
||||||
|
cat >objs <<-EOF &&
|
||||||
|
100644 $missing_blob file
|
||||||
|
120000 $missing_blob symlink
|
||||||
|
EOF
|
||||||
|
git update-index --index-info <objs &&
|
||||||
|
|
||||||
|
test_must_fail git checkout-index --temp symlink file 2>stderr &&
|
||||||
|
test_i18ngrep "unable to read sha1 file of file ($missing_blob)" stderr &&
|
||||||
|
test_i18ngrep "unable to read sha1 file of symlink ($missing_blob)" stderr
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'checkout-index --temp correctly reports error for submodules' '
|
||||||
|
git init sub &&
|
||||||
|
test_commit -C sub file &&
|
||||||
|
git submodule add ./sub &&
|
||||||
|
git commit -m sub &&
|
||||||
|
test_must_fail git checkout-index --temp sub 2>stderr &&
|
||||||
|
test_i18ngrep "cannot create temporary submodule sub" stderr
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in New Issue