summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
9970bed)
- Got rid of some unneeded blocking_io value twiddling.
- Send --use-qsort to the server if it was specified.
static char argstr[64];
int ac = *argc_p;
char *arg;
static char argstr[64];
int ac = *argc_p;
char *arg;
- if (blocking_io == -1)
- blocking_io = 0;
-
/* This should always remain first on the server's command-line. */
args[ac++] = "--server";
/* This should always remain first on the server's command-line. */
args[ac++] = "--server";
if (do_compression)
argstr[x++] = 'z';
if (do_compression)
argstr[x++] = 'z';
+ /* We make use of the -e option to let the server know about any
+ * pre-release protocol version && our allow_inc_recurse status. */
+ set_allow_inc_recurse();
#if SUBPROTOCOL_VERSION != 0
#if SUBPROTOCOL_VERSION != 0
- /* If we're speaking a pre-release version of a protocol, we tell
- * the server about this by (ab)using the -e option. */
if (protocol_version == PROTOCOL_VERSION) {
x += snprintf(argstr+x, sizeof argstr - x,
if (protocol_version == PROTOCOL_VERSION) {
x += snprintf(argstr+x, sizeof argstr - x,
- "e%d.%d", PROTOCOL_VERSION, SUBPROTOCOL_VERSION);
- }
+ "e%d.%d%s", PROTOCOL_VERSION, SUBPROTOCOL_VERSION,
+ allow_inc_recurse ? "i" : "");
+ } else
+ if (allow_inc_recurse) {
+ argstr[x++] = 'e';
+ argstr[x++] = 'i';
+ }
if (numeric_ids)
args[ac++] = "--numeric-ids";
if (numeric_ids)
args[ac++] = "--numeric-ids";
+ if (use_qsort)
+ args[ac++] = "--use-qsort";
+
if (am_sender) {
if (ignore_existing)
args[ac++] = "--ignore-existing";
if (am_sender) {
if (ignore_existing)
args[ac++] = "--ignore-existing";