about summary refs log tree commit diff
path: root/third_party/git/t/t4100/t-apply-1.patch
diff options
context:
space:
mode:
authorVincent Ambo <Vincent Ambo>2020-01-11T23·36+0000
committerVincent Ambo <Vincent Ambo>2020-01-11T23·40+0000
commit7ef0d62730840ded097b524104cc0a0904591a63 (patch)
treea670f96103667aeca4789a95d94ca0dff550c4ce /third_party/git/t/t4100/t-apply-1.patch
parent6a2a3007077818e24a3d56fc492ada9206a10cf0 (diff)
parent1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5 (diff)
merge(third_party/git): Merge squashed git subtree at v2.23.0 r/373
Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'
Diffstat (limited to 'third_party/git/t/t4100/t-apply-1.patch')
-rw-r--r--third_party/git/t/t4100/t-apply-1.patch194
1 files changed, 194 insertions, 0 deletions
diff --git a/third_party/git/t/t4100/t-apply-1.patch b/third_party/git/t/t4100/t-apply-1.patch
new file mode 100644
index 000000000000..90ab54f0f586
--- /dev/null
+++ b/third_party/git/t/t4100/t-apply-1.patch
@@ -0,0 +1,194 @@
+418aaf847a8b3ffffb4f777a2dd5262ca5ce0ef7 (from dc93841715dfa9a9cdda6f2c4a25eec831ea7aa0)
+diff --git a/Documentation/git-rpull.txt b/Documentation/git-ssh-pull.txt
+similarity index 90%
+rename from Documentation/git-rpull.txt
+rename to Documentation/git-ssh-pull.txt
+--- a/Documentation/git-rpull.txt
++++ b/Documentation/git-ssh-pull.txt
+@@ -1,21 +1,21 @@
+-git-rpull(1)
+-============
++git-ssh-pull(1)
++===============
+ v0.1, May 2005
+ 
+ NAME
+ ----
+-git-rpull - Pulls from a remote repository over ssh connection
++git-ssh-pull - Pulls from a remote repository over ssh connection
+ 
+ 
+ 
+ SYNOPSIS
+ --------
+-'git-rpull' [-c] [-t] [-a] [-d] [-v] [--recover] commit-id url
++'git-ssh-pull' [-c] [-t] [-a] [-d] [-v] [--recover] commit-id url
+ 
+ DESCRIPTION
+ -----------
+-Pulls from a remote repository over ssh connection, invoking git-rpush on
+-the other end.
++Pulls from a remote repository over ssh connection, invoking git-ssh-push
++on the other end.
+ 
+ OPTIONS
+ -------
+diff --git a/Documentation/git-rpush.txt b/Documentation/git-ssh-push.txt
+similarity index 71%
+rename from Documentation/git-rpush.txt
+rename to Documentation/git-ssh-push.txt
+--- a/Documentation/git-rpush.txt
++++ b/Documentation/git-ssh-push.txt
+@@ -1,19 +1,19 @@
+-git-rpush(1)
+-============
++git-ssh-push(1)
++===============
+ v0.1, May 2005
+ 
+ NAME
+ ----
+-git-rpush - Helper "server-side" program used by git-rpull
++git-ssh-push - Helper "server-side" program used by git-ssh-pull
+ 
+ 
+ SYNOPSIS
+ --------
+-'git-rpush'
++'git-ssh-push'
+ 
+ DESCRIPTION
+ -----------
+-Helper "server-side" program used by git-rpull.
++Helper "server-side" program used by git-ssh-pull.
+ 
+ 
+ Author
+diff --git a/Documentation/git.txt b/Documentation/git.txt
+--- a/Documentation/git.txt
++++ b/Documentation/git.txt
+@@ -148,7 +148,7 @@ link:git-resolve-script.html[git-resolve
+ link:git-tag-script.html[git-tag-script]::
+ 	An example script to create a tag object signed with GPG
+ 
+-link:git-rpull.html[git-rpull]::
++link:git-ssh-pull.html[git-ssh-pull]::
+ 	Pulls from a remote repository over ssh connection
+ 
+ Interogators:
+@@ -156,8 +156,8 @@ Interogators:
+ link:git-diff-helper.html[git-diff-helper]::
+ 	Generates patch format output for git-diff-*
+ 
+-link:git-rpush.html[git-rpush]::
+-	Helper "server-side" program used by git-rpull
++link:git-ssh-push.html[git-ssh-push]::
++	Helper "server-side" program used by git-ssh-pull
+ 
+ 
+ 
+diff --git a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -30,7 +30,7 @@ PROG=   git-update-index git-diff-files
+ 	git-checkout-cache git-diff-tree git-rev-tree git-ls-files \
+ 	git-check-files git-ls-tree git-merge-base git-merge-cache \
+ 	git-unpack-file git-export git-diff-cache git-convert-cache \
+-	git-http-pull git-rpush git-rpull git-rev-list git-mktag \
++	git-http-pull git-ssh-push git-ssh-pull git-rev-list git-mktag \
+ 	git-diff-helper git-tar-tree git-local-pull git-write-blob \
+ 	git-get-tar-commit-id git-mkdelta git-apply git-stripspace
+ 
+@@ -105,8 +105,8 @@ git-diff-cache: diff-cache.c
+ git-convert-cache: convert-cache.c
+ git-http-pull: http-pull.c pull.c
+ git-local-pull: local-pull.c pull.c
+-git-rpush: rsh.c
+-git-rpull: rsh.c pull.c
++git-ssh-push: rsh.c
++git-ssh-pull: rsh.c pull.c
+ git-rev-list: rev-list.c
+ git-mktag: mktag.c
+ git-diff-helper: diff-helper.c
+diff --git a/rpull.c b/ssh-pull.c
+similarity index 97%
+rename from rpull.c
+rename to ssh-pull.c
+--- a/rpull.c
++++ b/ssh-pull.c
+@@ -64,13 +64,13 @@ int main(int argc, char **argv)
+ 		arg++;
+ 	}
+ 	if (argc < arg + 2) {
+-		usage("git-rpull [-c] [-t] [-a] [-v] [-d] [--recover] commit-id url");
++		usage("git-ssh-pull [-c] [-t] [-a] [-v] [-d] [--recover] commit-id url");
+ 		return 1;
+ 	}
+ 	commit_id = argv[arg];
+ 	url = argv[arg + 1];
+ 
+-	if (setup_connection(&fd_in, &fd_out, "git-rpush", url, arg, argv + 1))
++	if (setup_connection(&fd_in, &fd_out, "git-ssh-push", url, arg, argv + 1))
+ 		return 1;
+ 
+ 	if (get_version())
+diff --git a/rpush.c b/ssh-push.c
+similarity index 93%
+rename from rpush.c
+rename to ssh-push.c
+--- a/rpush.c
++++ b/ssh-push.c
+@@ -16,7 +16,7 @@ int serve_object(int fd_in, int fd_out) 
+ 	do {
+ 		size = read(fd_in, sha1 + posn, 20 - posn);
+ 		if (size < 0) {
+-			perror("git-rpush: read ");
++			perror("git-ssh-push: read ");
+ 			return -1;
+ 		}
+ 		if (!size)
+@@ -30,7 +30,7 @@ int serve_object(int fd_in, int fd_out) 
+ 	buf = map_sha1_file(sha1, &objsize);
+ 	
+ 	if (!buf) {
+-		fprintf(stderr, "git-rpush: could not find %s\n", 
++		fprintf(stderr, "git-ssh-push: could not find %s\n", 
+ 			sha1_to_hex(sha1));
+ 		remote = -1;
+ 	}
+@@ -45,9 +45,9 @@ int serve_object(int fd_in, int fd_out) 
+ 		size = write(fd_out, buf + posn, objsize - posn);
+ 		if (size <= 0) {
+ 			if (!size) {
+-				fprintf(stderr, "git-rpush: write closed");
++				fprintf(stderr, "git-ssh-push: write closed");
+ 			} else {
+-				perror("git-rpush: write ");
++				perror("git-ssh-push: write ");
+ 			}
+ 			return -1;
+ 		}
+@@ -71,7 +71,7 @@ void service(int fd_in, int fd_out) {
+ 		retval = read(fd_in, &type, 1);
+ 		if (retval < 1) {
+ 			if (retval < 0)
+-				perror("rpush: read ");
++				perror("git-ssh-push: read ");
+ 			return;
+ 		}
+ 		if (type == 'v' && serve_version(fd_in, fd_out))
+@@ -91,12 +91,12 @@ int main(int argc, char **argv)
+                 arg++;
+         }
+         if (argc < arg + 2) {
+-		usage("git-rpush [-c] [-t] [-a] commit-id url");
++		usage("git-ssh-push [-c] [-t] [-a] commit-id url");
+                 return 1;
+         }
+ 	commit_id = argv[arg];
+ 	url = argv[arg + 1];
+-	if (setup_connection(&fd_in, &fd_out, "git-rpull", url, arg, argv + 1))
++	if (setup_connection(&fd_in, &fd_out, "git-ssh-pull", url, arg, argv + 1))
+ 		return 1;
+ 
+ 	service(fd_in, fd_out);