git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v4 19/19] pull: remove redirection to git-pull.sh

From
Paul Tan <pyokagan@gmail.com>
Date
Jun 18, 2015, 10:54 UTC
Message-ID
<1434624852-6869-20-git-send-email-pyokagan@gmail.com>
In-Reply-To
<1434624852-6869-1-git-send-email-pyokagan@gmail.com>

At the beginning of the rewrite of git-pull.sh to C, we introduced a redirection to git-pull.sh if the environment variable _GIT_USE_BUILTIN_PULL was not defined in order to not break test scripts that relied on a functional git-pull.

Now that all of git-pull's functionality has been re-implemented in builtin/pull.c, remove this redirection, and retire the old git-pull.sh into contrib/examples/.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
---
 Makefile                                    | 1 -
 builtin/pull.c                              | 7 -------
 git-pull.sh => contrib/examples/git-pull.sh | 0
 3 files changed, 8 deletions(-)
 rename git-pull.sh => contrib/examples/git-pull.sh (100%)
diff --git a/Makefile b/Makefile
index 17e1136..93e4fa2 100644
--- a/Makefile
+++ b/Makefile
@@ -474,7 +474,6 @@ SCRIPT_SH += git-merge-octopus.sh
 SCRIPT_SH += git-merge-one-file.sh
 SCRIPT_SH += git-merge-resolve.sh
 SCRIPT_SH += git-mergetool.sh
-SCRIPT_SH += git-pull.sh
 SCRIPT_SH += git-quiltimport.sh
 SCRIPT_SH += git-rebase.sh
 SCRIPT_SH += git-remote-testgit.sh
diff --git a/builtin/pull.c b/builtin/pull.c
index 421a34d..722a83c 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -798,13 +798,6 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
 	unsigned char orig_head[GIT_SHA1_RAWSZ], curr_head[GIT_SHA1_RAWSZ];
 	unsigned char rebase_fork_point[GIT_SHA1_RAWSZ];
 
-	if (!getenv("_GIT_USE_BUILTIN_PULL")) {
-		const char *path = mkpath("%s/git-pull", git_exec_path());
-
-		if (sane_execvp(path, (char **)argv) < 0)
-			die_errno("could not exec %s", path);
-	}
-
 	if (!getenv("GIT_REFLOG_ACTION"))
 		set_reflog_message(argc, argv);
 
diff --git a/git-pull.sh b/contrib/examples/git-pull.sh
similarity index 100%
rename from git-pull.sh
rename to contrib/examples/git-pull.sh

-- 
2.1.4
Previous: Paul TanNext: Junio C Hamano
Message 20 of 22 in “Make git-pull a builtin”
  1. 00/19 Make git-pull a builtinPaul Tan, Jun 18, 2015
  2. 01/19 parse-options-cb: implement parse_opt_passthru()Paul Tan, Jun 18, 2015
  3. 02/19 parse-options-cb: implement parse_opt_passthru_argv()Paul Tan, Jun 18, 2015
  4. 03/19 argv-array: implement argv_array_pushv()Paul Tan, Jun 18, 2015
  5. 04/19 pull: implement skeletal builtin pullPaul Tan, Jun 18, 2015
  6. 05/19 pull: implement fetch + mergePaul Tan, Jun 18, 2015
  7. 06/19 pull: pass verbosity, --progress flags to fetch and mergePaul Tan, Jun 18, 2015
  8. 07/19 pull: pass git-merge's options to git-mergePaul Tan, Jun 18, 2015
  9. 08/19 pull: pass git-fetch's options to git-fetchPaul Tan, Jun 18, 2015
  10. 09/19 pull: error on no merge candidatesPaul Tan, Jun 18, 2015
  11. 10/19 pull: support pull.ff configPaul Tan, Jun 18, 2015
  12. 11/19 pull: check if in unresolved merge statePaul Tan, Jun 18, 2015
  13. 12/19 pull: fast-forward working tree if head is updatedPaul Tan, Jun 18, 2015
  14. 13/19 pull: implement pulling into an unborn branchPaul Tan, Jun 18, 2015
  15. 14/19 pull: set reflog messagePaul Tan, Jun 18, 2015
  16. 15/19 pull: teach git pull about --rebasePaul Tan, Jun 18, 2015
  17. 16/19 pull: configure --rebase via branch.<name>.rebase or pull.rebasePaul Tan, Jun 18, 2015
  18. 17/19 pull --rebase: exit early when the working directory is dirtyPaul Tan, Jun 18, 2015
  19. 18/19 pull --rebase: error on no merge candidate casesPaul Tan, Jun 18, 2015
  20. 19/19 pull: remove redirection to git-pull.shPaul Tan, Jun 18, 2015
  21. Junio C HamanoJun 18, 2015
  22. Paul TanJun 19, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.