diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-10-15 07:47:59 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-10-15 07:47:59 +0300 |
commit | 280bd445515acffb83231dfee79c21719ad3bc7b (patch) | |
tree | 170dbd8e836c6111200970d172743a531f5e7387 /builtin/stash.c | |
parent | 08da6496b61341ec45eac36afcc8f94242763468 (diff) | |
parent | b6570477193b8cf75ce625b8d540e28f71ece3fe (diff) |
Merge branch 'en/merge-recursive-cleanup'
The merge-recursive machiery is one of the most complex parts of
the system that accumulated cruft over time. This large series
cleans up the implementation quite a bit.
* en/merge-recursive-cleanup: (26 commits)
merge-recursive: fix the fix to the diff3 common ancestor label
merge-recursive: fix the diff3 common ancestor label for virtual commits
merge-recursive: alphabetize include list
merge-recursive: add sanity checks for relevant merge_options
merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
merge-recursive: split internal fields into a separate struct
merge-recursive: avoid losing output and leaking memory holding that output
merge-recursive: comment and reorder the merge_options fields
merge-recursive: consolidate unnecessary fields in merge_options
merge-recursive: move some definitions around to clean up the header
merge-recursive: rename merge_options argument to opt in header
merge-recursive: rename 'mrtree' to 'result_tree', for clarity
merge-recursive: use common name for ancestors/common/base_list
merge-recursive: fix some overly long lines
cache-tree: share code between functions writing an index as a tree
merge-recursive: don't force external callers to do our logging
merge-recursive: remove useless parameter in merge_trees()
merge-recursive: exit early if index != head
Ensure index matches head before invoking merge machinery, round N
merge-recursive: remove another implicit dependency on the_repository
...
Diffstat (limited to 'builtin/stash.c')
-rw-r--r-- | builtin/stash.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index 4fc44b35e4..bb4f6d8d76 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -427,6 +427,8 @@ static int do_apply_stash(const char *prefix, struct stash_info *info, return error(_("could not save index tree")); reset_head(); + discard_cache(); + read_cache(); } } |