mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Adjust to ls-tree --full-name when run from a subdirectory.
A proposed change to show cwd relative paths by default from ls-tree when run from a subdirectory means we would need to give --full-name option to it. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
commit
d0d14cf33d
|
@ -80,7 +80,7 @@ then
|
||||||
# from a specific tree-ish; note that this is for
|
# from a specific tree-ish; note that this is for
|
||||||
# rescuing paths and is never meant to remove what
|
# rescuing paths and is never meant to remove what
|
||||||
# is not in the named tree-ish.
|
# is not in the named tree-ish.
|
||||||
git-ls-tree -r "$new" "$@" |
|
git-ls-tree --full-name -r "$new" "$@" |
|
||||||
git-update-index --index-info || exit $?
|
git-update-index --index-info || exit $?
|
||||||
fi
|
fi
|
||||||
git-checkout-index -f -u -- "$@"
|
git-checkout-index -f -u -- "$@"
|
||||||
|
|
22
ls-tree.c
22
ls-tree.c
|
@ -15,9 +15,11 @@ static int line_termination = '\n';
|
||||||
#define LS_NAME_ONLY 8
|
#define LS_NAME_ONLY 8
|
||||||
static int ls_options = 0;
|
static int ls_options = 0;
|
||||||
const char **pathspec;
|
const char **pathspec;
|
||||||
|
static int chomp_prefix = 0;
|
||||||
|
static const char *prefix;
|
||||||
|
|
||||||
static const char ls_tree_usage[] =
|
static const char ls_tree_usage[] =
|
||||||
"git-ls-tree [-d] [-r] [-t] [-z] [--name-only] [--name-status] <tree-ish> [path...]";
|
"git-ls-tree [-d] [-r] [-t] [-z] [--name-only] [--name-status] [--full-name] <tree-ish> [path...]";
|
||||||
|
|
||||||
static int show_recursive(const char *base, int baselen, const char *pathname)
|
static int show_recursive(const char *base, int baselen, const char *pathname)
|
||||||
{
|
{
|
||||||
|
@ -49,7 +51,8 @@ static int show_recursive(const char *base, int baselen, const char *pathname)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int show_tree(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage)
|
static int show_tree(unsigned char *sha1, const char *base, int baselen,
|
||||||
|
const char *pathname, unsigned mode, int stage)
|
||||||
{
|
{
|
||||||
int retval = 0;
|
int retval = 0;
|
||||||
const char *type = "blob";
|
const char *type = "blob";
|
||||||
|
@ -65,21 +68,28 @@ static int show_tree(unsigned char *sha1, const char *base, int baselen, const c
|
||||||
else if (ls_options & LS_TREE_ONLY)
|
else if (ls_options & LS_TREE_ONLY)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
if (chomp_prefix &&
|
||||||
|
(baselen < chomp_prefix || memcmp(prefix, base, chomp_prefix)))
|
||||||
|
return 0;
|
||||||
|
|
||||||
if (!(ls_options & LS_NAME_ONLY))
|
if (!(ls_options & LS_NAME_ONLY))
|
||||||
printf("%06o %s %s\t", mode, type, sha1_to_hex(sha1));
|
printf("%06o %s %s\t", mode, type, sha1_to_hex(sha1));
|
||||||
write_name_quoted(base, baselen, pathname, line_termination, stdout);
|
write_name_quoted(base + chomp_prefix, baselen - chomp_prefix,
|
||||||
|
pathname,
|
||||||
|
line_termination, stdout);
|
||||||
putchar(line_termination);
|
putchar(line_termination);
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, const char **argv)
|
int main(int argc, const char **argv)
|
||||||
{
|
{
|
||||||
const char *prefix;
|
|
||||||
unsigned char sha1[20];
|
unsigned char sha1[20];
|
||||||
char *buf;
|
char *buf;
|
||||||
unsigned long size;
|
unsigned long size;
|
||||||
|
|
||||||
prefix = setup_git_directory();
|
prefix = setup_git_directory();
|
||||||
|
if (prefix && *prefix)
|
||||||
|
chomp_prefix = strlen(prefix);
|
||||||
while (1 < argc && argv[1][0] == '-') {
|
while (1 < argc && argv[1][0] == '-') {
|
||||||
switch (argv[1][1]) {
|
switch (argv[1][1]) {
|
||||||
case 'z':
|
case 'z':
|
||||||
|
@ -100,6 +110,10 @@ int main(int argc, const char **argv)
|
||||||
ls_options |= LS_NAME_ONLY;
|
ls_options |= LS_NAME_ONLY;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
if (!strcmp(argv[1]+2, "full-name")) {
|
||||||
|
chomp_prefix = 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
/* otherwise fallthru */
|
/* otherwise fallthru */
|
||||||
default:
|
default:
|
||||||
usage(ls_tree_usage);
|
usage(ls_tree_usage);
|
||||||
|
|
Loading…
Reference in a new issue