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

Re: [PATCH v13 18/27] stash: convert create to builtin

From
Thomas Gummerer <t.gummerer@gmail.com>
Date
Mar 9, 2019, 18:26 UTC
Message-ID
<20190309182610.GD31533@hank.intra.tgummerer.com>
In-Reply-To
<nycvar.QRO.7.76.6.1903081630040.41@tvgsbejvaqbjf.bet>
On 03/08, Johannes Schindelin wrote:
Show 19 quoted lines
> Hi Peff,
> 
> On Thu, 7 Mar 2019, Jeff King wrote:
> 
> > On Mon, Feb 25, 2019 at 11:16:22PM +0000, Thomas Gummerer wrote:
> > 
> > > +static void add_pathspecs(struct argv_array *args,
> > > +			  struct pathspec ps) {
> > 
> > Here and elsewhere in the series, I notice that we pass the pathspec
> > struct by value, which is quite unusual for our codebase (and
> > potentially confusing, if any of the callers were to mutate the pointers
> > in the struct).
> > 
> > Is there any reason this shouldn't be "const struct pathspec *ps" pretty
> > much throughout the file?
> 
> I am quite certain that this is merely an oversight. It totes slipped
> by my review, for example.
Yep, it slipped by me as well.  Here's a patch to fix it:
--- >8 ---
Subject: [PATCH 1/2] stash: pass pathspec as pointer

Passing the pathspec by value is potentially confusing, as the copy is only a shallow copy, so save the overhead of the copy, and pass the pathspec struct as a pointer.

In addition use copy_pathspec to copy the pathspec into rev.prune_data, so the copy is a proper deep copy, and owned by the revision API, as that's what the API expects.

Reported-by: Jeff King <peff@peff.net>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
---
 builtin/stash.c | 50 ++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/builtin/stash.c b/builtin/stash.c
index 1bfa24030c..6eb67c75c3 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -826,11 +826,11 @@ static int store_stash(int argc, const char **argv, const char *prefix)
 }
 
 static void add_pathspecs(struct argv_array *args,
-			  struct pathspec ps) {
+			  const struct pathspec *ps) {
 	int i;
 
-	for (i = 0; i < ps.nr; i++)
-		argv_array_push(args, ps.items[i].match);
+	for (i = 0; i < ps->nr; i++)
+		argv_array_push(args, ps->items[i].match);
 }
 
 /*
@@ -840,7 +840,7 @@ static void add_pathspecs(struct argv_array *args,
  * = 0 if there are not any untracked files
  * > 0 if there are untracked files
  */
