[StGIT PATCH 2/9] Revert part of the reverted commit that we want to keep.
From: Yann Dirson <hidden>
Date: 2016-06-15 22:43:17
Subsystem:
the rest · Maintainer:
Linus Torvalds
- get rid of unused real_rebase parameter - revive git.all_refs() This commit can freely be used to demonstrate the usefulness of _always_ separating different issues in different patches :) Signed-off-by: Yann Dirson <redacted> --- stgit/commands/common.py | 2 +- stgit/commands/pull.py | 2 +- stgit/commands/rebase.py | 2 +- stgit/git.py | 6 ++++++ 4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index 22c78ae..b05979b 100644
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py@@ -318,7 +318,7 @@ def address_or_alias(addr_str): for addr in addr_str.split(',')] return ', '.join([addr for addr in addr_list if addr]) -def prepare_rebase(real_rebase, force=None): +def prepare_rebase(force=None): if not force: # Be sure we won't loose results of stg-(un)commit by error. # Do not require an existing orig-base for compatibility with 0.12 and earlier.
diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 5f72f9b..fe3b67d 100644
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py@@ -86,7 +86,7 @@ def func(parser, options, args): else: raise GitConfigException, 'Unsupported pull-policy "%s"' % policy - applied = prepare_rebase(real_rebase=must_rebase, force=options.force) + applied = prepare_rebase(force=options.force) # pull the remote changes if policy == 'pull':
diff --git a/stgit/commands/rebase.py b/stgit/commands/rebase.py
index 2f0e660..e47772c 100644
--- a/stgit/commands/rebase.py
+++ b/stgit/commands/rebase.py@@ -56,7 +56,7 @@ def func(parser, options, args): if git_id(args[0]) == None: raise GitException, 'Unknown revision: %s' % git_id - applied = prepare_rebase(real_rebase=True, force=options.force) + applied = prepare_rebase(force=options.force) rebase(args[0]) post_rebase(applied, options.nopush, options.merged)
diff --git a/stgit/git.py b/stgit/git.py
index 6c96a16..047c040 100644
--- a/stgit/git.py
+++ b/stgit/git.py@@ -1070,3 +1070,9 @@ def fetch_head(): # here we are sure to have a single fetch_head return fetch_head + +def all_refs(): + """Return a list of all refs in the current repository. + """ + + return [line.split()[1] for line in _output_lines(['git-show-ref'])]