]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a4d2e8a eaad121)
Merge branch 'sg/t3420-do-not-grep-in-missing-file'
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Jul 2026 22:50:25 +0000 (15:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Jul 2026 22:50:25 +0000 (15:50 -0700)
commit83fd231fc6831f56953c93ee5778bfb83ee05582
tree771760ad4b68fa3fbbe844de42fbe0ba0c4df981tree | snapshot
parenta4d2e8a074a9ee95dfef1f7da21b5fbe0108f3f6commit | diff
parenteaad121fefb3c5845a52aba8952435096a172154commit | diff
Merge branch 'sg/t3420-do-not-grep-in-missing-file'

A test checking interactions between git rebase --quit and
autostash in t3420-rebase-autostash.sh has been corrected to use
test_path_is_missing instead of ! grep on a file that shouldn't
exist in the conflicted state.

* sg/t3420-do-not-grep-in-missing-file:
  t3420-rebase-autostash: don't try to grep non-existing files
t/t3420-rebase-autostash.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.