Merge branch 'jn/demote-proto2-from-default'

gitster · gitster · commit e896a286df44 · 2020-04-28T15:50:11.000-07:00
Those fetching over protocol v2 from linux-next and other kernel
repositories are reporting that v2 often fetches way too much than
needed.

* jn/demote-proto2-from-default:
  Revert "fetch: default to protocol version 2"
diff --git a/Documentation/config/protocol.txt b/Documentation/config/protocol.txt
@@ -48,7 +48,7 @@ protocol.version::
 	If set, clients will attempt to communicate with a server
 	using the specified protocol version.  If the server does
 	not support it, communication falls back to version 0.
-	If unset, the default is `2`.
+	If unset, the default is `0`.
 	Supported versions:
 +
 --
diff --git a/protocol.c b/protocol.c
@@ -39,7 +39,7 @@ enum protocol_version get_protocol_version_config(void)
 		return env;
 	}
 
-	return protocol_v2;
+	return protocol_v0;
 }
 
 enum protocol_version determine_protocol_version_server(void)

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ protocol.version::`
`48`	`48`	`If set, clients will attempt to communicate with a server`
`49`	`49`	`using the specified protocol version. If the server does`
`50`	`50`	`not support it, communication falls back to version 0.`
`51`		- If unset, the default is `2`.
	`51`	+ If unset, the default is `0`.
`52`	`52`	`Supported versions:`
`53`	`53`	`+`
`54`	`54`	`--`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ enum protocol_version get_protocol_version_config(void)`
`39`	`39`	`return env;`
`40`	`40`	`}`
`41`	`41`
`42`		`- return protocol_v2;`
	`42`	`+ return protocol_v0;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`enum protocol_version determine_protocol_version_server(void)`