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

[PATCH v3 0/2] Honor .gitattributes with rebase --am

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Aug 13, 2019, 02:43 UTC
Message-ID
<20190813024307.705016-1-sandals@crustytoothpaste.net>
In-Reply-To
<20190809100217.427178-1-sandals@crustytoothpaste.net>

This series makes rebase --am honor the .gitattributes file for subsequent patches when a patch changes it.

Changes from v2:
* Rename has_path_suffix to ends_with_path_components.
Changes from v1:
* Add has_path_suffix in a separate commit.
brian m. carlson (2):
  path: add a function to check for path suffix
  apply: reload .gitattributes after patching it
 apply.c           |  7 +++++++
 convert.c         |  9 ++++++++-
 convert.h         |  6 ++++++
 path.c            | 39 ++++++++++++++++++++++++++++++---------
 path.h            |  3 +++
 t/t3400-rebase.sh | 23 +++++++++++++++++++++++
 6 files changed, 77 insertions(+), 10 deletions(-)
Range-diff against v2:
1:  125fda966c ! 1:  14c853420b path: add a function to check for path suffix
    @@ Commit message
         have one to check for a path suffix. For a plain filename, we can use
         basename, but that requires an allocation, since POSIX allows it to
         modify its argument. Refactor strip_path_suffix into a helper function
    -    and a new function, has_path_suffix to meet this need.
    +    and a new function, ends_with_path_components, to meet this need.
     
         Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
     
    @@ path.c: static inline int chomp_trailing_dir_sep(const char *path, int len)
     +}
     +
     +/*
    -+ * Returns true if the path ends with suffix, considering only complete path
    -+ * components and false otherwise.
    ++ * Returns true if the path ends with components, considering only complete path
    ++ * components, and false otherwise.
     + */
    -+int has_path_suffix(const char *path, const char *suffix)
    ++int ends_with_path_components(const char *path, const char *components)
     +{
    -+	return stripped_path_suffix_offset(path, suffix) != -1;
    ++	return stripped_path_suffix_offset(path, components) != -1;
     +}
     +
      /*
    @@ path.h: const char *git_path_merge_head(struct repository *r);
      const char *git_path_shallow(struct repository *r);
      
     +
    -+int has_path_suffix(const char *path, const char *suffix);
    ++int ends_with_path_components(const char *path, const char *components);
     +
      #endif /* PATH_H */
2:  f54af7e595 ! 2:  5f4402b38d apply: reload .gitattributes after patching it
    @@ apply.c: static int apply_patch(struct apply_state *state,
      			listp = &patch->next;
     +
     +			if (!flush_attributes && patch->new_name &&
    -+			    has_path_suffix(patch->new_name, GITATTRIBUTES_FILE))
    ++			    ends_with_path_components(patch->new_name, GITATTRIBUTES_FILE))
     +				flush_attributes = 1;
      		}
      		else {
Previous: brian m. carlsonNext: brian m. carlson
Message 21 of 41 in “apply: reload .gitattributes after patching it”
  1. apply: reload .gitattributes after patching itbrian m. carlson, Aug 9, 2019
  2. Taylor BlauAug 9, 2019
  3. brian m. carlsonAug 9, 2019
  4. Jeff KingAug 9, 2019
  5. brian m. carlsonAug 9, 2019
  6. SZEDER GáborAug 9, 2019
  7. Jeff KingAug 9, 2019
  8. brian m. carlsonAug 9, 2019
  9. 0/2 Honor .gitattributes with rebase --ambrian m. carlson, Aug 11, 2019
  10. 1/2 path: add a function to check for path suffixbrian m. carlson, Aug 11, 2019
  11. Junio C HamanoAug 12, 2019
  12. brian m. carlsonAug 12, 2019
  13. SZEDER GáborAug 12, 2019
  14. Junio C HamanoAug 12, 2019
  15. brian m. carlsonAug 12, 2019
  16. Jeff KingAug 13, 2019
  17. Junio C HamanoAug 13, 2019
  18. SZEDER GáborAug 13, 2019
  19. Junio C HamanoAug 13, 2019
  20. 2/2 apply: reload .gitattributes after patching itbrian m. carlson, Aug 11, 2019
  21. 0/2 Honor .gitattributes with rebase --ambrian m. carlson, Aug 13, 2019
  22. 1/2 path: add a function to check for path suffixbrian m. carlson, Aug 13, 2019
  23. 2/2 apply: reload .gitattributes after patching itbrian m. carlson, Aug 13, 2019
  24. Junio C HamanoAug 13, 2019
  25. Junio C HamanoAug 15, 2019
  26. brian m. carlsonAug 16, 2019
  27. Junio C HamanoAug 13, 2019
  28. brian m. carlsonAug 13, 2019
  29. 0/2 Honor .gitattributes with rebase --ambrian m. carlson, Aug 18, 2019
  30. 1/2 path: add a function to check for path suffixbrian m. carlson, Aug 18, 2019
  31. 2/2 apply: reload .gitattributes after patching itbrian m. carlson, Aug 18, 2019
  32. Phillip WoodAug 19, 2019
  33. Phillip WoodAug 19, 2019
  34. brian m. carlsonAug 20, 2019
  35. Phillip WoodAug 20, 2019
  36. brian m. carlsonAug 20, 2019
  37. Phillip WoodAug 20, 2019
  38. Junio C HamanoAug 20, 2019
  39. Phillip WoodAug 20, 2019
  40. Phillip WoodAug 26, 2019
  41. Junio C HamanoAug 26, 2019

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.