chiark / gitweb /
wip push
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 14 Aug 2013 18:23:20 +0000 (19:23 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 14 Aug 2013 18:23:20 +0000 (19:23 +0100)
dgit

diff --git a/dgit b/dgit
index 55cdc0c..dc2275d 100755 (executable)
--- 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