From: Karl Hasselström <kha@xxxxxxxxxxx>
There are two distinct disadvantages to having author and committer
names in stgitrc:
* They override GIT_AUTHOR_NAME and friends, not the other way
around as one might imagine.
* They cause stgit and plain git to use different names (unless one
manages to keep them in sync manually), which can't possibly be a
good idea.
This patch removes the description of these variables in the example
stgitrc, so that new users aren't tempted to use them. They will still
continue to function, however.
Signed-off-by: Karl Hasselström <kha@xxxxxxxxxxx>
---
examples/stgitrc | 5 -----
stgit/git.py | 3 +++
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/examples/stgitrc b/examples/stgitrc
index 45a629b..9cd95e1 100644
--- a/examples/stgitrc
+++ b/examples/stgitrc
@@ -3,11 +3,6 @@
# the former.
[stgit]
-# Default author/committer details
-#authname: Your Name
-#authemail: your.name@xxxxxxxxxxxxxxx
-#commname: Your Name
-#commemail: your.name@xxxxxxxxxxxxxxx
# Automatically Bcc the address below
#autobcc: your.name@xxxxxxxxxxxxxxx
diff --git a/stgit/git.py b/stgit/git.py
index a6e1a63..f654cde 100644
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -452,6 +452,9 @@ def __git_person(p):
__cached_stgit_persons = {}
def __stgit_person(p, name_key, email_key):
+ """Calls __git_person to get the details for a person, but allows
+ the deprecated author and committer variables in stgitrc override
+ the result."""
if not p in __cached_stgit_persons:
person = __git_person(p)
if config.has_option('stgit', name_key):
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html