All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paul Tan <pyokagan@gmail.com>
To: git@vger.kernel.org
Cc: Paul Tan <pyokagan@gmail.com>
Subject: [PATCH 5/7] git-commit: replace use of home_config_paths()
Date: Sun, 12 Apr 2015 15:46:10 +0800	[thread overview]
Message-ID: <1428824772-8736-5-git-send-email-pyokagan@gmail.com> (raw)
In-Reply-To: <1428824772-8736-1-git-send-email-pyokagan@gmail.com>

Since home_config_paths() combines two distinct functionality already
implemented by expand_user_path() and xdg_config_home(), and hides the
home config file path ~/.gitconfig. Make the code more explicit by
replacing the use of home_config_paths() with expand_user_path() and
xdg_config_home().

Signed-off-by: Paul Tan <pyokagan@gmail.com>
---
 builtin/commit.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/builtin/commit.c b/builtin/commit.c
index da79ac4..c2ebea4 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1398,12 +1398,10 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 
 static const char *implicit_ident_advice(void)
 {
-	char *user_config = NULL;
-	char *xdg_config = NULL;
-	int config_exists;
+	char *user_config = expand_user_path("~/.gitconfig");
+	char *xdg_config = xdg_config_home("config");
+	int config_exists = file_exists(user_config) || file_exists(xdg_config);
 
-	home_config_paths(&user_config, &xdg_config, "config");
-	config_exists = file_exists(user_config) || file_exists(xdg_config);
 	free(user_config);
 	free(xdg_config);
 
-- 
2.1.4

  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 ` [PATCH 2/7] attr.c: replace home_config_paths() with xdg_config_home() Paul Tan
2015-04-12  7:46 ` [PATCH 3/7] dir.c: " Paul Tan
2015-04-12  7:46 ` [PATCH 4/7] credential-store.c: " Paul Tan
2015-04-12  7:46 ` Paul Tan [this message]
2015-04-12  7:46 ` [PATCH 6/7] git-config: replace use of home_config_paths() 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-5-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.