chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: rpush: Provide $we_are_initiator
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index d62694a90818c7d461324381f57a3eb4d6b3afc2..89073a5ced2988cbccd36caa057418e196feec57 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-73,6
+73,7
@@
our $dodep14tag;
our $dodep14tag_re = 'want|no|always';
our $split_brain_save;
our $we_are_responder;
our $dodep14tag_re = 'want|no|always';
our $split_brain_save;
our $we_are_responder;
+our $we_are_initiator;
our $initiator_tempdir;
our $patches_applied_dirtily = 00;
our $tagformat_want;
our $initiator_tempdir;
our $patches_applied_dirtily = 00;
our $tagformat_want;
@@
-4457,6
+4458,8
@@
sub cmd_rpush {
my @cmd = (@ssh, $host, shellquote @rdgit);
debugcmd "+",@cmd;
my @cmd = (@ssh, $host, shellquote @rdgit);
debugcmd "+",@cmd;
+ $we_are_initiator=1;
+
if (defined $initiator_tempdir) {
rmtree $initiator_tempdir;
mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
if (defined $initiator_tempdir) {
rmtree $initiator_tempdir;
mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";