diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2022-04-13 14:51:53 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2022-04-13 14:51:53 +0800 |
| commit | 61de00a32115b6090891f20797fdfd1501709ab9 (patch) | |
| tree | e6a0290cef9e52589a8b78e55dbae3daf559e202 /builtin | |
| parent | dfbdf52df590cf8af37b193d9bf9f9a41162f3ae (diff) | |
| parent | 11cfe552610386954886543f5de87dcc49ad5735 (diff) | |
| download | git-61de00a32115b6090891f20797fdfd1501709ab9.tar.xz | |
Merge branch 'master' of github.com:git/git
* 'master' of github.com:git/git: (25 commits)
Git 2.36-rc2
i18n: fix some badly formatted i18n strings
Git 2.36-rc1
t9902: split test to run on appropriate systems
ls-tree doc: document interaction with submodules
Documentation: add --batch-command to cat-file synopsis
git-ls-tree.txt: fix the name of "%(objectsize:padded)"
submodule-helper: fix usage string
doc: replace "--" with {litdd} in credential-cache/fsmonitor
contrib/scalar: fix 'all' target in Makefile
Documentation/Makefile: fix "make info" regression in dad9cd7d518
configure.ac: fix HAVE_SYNC_FILE_RANGE definition
git-compat-util: really support openssl as a source of entropy
ls-tree: `-l` should not imply recursive listing
Git 2.35.2
Git 2.34.2
Git 2.33.2
Git 2.32.1
Git 2.31.2
Git 2.30.3
...
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/ls-tree.c | 2 | ||||
| -rw-r--r-- | builtin/submodule--helper.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index 5dac9ee5b9..e279be8bb6 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -255,7 +255,7 @@ static int show_tree_long(const struct object_id *oid, struct strbuf *base, printf("%06o %s %s %7s\t", data.mode, type_name(data.type), find_unique_abbrev(data.oid, abbrev), size_text); show_tree_common_default_long(base, pathname, data.base->len); - return 1; + return recurse; } static int show_tree_name_only(const struct object_id *oid, struct strbuf *base, diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index c3e0d4570f..2c87ef9364 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -1902,7 +1902,7 @@ static int module_clone(int argc, const char **argv, const char *prefix) const char *const git_submodule_helper_usage[] = { N_("git submodule--helper clone [--prefix=<path>] [--quiet] " "[--reference <repository>] [--name <name>] [--depth <depth>] " - "[--single-branch] [--filter <filter-spec>]" + "[--single-branch] [--filter <filter-spec>] " "--url <url> --path <path>"), NULL }; @@ -3082,7 +3082,7 @@ static int module_create_branch(int argc, const char **argv, const char *prefix) OPT_END() }; const char *const usage[] = { - N_("git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"), + N_("git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"), NULL }; |