git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Karl Hasselström" <kha@treskal.com>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: [PATCH 3/3] Deprecate author and committer details in stgitrc
Date: Sun, 12 Nov 2006 00:31:21 +0100	[thread overview]
Message-ID: <20061111233121.17760.27045.stgit@localhost> (raw)
In-Reply-To: <20061111232322.17760.26214.stgit@localhost>

From: Karl Hasselström <kha@treskal.com>

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@treskal.com>
---

 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@yourcompany.com
-#commname:  Your Name
-#commemail: your.name@yourcompany.com
 
 # Automatically Bcc the address below
 #autobcc: your.name@yourcompany.com
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)

  parent reply	other threads:[~2006-11-11 23:31 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-11 11:35 Double From:s in StGIT's patch email template Karl Hasselström
2006-11-11 14:15 ` Author name and e-mail address in .stgitrc Karl Hasselström
2006-11-11 14:31   ` Robin Rosenberg
2006-11-11 14:57     ` Karl Hasselström
2006-11-11 20:26       ` Robin Rosenberg
2006-11-11 22:30         ` Karl Hasselström
2006-11-11 23:02   ` Catalin Marinas
2006-11-11 23:23     ` [PATCH 0/3] " Karl Hasselström
2006-11-11 23:30       ` [PATCH 1/3] Ask git for author and committer name Karl Hasselström
2006-11-11 23:35         ` Karl Hasselström
2006-12-04 22:24         ` Catalin Marinas
2006-12-05  9:10           ` Karl Hasselström
2006-12-05  9:17             ` Catalin Marinas
2006-11-11 23:31       ` [PATCH 2/3] Don't mention deprecated template variables Karl Hasselström
2006-11-11 23:31       ` Karl Hasselström [this message]
2006-11-12  0:20     ` Author name and e-mail address in .stgitrc Karl Hasselström
2006-11-11 14:40 ` Double From:s in StGIT's patch email template Karl Hasselström

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=20061111233121.17760.27045.stgit@localhost \
    --to=kha@treskal.com \
    --cc=catalin.marinas@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).