chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more TODO
[dgit.git]
/
dgit
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());
runcmd qw(git fetch), $alioth_git,
map { "$_:refs/remotes/$remotename/$_" }
(mainbranch(), uploadbranch());
-
die <<END;
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
fetch from alioth
do fast forward check and maybe fake merge
push to uploading