git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 0/9] About the trailing slashes

From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date
Jan 24, 2014, 13:40 UTC
Message-ID
<1390570836-20394-1-git-send-email-pclouds@gmail.com>
In-Reply-To
<1390483326-32258-1-git-send-email-pclouds@gmail.com>
So this is the reroll that makes
  git diff HEAD submodule
  git diff HEAD submodule/
and
  git diff HEAD HEAD^ submodule
  git diff HEAD HEAD^ submodule/

behave the same way. The main patches are 04/09 and 09/09. The rest is just refactoring and cleaning up.

While looking at this, I found a funny behavior of fill_directory.
  $ git init
  $ mkdir b
  $ >b/c
  $ >b/d
  $ git status b
  Untracked files:
          b/
  $ git status b/
  Untracked files:
          b/c b/d

Notice how the trailing slash produces different untracked listing. This is because of common_prefix_len(). In the "b" case, common_prefix_len() returns empty prefix, so read_directory reads top directory, traverses through, reaches "b" and eventually calls treat_directory() on it, which results in "b/" in the output.

In the "b/" case, common_prefix_len() found the prefix "b", so read_directory() starts at "b" instead of b's parent. treat_directory() is never called on "b" itself, which results in "b/c" and "b/d".

I'm tempted to make it consistent, favoring "b/" output. But that involves extra lstat, or reordering the complex read_directory() code. This is probably very unusual case to pay attention to anyway.

Nguyễn Thái Ngọc Duy (9):
  Convert some match_pathspec_depth() to ce_path_match()
  Convert some match_pathspec_depth() to dir_path_match()
  Rename match_pathspec_depth() to match_pathspec()
  dir.c: prepare match_pathspec_item for taking more flags
  match_pathspec: match pathspec "foo/" against directory "foo"
  Pass directory indicator to match_pathspec_item()
  clean: replace match_pathspec() with dir_path_match()
  clean: use cache_name_is_other()
  tree-walk.c: ignore trailing slash on submodule in
    tree_entry_interesting()
 builtin/add.c             |  3 +--
 builtin/checkout.c        |  3 +--
 builtin/clean.c           | 24 +++---------------------
 builtin/commit.c          |  2 +-
 builtin/grep.c            |  6 ++----
 builtin/ls-files.c        |  9 ++++++---
 builtin/ls-tree.c         |  2 +-
 builtin/rm.c              |  2 +-
 builtin/update-index.c    |  3 ++-
 cache.h                   |  2 --
 diff-lib.c                |  5 +++--
 dir.c                     | 40 ++++++++++++++++++++++++++--------------
 dir.h                     | 24 +++++++++++++++++++++---
 pathspec.c                |  2 +-
 preload-index.c           |  3 ++-
 read-cache.c              |  8 +-------
 rerere.c                  |  4 ++--
 resolve-undo.c            |  2 +-
 revision.c                |  3 ++-
 t/t4010-diff-pathspec.sh  | 23 +++++++++++++++++++++++
 t/t6131-pathspec-icase.sh |  6 +++---
 tree-walk.c               |  2 +-
 wt-status.c               |  6 +++---
 23 files changed, 107 insertions(+), 77 deletions(-)
-- 
1.8.5.2.240.g8478abd
Previous: Duy NguyenNext: Nguyễn Thái Ngọc Duy
Message 10 of 24 in “problematic git log submodule-dir/”
  1. Paweł SikoraJan 20, 2014
  2. Jens LehmannJan 22, 2014
  3. Duy NguyenJan 22, 2014
  4. 1/2 tree-walk.c: ignore trailing slash on submodule in tree_entry_interesting()Nguyễn Thái Ngọc Duy, Jan 23, 2014
  5. 2/2 t4010: match_pathspec_depth() and trailing slash after submoduleNguyễn Thái Ngọc Duy, Jan 23, 2014
  6. Junio C HamanoJan 23, 2014
  7. Jens LehmannJan 23, 2014
  8. Junio C HamanoJan 23, 2014
  9. Duy NguyenJan 24, 2014
  10. 0/9 About the trailing slashesNguyễn Thái Ngọc Duy, Jan 24, 2014
  11. 1/9 Convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy, Jan 24, 2014
  12. 2/9 Convert some match_pathspec_depth() to dir_path_match()Nguyễn Thái Ngọc Duy, Jan 24, 2014
  13. 3/9 Rename match_pathspec_depth() to match_pathspec()Nguyễn Thái Ngọc Duy, Jan 24, 2014
  14. 4/9 dir.c: prepare match_pathspec_item for taking more flagsNguyễn Thái Ngọc Duy, Jan 24, 2014
  15. 5/9 match_pathspec: match pathspec "foo/" against directory "foo"Nguyễn Thái Ngọc Duy, Jan 24, 2014
  16. 6/9 Pass directory indicator to match_pathspec_item()Nguyễn Thái Ngọc Duy, Jan 24, 2014
  17. Eric SunshineJan 24, 2014
  18. Duy NguyenJan 25, 2014
  19. 7/9 clean: replace match_pathspec() with dir_path_match()Nguyễn Thái Ngọc Duy, Jan 24, 2014
  20. 8/9 clean: use cache_name_is_other()Nguyễn Thái Ngọc Duy, Jan 24, 2014
  21. 9/9 tree-walk.c: ignore trailing slash on submodule in tree_entry_interesting()Nguyễn Thái Ngọc Duy, Jan 24, 2014
  22. Junio C HamanoJan 24, 2014
  23. Duy NguyenJan 25, 2014
  24. Junio C HamanoJan 27, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.