From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Jul 2026 22:50:25 +0000 (-0700)
Subject: Merge branch 'sg/t3420-do-not-grep-in-missing-file'
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=83fd231fc6831f56953c93ee5778bfb83ee05582;p=thirdparty%2Fgit.git

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
---

83fd231fc6831f56953c93ee5778bfb83ee05582