chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
6347d3e
)
wip push
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 14 Aug 2013 18:23:20 +0000
(19:23 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 14 Aug 2013 18:23:20 +0000
(19:23 +0100)
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index 55cdc0c2f37217cda45d7f38f933f7a321f2de40..dc2275da493fbd53315b80b501ca961720f60750 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