summaryrefslogtreecommitdiff
path: root/t/t2025-worktree-add.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-02 15:30:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-02 15:30:45 -0700
commitc18ac30e9ebcf7b7e2fbd992744e63c71089a12a (patch)
tree5eb5c1185b0d8bce39356abd801f0a9d7bf802ab /t/t2025-worktree-add.sh
parentMerge branch 'js/rebase-merge-octopus' (diff)
parentmerge: fix misleading pre-merge check documentation (diff)
downloadtgif-c18ac30e9ebcf7b7e2fbd992744e63c71089a12a.tar.xz
Merge branch 'en/dirty-merge-fixes'
The recursive merge strategy did not properly ensure there was no change between HEAD and the index before performing its operation, which has been corrected. * en/dirty-merge-fixes: merge: fix misleading pre-merge check documentation merge-recursive: enforce rule that index matches head before merging t6044: add more testcases with staged changes before a merge is invoked merge-recursive: fix assumption that head tree being merged is HEAD merge-recursive: make sure when we say we abort that we actually abort t6044: add a testcase for index matching head, when head doesn't match HEAD t6044: verify that merges expected to abort actually abort index_has_changes(): avoid assuming operating on the_index read-cache.c: move index_has_changes() from merge.c
Diffstat (limited to 't/t2025-worktree-add.sh')
0 files changed, 0 insertions, 0 deletions