[PATCH v9 0/6] transport-helper: fixes

From

Felipe Contreras <felipe.contreras@gmail.com>

Date

Apr 12, 2014, 20:12 UTC

Message-ID

<1397333575-11614-1-git-send-email-felipe.contreras@gmail.com>

Hi,

Changes since v8:

--- a/transport-helper.c
+++ b/transport-helper.c
@@ -734,7 +734,7 @@ static int push_update_ref_status(struct strbuf *buf,
        }
 
        (*ref)->status = status;
-       (*ref)->forced_update = forced;
+       (*ref)->forced_update |= forced;
        (*ref)->remote_status = msg;
        return !(status == REF_STATUS_OK);
 }

Felipe Contreras (4):
  transport-helper: mismerge fix
  transport-helper: don't update refs in dry-run
  transport-helper: add 'force' to 'export' helpers
  transport-helper: check for 'forced update' message

Richard Hansen (2):
  test-hg.sh: tests are now expected to pass
  remote-bzr: support the new 'force' option

 Documentation/gitremote-helpers.txt   |  4 ++++
 contrib/remote-helpers/git-remote-bzr | 31 ++++++++++++++++++++++++++++++-
 contrib/remote-helpers/test-bzr.sh    | 22 +++++++++++++++++++++-
 contrib/remote-helpers/test-hg.sh     |  4 ++--
 git-remote-testgit.sh                 | 18 ++++++++++++++++++
 t/t5801-remote-helpers.sh             | 13 +++++++++++++
 transport-helper.c                    | 25 +++++++++++++++++--------
 7 files changed, 105 insertions(+), 12 deletions(-)

-- 
1.9.1+fc3.9.gc73078e