From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: <git@vger.kernel.org>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
"Taylor Blau" <me@ttaylorr.com>, "Jeff King" <peff@peff.net>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH v3 0/2] Honor .gitattributes with rebase --am
Date: Tue, 13 Aug 2019 02:43:05 +0000 [thread overview]
Message-ID: <20190813024307.705016-1-sandals@crustytoothpaste.net> (raw)
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 {
next prev parent reply other threads:[~2019-08-13 12:45 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-09 10:02 [PATCH] apply: reload .gitattributes after patching it brian m. carlson
2019-08-09 11:14 ` Taylor Blau
2019-08-09 11:25 ` brian m. carlson
2019-08-09 11:36 ` Jeff King
2019-08-09 11:47 ` brian m. carlson
2019-08-09 12:43 ` SZEDER Gábor
2019-08-09 13:51 ` Jeff King
2019-08-09 22:08 ` brian m. carlson
2019-08-11 17:47 ` [PATCH v2 0/2] Honor .gitattributes with rebase --am brian m. carlson
2019-08-11 17:47 ` [PATCH v2 1/2] path: add a function to check for path suffix brian m. carlson
2019-08-12 0:32 ` Junio C Hamano
2019-08-12 1:10 ` brian m. carlson
2019-08-12 4:36 ` SZEDER Gábor
2019-08-12 16:49 ` Junio C Hamano
2019-08-12 22:40 ` brian m. carlson
2019-08-13 1:13 ` Jeff King
2019-08-13 16:40 ` Junio C Hamano
2019-08-13 6:36 ` SZEDER Gábor
2019-08-13 16:42 ` Junio C Hamano
2019-08-11 17:47 ` [PATCH v2 2/2] apply: reload .gitattributes after patching it brian m. carlson
2019-08-13 2:43 ` brian m. carlson [this message]
2019-08-13 2:43 ` [PATCH v3 1/2] path: add a function to check for path suffix brian m. carlson
2019-08-13 2:43 ` [PATCH v3 2/2] apply: reload .gitattributes after patching it brian m. carlson
2019-08-13 18:08 ` Junio C Hamano
2019-08-15 22:10 ` Junio C Hamano
2019-08-16 0:22 ` brian m. carlson
2019-08-13 22:37 ` Junio C Hamano
2019-08-13 22:48 ` brian m. carlson
2019-08-18 18:44 ` [PATCH v4 0/2] Honor .gitattributes with rebase --am brian m. carlson
2019-08-18 18:44 ` [PATCH v4 1/2] path: add a function to check for path suffix brian m. carlson
2019-08-18 18:44 ` [PATCH v4 2/2] apply: reload .gitattributes after patching it brian m. carlson
2019-08-19 9:41 ` Phillip Wood
2019-08-19 9:55 ` Phillip Wood
2019-08-20 3:05 ` brian m. carlson
2019-08-20 8:56 ` Phillip Wood
2019-08-20 2:45 ` brian m. carlson
2019-08-20 8:52 ` Phillip Wood
2019-08-20 18:24 ` Junio C Hamano
2019-08-20 18:32 ` Phillip Wood
2019-08-26 15:09 ` Phillip Wood
2019-08-26 16:41 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190813024307.705016-1-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).