diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-03-06 21:25:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-06 21:25:33 -0800 |
| commit | 7a4e06c42a1e06f43f90b302cad09f31ec438ff1 (patch) | |
| tree | 59552439230232daa74fa3f58a3a2a099f206bbf /builtin/ls-files.c | |
| parent | Merge branch 'gc/stash-on-branch-with-multi-level-name' (diff) | |
| parent | ls-files: support --recurse-submodules --stage (diff) | |
| download | git-7a4e06c42a1e06f43f90b302cad09f31ec438ff1.tar.gz git-7a4e06c42a1e06f43f90b302cad09f31ec438ff1.zip | |
Merge branch 'jt/ls-files-stage-recurse'
Many output modes of "ls-files" do not work with its
"--recurse-submodules" option, but the "-s" mode has been taught to
work with it.
* jt/ls-files-stage-recurse:
ls-files: support --recurse-submodules --stage
Diffstat (limited to 'builtin/ls-files.c')
| -rw-r--r-- | builtin/ls-files.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c index f7ea56cc63..e791b65e7e 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -244,7 +244,7 @@ static void show_ce(struct repository *repo, struct dir_struct *dir, printf("%s%06o %s %d\t", tag, ce->ce_mode, - find_unique_abbrev(&ce->oid, abbrev), + repo_find_unique_abbrev(repo, &ce->oid, abbrev), ce_stage(ce)); } write_eolinfo(repo->index, ce, fullname); @@ -726,7 +726,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) setup_work_tree(); if (recurse_submodules && - (show_stage || show_deleted || show_others || show_unmerged || + (show_deleted || show_others || show_unmerged || show_killed || show_modified || show_resolve_undo || with_tree)) die("ls-files --recurse-submodules unsupported mode"); |