From: Paul Tan <pyokagan@gmail.com>
To: git@vger.kernel.org
Cc: Paul Tan <pyokagan@gmail.com>
Subject: [PATCH 2/7] attr.c: replace home_config_paths() with xdg_config_home()
Date: Sun, 12 Apr 2015 15:46:07 +0800 [thread overview]
Message-ID: <1428824772-8736-2-git-send-email-pyokagan@gmail.com> (raw)
In-Reply-To: <1428824772-8736-1-git-send-email-pyokagan@gmail.com>
Since only the xdg attributes file path is required, simplify the code
by using xdg_config_home() instead of home_config_paths().
Signed-off-by: Paul Tan <pyokagan@gmail.com>
---
attr.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/attr.c b/attr.c
index 1f9eebd..868dce3 100644
--- a/attr.c
+++ b/attr.c
@@ -488,7 +488,6 @@ static int git_attr_system(void)
static void bootstrap_attr_stack(void)
{
struct attr_stack *elem;
- char *xdg_attributes_file;
if (attr_stack)
return;
@@ -507,10 +506,8 @@ static void bootstrap_attr_stack(void)
}
}
- if (!git_attributes_file) {
- home_config_paths(NULL, &xdg_attributes_file, "attributes");
- git_attributes_file = xdg_attributes_file;
- }
+ if (!git_attributes_file)
+ git_attributes_file = xdg_config_home("attributes");
if (git_attributes_file) {
elem = read_attr_from_file(git_attributes_file, 1);
if (elem) {
--
2.1.4
next prev parent reply other threads:[~2015-04-12 7:47 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-12 7:46 [PATCH 1/7] path.c: implement xdg_config_home() Paul Tan
2015-04-12 7:46 ` Paul Tan [this message]
2015-04-12 7:46 ` [PATCH 3/7] dir.c: replace home_config_paths() with xdg_config_home() Paul Tan
2015-04-12 7:46 ` [PATCH 4/7] credential-store.c: " Paul Tan
2015-04-12 7:46 ` [PATCH 5/7] git-commit: replace use of home_config_paths() Paul Tan
2015-04-12 7:46 ` [PATCH 6/7] git-config: " Paul Tan
2015-04-12 7:46 ` [PATCH 7/7] path.c: remove home_config_paths() Paul Tan
2015-04-13 15:50 ` [PATCH 1/7] path.c: implement xdg_config_home() Johannes Schindelin
2015-04-14 17:28 ` [PATCH v2 " Paul Tan
2015-04-16 21:41 ` Eric Sunshine
2015-04-18 7:51 ` Paul Tan
2015-04-20 0:39 ` Eric Sunshine
2015-04-21 4:06 ` [PATCH v3 " Paul Tan
2015-05-06 8:00 ` [PATCH v3 2/7] attr.c: replace home_config_paths() with xdg_config_home() Paul Tan
2015-05-06 8:01 ` [PATCH v3 3/7] dir.c: " Paul Tan
2015-05-06 8:01 ` [PATCH v3 4/7] credential-store.c: " Paul Tan
2015-05-06 8:01 ` [PATCH v3 5/7] git-commit: replace use of home_config_paths() Paul Tan
2015-05-06 8:01 ` [PATCH v3 6/7] git-config: " Paul Tan
2015-05-06 8:01 ` [PATCH v3 7/7] path.c: remove home_config_paths() Paul Tan
2015-04-18 8:48 ` [PATCH v2 1/7] path.c: implement xdg_config_home() Paul Tan
2015-04-14 20:39 ` [PATCH " Junio C Hamano
2015-04-14 22:28 ` Stefan Beller
2015-04-14 22:30 ` Junio C Hamano
2015-04-14 22:34 ` Stefan Beller
2015-04-13 21:43 ` Matthieu Moy
2015-04-14 0:18 ` Stefan Beller
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=1428824772-8736-2-git-send-email-pyokagan@gmail.com \
--to=pyokagan@gmail.com \
--cc=git@vger.kernel.org \
/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).