diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-14 19:23:20 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-14 19:23:20 +0100 |
commit | e047a5c9931a260b730fe3beaae6eacd2c4ccec8 (patch) | |
tree | f498cbe188ec305365e84595075f96650da513c9 | |
parent | 6347d3e236ba3b578c1a6a259f51fc977e71b210 (diff) |
wip push
-rwxr-xr-x | dgit | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -306,8 +306,11 @@ sub push () { runcmd qw(git fetch), $alioth_git, map { "$_:refs/remotes/$remotename/$_" } (mainbranch(), uploadbranch()); - die <<END; + if (!is_fast_fwd(mainbranch +xxx introduce remote_lref +xxx use remote_lref everywhere + fetch from alioth do fast forward check and maybe fake merge push to uploading |