Phil Hord <ho...@cisco.com> writes:
> Add a failing test to confirm a conflicted stash apply
> invokes rerere to record the conflicts and resolve the
> the files it can.
> mergetool may be confused by a left-over
> state from previous rerere activity causing it to
> think no files have conflicts even though they do.
> This condition is not verified by this test since a
> subsequent commit will change the behavior to enable
> rerere for stash conflicts.
> Also, the next test expected us to finish up with a reset,
> which is impossible to do if we fail (as we must) and it's
> an unreasonable expectation anyway. Begin the next test
> with a reset of his own instead.
> Signed-off-by: Phil Hord <ho...@cisco.com>
> t/t7610-mergetool.sh | 38 ++++++++++++++++++++++++++++++++++++++
> 1 file changed, 38 insertions(+)
> diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
> index f5e16fc..725f316 100755
> --- a/t/t7610-mergetool.sh
> +++ b/t/t7610-mergetool.sh
> test_expect_success 'mergetool takes partial path' '
> + git reset --hard
I'll add " &&" at the end and queue. Thanks.
> git config rerere.enabled false &&
> git checkout -b test12 branch1 &&
> git submodule update -N &&
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html