diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-28 15:15:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-28 15:15:42 -0700 |
| commit | b6b210c5e1705c28274ac2e83a500644c126dd9a (patch) | |
| tree | 979bb6f55b5b769f7e8053bcc52fc49e42a4802d /t/t6424-merge-unrelated-index-changes.sh | |
| parent | Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-f... (diff) | |
| parent | refs: drop "broken" flag from for_each_fullref_in() (diff) | |
| download | tgif-b6b210c5e1705c28274ac2e83a500644c126dd9a.tar.xz | |
Merge branch 'jk/ref-paranoia' into jt/no-abuse-alternate-odb-for-submodules
* jk/ref-paranoia: (71 commits)
refs: drop "broken" flag from for_each_fullref_in()
ref-filter: drop broken-ref code entirely
ref-filter: stop setting FILTER_REFS_INCLUDE_BROKEN
repack, prune: drop GIT_REF_PARANOIA settings
refs: turn on GIT_REF_PARANOIA by default
refs: omit dangling symrefs when using GIT_REF_PARANOIA
refs: add DO_FOR_EACH_OMIT_DANGLING_SYMREFS flag
refs-internal.h: reorganize DO_FOR_EACH_* flag documentation
refs-internal.h: move DO_FOR_EACH_* flags next to each other
t5312: be more assertive about command failure
t5312: test non-destructive repack
t5312: create bogus ref as necessary
t5312: drop "verbose" helper
t5600: provide detached HEAD for corruption failures
t5516: don't use HEAD ref for invalid ref-deletion tests
t7900: clean up some more broken refs
The eighth batch
t0000: avoid masking git exit value through pipes
tree-diff: fix leak when not HAVE_ALLOCA_H
pack-revindex.h: correct the time complexity descriptions
...
Diffstat (limited to 't/t6424-merge-unrelated-index-changes.sh')
| -rwxr-xr-x | t/t6424-merge-unrelated-index-changes.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t6424-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh index 5e3779ebc9..89dd544f38 100755 --- a/t/t6424-merge-unrelated-index-changes.sh +++ b/t/t6424-merge-unrelated-index-changes.sh @@ -132,6 +132,7 @@ test_expect_success 'merge-recursive, when index==head but head!=HEAD' ' # Make index match B git diff C B -- | git apply --cached && + test_when_finished "git clean -fd" && # Do not leave untracked around # Merge B & F, with B as "head" git merge-recursive A -- B F > out && test_i18ngrep "Already up to date" out |