Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #44 from em-/master

Some fixes to be able to push --overwrite after amending a commit
  • Loading branch information...
commit ae6a083a39b01419a1a9563ea1e0a3c37c2b6056 2 parents 011a644 + 9701060
@termie termie authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 git-bzr
View
6 git-bzr
@@ -30,7 +30,7 @@ def run_command(cmd, error_ok=False, error_message=None, exit_code=False,
redirect_stdout=True, return_proc=False, stdout=None,
stdin=None):
# Useful for debugging:
- logging.debug(' '.join(cmd))
+ logging.info(' '.join(cmd))
if redirect_stdout and stdout is None:
stdout = subprocess.PIPE
@@ -257,7 +257,7 @@ def export_bzr(bzr_ref, cl=None, overwrite=False):
bzr_import_arg = git_import_arg = []
if overwrite:
- git(['branch', '-D', bzr_ref])
+ git(['branch', '-D', bzr_ref], error_ok=True)
# NOTE(termie): this happens in reverse because we're piping
git_proc = git(['fast-import'] + git_import_arg + [
@@ -455,7 +455,7 @@ def cmd_push(args):
else:
known_upstream = None
- if known_upstream and (not upstream or upstream == known_upstream):
+ if not options.overwrite and known_upstream and (not upstream or upstream == known_upstream):
upstream = known_upstream
# Sync first
Please sign in to comment.
Something went wrong with that request. Please try again.