From 395de250d9d9762b8ac1ce98b297d60d0b5bd643 Mon Sep 17 00:00:00 2001
From: Matthieu Moy <Matthieu.Moy@imag.fr>
Date: Tue, 17 Nov 2009 18:24:25 +0100
Subject: Expand ~ and ~user in core.excludesfile, commit.template
These config variables are parsed to substitute ~ and ~user with getpw
entries.
user_path() refactored into new function expand_user_path(), to allow
dynamically allocating the return buffer.
Original patch by Karl Chen, modified by Matthieu Moy, and further
amended by Junio C Hamano.
Signed-off-by: Karl Chen <quarl@quarl.org>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/config.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'Documentation/config.txt')
diff --git a/Documentation/config.txt b/Documentation/config.txt
index cd1781498e..958006ca76 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -380,7 +380,8 @@ Common unit suffixes of 'k', 'm', or 'g' are supported.
core.excludesfile::
In addition to '.gitignore' (per-directory) and
'.git/info/exclude', git looks into this file for patterns
- of files which are not meant to be tracked. See
+ of files which are not meant to be tracked. "~/" and "~user/"
+ are expanded to the specified user's home directory. See
linkgit:gitignore[5].
core.editor::
@@ -666,6 +667,7 @@ color.ui::
commit.template::
Specify a file to use as the template for new commit messages.
+ "~/" and "~user/" are expanded to the specified user's home directory.
diff.autorefreshindex::
When using 'git-diff' to compare with work tree
--
cgit v1.2.1
From df2a79f4225b7216dce010ebfe41f8ad0de34b24 Mon Sep 17 00:00:00 2001
From: Matthieu Moy <Matthieu.Moy@imag.fr>
Date: Thu, 19 Nov 2009 16:21:15 +0100
Subject: expand_user_path: expand ~ to $HOME, not to the actual homedir.
In 395de250d (Expand ~ and ~user in core.excludesfile, commit.template),
we introduced the mechanism. But expanding ~ using getpw is not what
people overriding $HOME would usually expect. In particular, git looks
for the user's .gitconfig using $HOME, so it's better to be consistent.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/config.txt | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
(limited to 'Documentation/config.txt')
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 958006ca76..143afb82eb 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -380,9 +380,9 @@ Common unit suffixes of 'k', 'm', or 'g' are supported.
core.excludesfile::
In addition to '.gitignore' (per-directory) and
'.git/info/exclude', git looks into this file for patterns
- of files which are not meant to be tracked. "~/" and "~user/"
- are expanded to the specified user's home directory. See
- linkgit:gitignore[5].
+ of files which are not meant to be tracked. "~/" is expanded
+ to the value of `$HOME` and "~user/" to the specified user's
+ home directory. See linkgit:gitignore[5].
core.editor::
Commands such as `commit` and `tag` that lets you edit
@@ -667,7 +667,8 @@ color.ui::
commit.template::
Specify a file to use as the template for new commit messages.
- "~/" and "~user/" are expanded to the specified user's home directory.
+ "~/" is expanded to the value of `$HOME` and "~user/" to the
+ specified user's home directory.
diff.autorefreshindex::
When using 'git-diff' to compare with work tree
--
cgit v1.2.1
From 0f7fb21a7aec7ab8047536af018daa981b3b2676 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 21 Nov 2009 00:37:26 -0800
Subject: Documentation: avoid xmlto input error
Do not write literal "~/" or "~user" but use "{tilde}/" and "{tilde}user";
otherwise the text between them gets enclosed in
"<subscript>...</subscript>".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/config.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'Documentation/config.txt')
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 143afb82eb..56db07cbca 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -380,8 +380,8 @@ Common unit suffixes of 'k', 'm', or 'g' are supported.
core.excludesfile::
In addition to '.gitignore' (per-directory) and
'.git/info/exclude', git looks into this file for patterns
- of files which are not meant to be tracked. "~/" is expanded
- to the value of `$HOME` and "~user/" to the specified user's
+ of files which are not meant to be tracked. "{tilde}/" is expanded
+ to the value of `$HOME` and "{tilde}user/" to the specified user's
home directory. See linkgit:gitignore[5].
core.editor::
@@ -667,7 +667,7 @@ color.ui::
commit.template::
Specify a file to use as the template for new commit messages.
- "~/" is expanded to the value of `$HOME` and "~user/" to the
+ "{tilde}/" is expanded to the value of `$HOME` and "{tilde}user/" to the
specified user's home directory.
diff.autorefreshindex::
--
cgit v1.2.1