{"thread":{"id":"6640","subject":"[PATCH 0/2] Minor stgit touches","startedAt":"2007-02-03T16:04:15Z","lastAt":"2007-02-03T16:04:25Z","messageCount":3,"participants":["Yann Dirson"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"33450","messageId":"20070203160257.32054.17787.stgit@gandelf.nowhere.earth","threadId":"6640","inReplyTo":null,"subject":"[PATCH 0/2] Minor stgit touches","fromName":"Yann Dirson","fromEmail":"ydirson@altern.org","sentAt":"2007-02-03T16:04:15Z","receivedAt":"2007-02-03T16:04:15Z","isPatch":true,"sender":{"key":"ydirson@altern.org","avatar":"https://avatars.githubusercontent.com/u/1190950?v=4"},"body":"Here is one bugfix, and the addition of a notice to the user when we\nfallback to \"origin\" as a parent because of the lack of config\nparameters.\n\n-- \nYann Dirson    <ydirson@altern.org> |\nDebian-related: <dirson@debian.org> |   Support Debian GNU/Linux:\n                                    |  Freedom, Power, Stability, Gratis\n     http://ydirson.free.fr/        | Check <http://www.debian.org/>\n"},{"id":"33455","messageId":"20070203160420.32054.20462.stgit@gandelf.nowhere.earth","threadId":"6640","inReplyTo":"20070203160257.32054.17787.stgit@gandelf.nowhere.earth","subject":"[PATCH 1/2] Correctly check the pull-does-rebase parameter in 'stg pull'.","fromName":"Yann Dirson","fromEmail":"ydirson@altern.org","sentAt":"2007-02-03T16:04:20Z","receivedAt":"2007-02-03T16:04:20Z","isPatch":true,"sender":{"key":"ydirson@altern.org","avatar":"https://avatars.githubusercontent.com/u/1190950?v=4"},"body":"\n\n\nSigned-off-by: Yann Dirson <ydirson@altern.org>\n---\n\n stgit/commands/pull.py |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/stgit/commands/pull.py b/stgit/commands/pull.py\nindex 15bbed6..330cc25 100644\n--- a/stgit/commands/pull.py\n+++ b/stgit/commands/pull.py\n@@ -72,7 +72,8 @@ def func(parser, options, args):\n     # pull the remote changes\n     print 'Pulling from \"%s\"...' % repository\n     git.fetch(repository)\n-    if (config.get('stgit.pull-does-rebase')):\n+    if (config.get('stgit.pull-does-rebase') == 'yes'):\n+        print \"rebasing to '%s'...\" % crt_series.get_parent_branch()\n         git.reset(tree_id = git.rev_parse(crt_series.get_parent_branch()))\n     print 'done'\n \n"},{"id":"33451","messageId":"20070203160425.32054.75599.stgit@gandelf.nowhere.earth","threadId":"6640","inReplyTo":"20070203160257.32054.17787.stgit@gandelf.nowhere.earth","subject":"[PATCH 2/2] Warn the user when there is no parent information in the config.","fromName":"Yann Dirson","fromEmail":"ydirson@altern.org","sentAt":"2007-02-03T16:04:25Z","receivedAt":"2007-02-03T16:04:25Z","isPatch":true,"sender":{"key":"ydirson@altern.org","avatar":"https://avatars.githubusercontent.com/u/1190950?v=4"},"body":"\n\n\nSigned-off-by: Yann Dirson <ydirson@altern.org>\n---\n\n stgit/stack.py |    6 ++----\n 1 files changed, 2 insertions(+), 4 deletions(-)\n\ndiff --git a/stgit/stack.py b/stgit/stack.py\nindex 3960729..9609ed3 100644\n--- a/stgit/stack.py\n+++ b/stgit/stack.py\n@@ -418,8 +418,7 @@ class Series(StgitObject):\n         if value:\n             return value\n         elif 'origin' in git.remotes_list():\n-            # FIXME: this is for compatibility only.  Should be\n-            # dropped when all relevant commands record this info.\n+            print \"Notice: no parent remote declared for stack '%s', defaulting to 'origin'.  Consider setting 'branch.%s.remote' with 'git repo-config'.\" % (self.__name, self.__name)\n             return 'origin'\n         else:\n             raise StackException, 'Cannot find a parent remote for \"%s\"' % self.__name\n@@ -432,8 +431,7 @@ class Series(StgitObject):\n         if value:\n             return value\n         elif git.rev_parse('heads/origin'):\n-            # FIXME: this is for compatibility only.  Should be\n-            # dropped when all relevant commands record this info.\n+            print \"Notice: no parent branch declared for stack '%s', defaulting to 'heads/origin'.  Consider setting 'branch.%s.merge' with 'git repo-config'.\" % (self.__name, self.__name)\n             return 'heads/origin'\n         else:\n             raise StackException, 'Cannot find a parent branch for \"%s\"' % self.__name\n"}]}