From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Apr 2019 02:14:45 +0000 (+0900)
Subject: Merge branch 'tg/stash-in-c-show-default-to-p-fix'
X-Git-Tag: v2.22.0-rc0~87
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8aed8034be53fc67bbc470357b124abd5679fb91?ds=inline;hp=-c

Merge branch 'tg/stash-in-c-show-default-to-p-fix'

A regression fix.

* tg/stash-in-c-show-default-to-p-fix:
stash: setup default diff output format if necessary
---

8aed8034be53fc67bbc470357b124abd5679fb91
diff --combined builtin/stash.c
index ca0b4cd33e,b008fe24ed..8b82053f72
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@@ -1,4 -1,3 +1,4 @@@
 +#define USE_THE_INDEX_COMPATIBILITY_MACROS
  #include "builtin.h"
  #include "config.h"
  #include "parse-options.h"
@@@ -433,7 -432,7 +433,7 @@@ static int do_apply_stash(const char *p
  	if (info->has_u && restore_untracked(&info->u_tree))
  		return error(_("could not restore untracked files from stash"));
  
 -	init_merge_options(&o);
 +	init_merge_options(&o, the_repository);
  
  	o.branch1 = "Updated upstream";
  	o.branch2 = "Stashed changes";
@@@ -528,7 -527,7 +528,7 @@@ static int apply_stash(int argc, const 
  	return ret;
  }
  
 -static int do_drop_stash(const char *prefix, struct stash_info *info, int quiet)
 +static int do_drop_stash(struct stash_info *info, int quiet)
  {
  	int ret;
  	struct child_process cp_reflog = CHILD_PROCESS_INIT;
@@@ -598,7 -597,7 +598,7 @@@ static int drop_stash(int argc, const c
  
  	assert_stash_ref(&info);
  
 -	ret = do_drop_stash(prefix, &info, quiet);
 +	ret = do_drop_stash(&info, quiet);
  	free_stash_info(&info);
  	return ret;
  }
@@@ -627,7 -626,7 +627,7 @@@ static int pop_stash(int argc, const ch
  		printf_ln(_("The stash entry is kept in case "
  			    "you need it again."));
  	else
 -		ret = do_drop_stash(prefix, &info, quiet);
 +		ret = do_drop_stash(&info, quiet);
  
  	free_stash_info(&info);
  	return ret;
@@@ -664,7 -663,7 +664,7 @@@ static int branch_stash(int argc, cons
  	if (!ret)
  		ret = do_apply_stash(prefix, &info, 1, 0);
  	if (!ret && info.is_stash_ref)
 -		ret = do_drop_stash(prefix, &info, 0);
 +		ret = do_drop_stash(&info, 0);
  
  	free_stash_info(&info);
  
@@@ -761,6 -760,10 +761,10 @@@ static int show_stash(int argc, const c
  		free_stash_info(&info);
  		usage_with_options(git_stash_show_usage, options);
  	}
+ 	if (!rev.diffopt.output_format) {
+ 		rev.diffopt.output_format = DIFF_FORMAT_PATCH;
+ 		diff_setup_done(&rev.diffopt);
+ 	}
  
  	rev.diffopt.flags.recursive = 1;
  	setup_diff_pager(&rev.diffopt);
@@@ -815,8 -818,7 +819,8 @@@ static int store_stash(int argc, const 
  		return -1;
  	}
  
 -	if (get_oid_with_context(argv[0], quiet ? GET_OID_QUIETLY : 0, &obj,
 +	if (get_oid_with_context(the_repository,
 +				 argv[0], quiet ? GET_OID_QUIETLY : 0, &obj,
  				 &dummy)) {
  		if (!quiet)
  			fprintf_ln(stderr, _("Cannot update %s with %s"),
@@@ -828,11 -830,11 +832,11 @@@
  }
  
  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].original);
  }
  
  /*
@@@ -842,7 -844,7 +846,7 @@@
   * = 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;
@@@ -855,12 -857,12 +859,12 @@@
  	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 */
@@@ -883,12 -885,11 +887,12 @@@
   * = 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;
  	struct object_id dummy;
 +	int ret = 0;
  
  	/* No initial commit. */
  	if (get_oid("HEAD", &dummy))
@@@ -898,7 -899,7 +902,7 @@@
  		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;
@@@ -908,28 -909,22 +912,28 @@@
  	diff_setup_done(&rev.diffopt);
  
  	result = run_diff_index(&rev, 1);
 -	if (diff_result_code(&rev.diffopt, result))
 -		return 1;
 +	if (diff_result_code(&rev.diffopt, result)) {
 +		ret = 1;
 +		goto done;
 +	}
  
  	object_array_clear(&rev.pending);
  	result = run_diff_files(&rev, 0);
 -	if (diff_result_code(&rev.diffopt, result))
 -		return 1;
 +	if (diff_result_code(&rev.diffopt, result)) {
 +		ret = 1;
 +		goto done;
 +	}
  
 -	return 0;
 +done:
 +	clear_pathspec(&rev.prune_data);
 +	return ret;
  }
  
  /*
   * 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;
@@@ -983,7 -978,7 +987,7 @@@ done
  	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;
@@@ -1042,7 -1037,7 +1046,7 @@@ done
  	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;
@@@ -1051,7 -1046,6 +1055,7 @@@
  	struct index_state istate = { NULL };
  
  	init_revisions(&rev, NULL);
 +	copy_pathspec(&rev.prune_data, ps);
  
  	set_alternate_index_output(stash_index_path.buf);
  	if (reset_tree(&info->i_tree, 0, 0)) {
@@@ -1060,6 -1054,7 +1064,6 @@@
  	}
  	set_alternate_index_output(NULL);
  
 -	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;
@@@ -1098,13 -1093,12 +1102,13 @@@ done
  	discard_index(&istate);
  	UNLEAK(rev);
  	object_array_clear(&rev.pending);
 +	clear_pathspec(&rev.prune_data);
  	strbuf_release(&diff_output);
  	remove_path(stash_index_path.buf);
  	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)
@@@ -1236,10 -1230,10 +1240,10 @@@ static int create_stash(int argc, cons
  	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));
@@@ -1248,7 -1242,7 +1252,7 @@@
  	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;
@@@ -1268,15 -1262,15 +1272,15 @@@
  	}
  
  	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);
@@@ -1323,7 -1317,7 +1327,7 @@@
  			  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;
@@@ -1337,7 -1331,7 +1341,7 @@@
  			}
  		}
  		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;
@@@ -1476,9 -1470,8 +1480,9 @@@ static int push_stash(int argc, const c
  				     git_stash_push_usage,
  				     0);
  
 -	parse_pathspec(&ps, 0, PATHSPEC_PREFER_FULL, prefix, argv);
 -	return do_push_stash(ps, stash_msg, quiet, keep_index, patch_mode,
 +	parse_pathspec(&ps, 0, PATHSPEC_PREFER_FULL | PATHSPEC_PREFIX_ORIGIN,
 +		       prefix, argv);
 +	return do_push_stash(&ps, stash_msg, quiet, keep_index, patch_mode,
  			     include_untracked);
  }
  
@@@ -1515,7 -1508,7 +1519,7 @@@ static int save_stash(int argc, const c
  		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);