From: "Karl Hasselström" <kha@treskal.com>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: [StGIT PATCH 2/4] Don't write None to the conf file
Date: Sun, 26 Aug 2007 22:26:21 +0200 [thread overview]
Message-ID: <20070826202620.15933.51552.stgit@yoghurt> (raw)
In-Reply-To: <20070826202309.15933.54183.stgit@yoghurt>
If we don't have a value for the remote, just don't write it. Writing
None will either write the string "None" or crash StGIT, depending on
how exactly the call is done -- and neither is what we want!
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
stgit/stack.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/stgit/stack.py b/stgit/stack.py
index 030562d..0ce9992 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -546,7 +546,8 @@ class Series(PatchSet):
def set_parent(self, remote, localbranch):
if localbranch:
- self.__set_parent_remote(remote)
+ if remote:
+ self.__set_parent_remote(remote)
self.__set_parent_branch(localbranch)
# We'll enforce this later
# else:
next prev parent reply other threads:[~2007-08-26 20:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-26 20:26 [StGIT PATCH 0/4] Miscellaneous fixes Karl Hasselström
2007-08-26 20:26 ` [StGIT PATCH 1/4] Don't use test_expect_failure when more than one thing could fail Karl Hasselström
2007-08-26 20:26 ` Karl Hasselström [this message]
2007-08-26 20:26 ` [StGIT PATCH 3/4] Replace "git repo-config" with "git config" in help texts Karl Hasselström
2007-08-26 20:26 ` [StGIT PATCH 4/4] Compile regexp just once Karl Hasselström
2007-08-29 10:18 ` [StGIT PATCH 0/4] Miscellaneous fixes Catalin Marinas
2007-08-29 11:17 ` Karl Hasselström
2007-09-03 8:40 ` Catalin Marinas
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=20070826202620.15933.51552.stgit@yoghurt \
--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).