summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-14 19:23:20 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-14 19:23:20 +0100
commite047a5c9931a260b730fe3beaae6eacd2c4ccec8 (patch)
treef498cbe188ec305365e84595075f96650da513c9
parent6347d3e236ba3b578c1a6a259f51fc977e71b210 (diff)
wip push
-rwxr-xr-xdgit5
1 files changed, 4 insertions, 1 deletions
diff --git a/dgit b/dgit
index 55cdc0c..dc2275d 100755
--- a/dgit
+++ b/dgit
@@ -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