Merge branch 'fc/remote-helper-refmap'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:18:15 +0000 (12:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:18:15 +0000 (12:18 -0700)
Allow remote-helper/fast-import based transport to rename the refs
while transferring the history.

* fc/remote-helper-refmap:
  transport-helper: remove unnecessary strbuf resets
  transport-helper: add support to delete branches
  fast-export: add support to delete refs
  fast-import: add support to delete refs
  transport-helper: add support to push symbolic refs
  transport-helper: add support for old:new refspec
  fast-export: add new --refspec option
  fast-export: improve argument parsing

1  2 
Documentation/git-fast-import.txt
t/t5801-remote-helpers.sh
transport-helper.c

Simple merge
Simple merge
@@@ -897,17 -915,11 +909,19 @@@ static int push_refs_with_export(struc
        if (get_exporter(transport, &exporter, &revlist_args))
                die("Couldn't run fast-export");
  
+       string_list_clear(&revlist_args, 1);
        if (finish_command(&exporter))
                die("Error while running fast-export");
 -      push_update_refs_status(data, remote_refs, flags);
 +      if (push_update_refs_status(data, remote_refs, flags))
 +              return 1;
 +
 +      if (data->export_marks) {
 +              strbuf_addf(&buf, "%s.tmp", data->export_marks);
 +              rename(buf.buf, data->export_marks);
 +              strbuf_release(&buf);
 +      }
 +
        return 0;
  }