-static int get_untracked_files(struct pathspec ps, int include_untracked,
+static int get_untracked_files(const struct pathspec *ps, int include_untracked,
 			       struct strbuf *untracked_files)
 {
 	int i;
@@ -853,12 +853,12 @@ static int get_untracked_files(struct pathspec ps, int include_untracked,
 	if (include_untracked != INCLUDE_ALL_FILES)
 		setup_standard_excludes(&dir);
 
-	seen = xcalloc(ps.nr, 1);
+	seen = xcalloc(ps->nr, 1);
 
-	max_len = fill_directory(&dir, the_repository->index, &ps);
+	max_len = fill_directory(&dir, the_repository->index, ps);
 	for (i = 0; i < dir.nr; i++) {
 		struct dir_entry *ent = dir.entries[i];
-		if (dir_path_match(&the_index, ent, &ps, max_len, seen)) {
+		if (dir_path_match(&the_index, ent, ps, max_len, seen)) {
 			found++;
 			strbuf_addstr(untracked_files, ent->name);
 			/* NUL-terminate: will be fed to update-index -z */
@@ -881,7 +881,7 @@ static int get_untracked_files(struct pathspec ps, int include_untracked,
  * = 0 if there are no changes.
  * > 0 if there are changes.
  */
-static int check_changes_tracked_files(struct pathspec ps)
+static int check_changes_tracked_files(const struct pathspec *ps)
 {
 	int result;
 	struct rev_info rev;
@@ -895,7 +895,7 @@ static int check_changes_tracked_files(struct pathspec ps)
 		return -1;
 
 	init_revisions(&rev, NULL);
-	rev.prune_data = ps;
+	copy_pathspec(&rev.prune_data, ps);
 
 	rev.diffopt.flags.quick = 1;
 	rev.diffopt.flags.ignore_submodules = 1;
@@ -920,7 +920,7 @@ static int check_changes_tracked_files(struct pathspec ps)
  * The function will fill `untracked_files` with the names of untracked files
  * It will return 1 if there were any changes and 0 if there were not.
  */
-static int check_changes(struct pathspec ps, int include_untracked,
+static int check_changes(const struct pathspec *ps, int include_untracked,
 			 struct strbuf *untracked_files)
 {
 	int ret = 0;
@@ -974,7 +974,7 @@ static int save_untracked_files(struct stash_info *info, struct strbuf *msg,
 	return ret;
 }
 
-static int stash_patch(struct stash_info *info, struct pathspec ps,
+static int stash_patch(struct stash_info *info, const struct pathspec *ps,
 		       struct strbuf *out_patch, int quiet)
 {
 	int ret = 0;
@@ -1033,7 +1033,7 @@ static int stash_patch(struct stash_info *info, struct pathspec ps,
 	return ret;
 }
 
-static int stash_working_tree(struct stash_info *info, struct pathspec ps)
+static int stash_working_tree(struct stash_info *info, const struct pathspec *ps)
 {
 	int ret = 0;
 	struct rev_info rev;
@@ -1050,7 +1050,7 @@ static int stash_working_tree(struct stash_info *info, struct pathspec ps)
 	}
 	set_alternate_index_output(NULL);
 
-	rev.prune_data = ps;
+	copy_pathspec(&rev.prune_data, ps);
 	rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
 	rev.diffopt.format_callback = add_diff_to_buf;
 	rev.diffopt.format_callback_data = &diff_output;
@@ -1094,7 +1094,7 @@ static int stash_working_tree(struct stash_info *info, struct pathspec ps)
 	return ret;
 }
 
-static int do_create_stash(struct pathspec ps, struct strbuf *stash_msg_buf,
+static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_buf,
 			   int include_untracked, int patch_mode,
 			   struct stash_info *info, struct strbuf *patch,
 			   int quiet)
@@ -1226,10 +1226,10 @@ static int create_stash(int argc, const char **argv, const char *prefix)
 	strbuf_join_argv(&stash_msg_buf, argc - 1, ++argv, ' ');
 
 	memset(&ps, 0, sizeof(ps));
-	if (!check_changes_tracked_files(ps))
+	if (!check_changes_tracked_files(&ps))
 		return 0;
 
-	ret = do_create_stash(ps, &stash_msg_buf, 0, 0, &info,
+	ret = do_create_stash(&ps, &stash_msg_buf, 0, 0, &info,
 			      NULL, 0);
 	if (!ret)
 		printf_ln("%s", oid_to_hex(&info.w_commit));
@@ -1238,7 +1238,7 @@ static int create_stash(int argc, const char **argv, const char *prefix)
 	return ret;
 }
 
-static int do_push_stash(struct pathspec ps, const char *stash_msg, int quiet,
+static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int quiet,
 			 int keep_index, int patch_mode, int include_untracked)
 {
 	int ret = 0;
@@ -1258,15 +1258,15 @@ static int do_push_stash(struct pathspec ps, const char *stash_msg, int quiet,
 	}
 
 	read_cache_preload(NULL);
-	if (!include_untracked && ps.nr) {
+	if (!include_untracked && ps->nr) {
 		int i;
-		char *ps_matched = xcalloc(ps.nr, 1);
+		char *ps_matched = xcalloc(ps->nr, 1);
 
 		for (i = 0; i < active_nr; i++)
-			ce_path_match(&the_index, active_cache[i], &ps,
+			ce_path_match(&the_index, active_cache[i], ps,
 				      ps_matched);
 
-		if (report_path_error(ps_matched, &ps, NULL)) {
+		if (report_path_error(ps_matched, ps, NULL)) {
 			fprintf_ln(stderr, _("Did you forget to 'git add'?"));
 			ret = -1;
 			free(ps_matched);
@@ -1313,7 +1313,7 @@ static int do_push_stash(struct pathspec ps, const char *stash_msg, int quiet,
 			  stash_msg_buf.buf);
 
 	if (!patch_mode) {
-		if (include_untracked && !ps.nr) {
+		if (include_untracked && !ps->nr) {
 			struct child_process cp = CHILD_PROCESS_INIT;
 
 			cp.git_cmd = 1;
@@ -1327,7 +1327,7 @@ static int do_push_stash(struct pathspec ps, const char *stash_msg, int quiet,
 			}
 		}
 		discard_cache();
-		if (ps.nr) {
+		if (ps->nr) {
 			struct child_process cp_add = CHILD_PROCESS_INIT;
 			struct child_process cp_diff = CHILD_PROCESS_INIT;
 			struct child_process cp_apply = CHILD_PROCESS_INIT;
@@ -1467,7 +1467,7 @@ static int push_stash(int argc, const char **argv, const char *prefix)
 				     0);
 
 	parse_pathspec(&ps, 0, PATHSPEC_PREFER_FULL, prefix, argv);
-	return do_push_stash(ps, stash_msg, quiet, keep_index, patch_mode,
+	return do_push_stash(&ps, stash_msg, quiet, keep_index, patch_mode,
 			     include_untracked);
 }
 
@@ -1504,7 +1504,7 @@ static int save_stash(int argc, const char **argv, const char *prefix)
 		stash_msg = strbuf_join_argv(&stash_msg_buf, argc, argv, ' ');
 
 	memset(&ps, 0, sizeof(ps));
-	ret = do_push_stash(ps, stash_msg, quiet, keep_index,
+	ret = do_push_stash(&ps, stash_msg, quiet, keep_index,
 			    patch_mode, include_untracked);
 
 	strbuf_release(&stash_msg_buf);

-- 
2.21.0.474.g541d9dca55
Previous: Johannes SchindelinNext: Junio C Hamano
Message 73 of 106 in “Convert "git stash" to C builtin”
  1. 00/26 Convert "git stash" to C builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  2. 01/26 sha1-name.c: add `get_oidf()` which acts like `get_oid()`Paul-Sebastian Ungureanu, Dec 20, 2018
  3. 02/26 strbuf.c: add `strbuf_join_argv()`Paul-Sebastian Ungureanu, Dec 20, 2018
  4. 03/26 strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`Paul-Sebastian Ungureanu, Dec 20, 2018
  5. 05/26 stash: improve option parsing test coveragePaul-Sebastian Ungureanu, Dec 20, 2018
  6. 04/26 ident: add the ability to provide a "fallback identity"Paul-Sebastian Ungureanu, Dec 20, 2018
  7. Junio C HamanoDec 26, 2018
  8. Johannes SchindelinDec 27, 2018
  9. Junio C HamanoDec 28, 2018
  10. 06/26 t3903: modernize stylePaul-Sebastian Ungureanu, Dec 20, 2018
  11. 08/26 stash: add tests for `git stash show` configPaul-Sebastian Ungureanu, Dec 20, 2018
  12. 09/26 stash: mention options in `show` synopsisPaul-Sebastian Ungureanu, Dec 20, 2018
  13. 07/26 stash: rename test cases to be more descriptivePaul-Sebastian Ungureanu, Dec 20, 2018
  14. 10/26 stash: convert apply to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  15. 12/26 stash: convert branch to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  16. 15/26 stash: convert show to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  17. 16/26 stash: convert store to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  18. 14/26 stash: convert list to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  19. 13/26 stash: convert pop to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  20. 11/26 stash: convert drop and clear to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  21. 19/26 stash: make push -q quietPaul-Sebastian Ungureanu, Dec 20, 2018
  22. 22/26 stash: replace all `write-tree` child processes with API callsPaul-Sebastian Ungureanu, Dec 20, 2018
  23. 21/26 stash: optimize `get_untracked_files()` and `check_changes()`Paul-Sebastian Ungureanu, Dec 20, 2018
  24. Thomas GummererJan 6, 2019
  25. 26/26 tests: add a special setup where stash.useBuiltin is offPaul-Sebastian Ungureanu, Dec 20, 2018
  26. 24/26 stash: add back the original, scripted `git stash`Paul-Sebastian Ungureanu, Dec 20, 2018
  27. 20/26 stash: convert save to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  28. 18/26 stash: convert push to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  29. SZEDER GáborFeb 8, 2019
  30. Thomas GummererFeb 10, 2019
  31. SZEDER GáborFeb 11, 2019
  32. Thomas GummererFeb 12, 2019
  33. SZEDER GáborFeb 19, 2019
  34. Johannes SchindelinFeb 19, 2019
  35. Junio C HamanoFeb 19, 2019
  36. Johannes SchindelinFeb 20, 2019
  37. Thomas GummererFeb 19, 2019
  38. Junio C HamanoFeb 20, 2019
  39. Johannes SchindelinFeb 20, 2019
  40. Thomas GummererFeb 20, 2019
  41. 00/27 Convert "git stash" to C builtinThomas Gummerer, Feb 25, 2019
  42. 01/27 sha1-name.c: add `get_oidf()` which acts like `get_oid()`Thomas Gummerer, Feb 25, 2019
  43. 02/27 strbuf.c: add `strbuf_join_argv()`Thomas Gummerer, Feb 25, 2019
  44. 03/27 strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`Thomas Gummerer, Feb 25, 2019
  45. 05/27 stash: improve option parsing test coverageThomas Gummerer, Feb 25, 2019
  46. 04/27 ident: add the ability to provide a "fallback identity"Thomas Gummerer, Feb 25, 2019
  47. 06/27 t3903: modernize styleThomas Gummerer, Feb 25, 2019
  48. 07/27 t3903: add test for --intent-to-add fileThomas Gummerer, Feb 25, 2019
  49. 08/27 stash: rename test cases to be more descriptiveThomas Gummerer, Feb 25, 2019
  50. 09/27 stash: add tests for `git stash show` configThomas Gummerer, Feb 25, 2019
  51. 10/27 stash: mention options in `show` synopsisThomas Gummerer, Feb 25, 2019
  52. 11/27 stash: convert apply to builtinThomas Gummerer, Feb 25, 2019
  53. regression in new built-in stash + fsmonitor (was Re: [PATCH v13 11/27] stash: convert apply to builtin)Ævar Arnfjörð Bjarmason, Mar 14, 2019
  54. Johannes SchindelinMar 14, 2019
  55. Ævar Arnfjörð BjarmasonMar 14, 2019
  56. Johannes SchindelinMar 14, 2019
  57. Ævar Arnfjörð BjarmasonMar 14, 2019
  58. Ben PeartMar 15, 2019
  59. 12/27 stash: convert drop and clear to builtinThomas Gummerer, Feb 25, 2019
  60. Jeff KingMar 7, 2019
  61. Thomas GummererMar 9, 2019
  62. Jeff KingMar 10, 2019
  63. Junio C HamanoMar 11, 2019
  64. Thomas GummererMar 11, 2019
  65. 13/27 stash: convert branch to builtinThomas Gummerer, Feb 25, 2019
  66. 14/27 stash: convert pop to builtinThomas Gummerer, Feb 25, 2019
  67. 15/27 stash: convert list to builtinThomas Gummerer, Feb 25, 2019
  68. 16/27 stash: convert show to builtinThomas Gummerer, Feb 25, 2019
  69. 17/27 stash: convert store to builtinThomas Gummerer, Feb 25, 2019
  70. 18/27 stash: convert create to builtinThomas Gummerer, Feb 25, 2019
  71. Jeff KingMar 7, 2019
  72. Johannes SchindelinMar 8, 2019
  73. Thomas GummererMar 9, 2019
  74. Junio C HamanoMar 11, 2019
  75. Junio C HamanoMar 11, 2019
  76. Thomas GummererMar 11, 2019
  77. stash: pass pathspec as pointerThomas Gummerer, Mar 11, 2019
  78. Junio C HamanoMar 12, 2019
  79. Johannes SchindelinMar 12, 2019
  80. Thomas GummererMar 12, 2019
  81. Junio C HamanoMar 13, 2019
  82. Johannes SchindelinMar 13, 2019
  83. Thomas GummererMar 15, 2019
  84. 19/27 stash: convert push to builtinThomas Gummerer, Feb 25, 2019
  85. 20/27 stash: make push -q quietThomas Gummerer, Feb 25, 2019
  86. 21/27 stash: convert save to builtinThomas Gummerer, Feb 25, 2019
  87. 22/27 stash: optimize `get_untracked_files()` and `check_changes()`Thomas Gummerer, Feb 25, 2019
  88. 23/27 stash: replace all `write-tree` child processes with API callsThomas Gummerer, Feb 25, 2019
  89. 24/27 stash: convert `stash--helper.c` into `stash.c`Thomas Gummerer, Feb 25, 2019
  90. 26/27 stash: optionally use the scripted version againThomas Gummerer, Feb 25, 2019
  91. 25/27 stash: add back the original, scripted `git stash`Thomas Gummerer, Feb 25, 2019
  92. 27/27 tests: add a special setup where stash.useBuiltin is offThomas Gummerer, Feb 25, 2019
  93. Johannes SchindelinFeb 26, 2019
  94. Thomas GummererFeb 26, 2019
  95. Ævar Arnfjörð BjarmasonFeb 26, 2019
  96. Johannes SchindelinFeb 26, 2019
  97. Junio C HamanoMar 3, 2019
  98. Junio C HamanoMar 3, 2019
  99. Thomas GummererMar 3, 2019
  100. 25/26 stash: optionally use the scripted version againPaul-Sebastian Ungureanu, Dec 20, 2018
  101. Thomas GummererJan 6, 2019
  102. 23/26 stash: convert `stash--helper.c` into `stash.c`Paul-Sebastian Ungureanu, Dec 20, 2018
  103. 17/26 stash: convert create to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  104. Junio C HamanoJan 3, 2019
  105. Johannes SchindelinJan 18, 2019
  106. Junio C HamanoJan 18, 2019

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.