mirror of
https://github.com/git/git.git
synced 2024-05-25 07:46:15 +02:00
3d09c22869
The previous commit introduced ---merge-base a way to take the diff between the working tree or index and the merge base between an arbitrary commit and HEAD. It makes sense to extend this option to support the case where two commits are given too and behave in a manner identical to `git diff A...B`. Introduce the --merge-base flag as an alternative to triple-dot notation. Thus, we would be able to write the above as `git diff --merge-base A B`. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
194 lines
5.3 KiB
Bash
Executable File
194 lines
5.3 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='behavior of diff with symmetric-diff setups and --merge-base'
|
|
|
|
. ./test-lib.sh
|
|
|
|
# build these situations:
|
|
# - normal merge with one merge base (br1...b2r);
|
|
# - criss-cross merge ie 2 merge bases (br1...master);
|
|
# - disjoint subgraph (orphan branch, br3...master).
|
|
#
|
|
# B---E <-- master
|
|
# / \ /
|
|
# A X
|
|
# \ / \
|
|
# C---D--G <-- br1
|
|
# \ /
|
|
# ---F <-- br2
|
|
#
|
|
# H <-- br3
|
|
#
|
|
# We put files into a few commits so that we can verify the
|
|
# output as well.
|
|
|
|
test_expect_success setup '
|
|
git commit --allow-empty -m A &&
|
|
echo b >b &&
|
|
git add b &&
|
|
git commit -m B &&
|
|
git checkout -b br1 HEAD^ &&
|
|
echo c >c &&
|
|
git add c &&
|
|
git commit -m C &&
|
|
git tag commit-C &&
|
|
git merge -m D master &&
|
|
git tag commit-D &&
|
|
git checkout master &&
|
|
git merge -m E commit-C &&
|
|
git checkout -b br2 commit-C &&
|
|
echo f >f &&
|
|
git add f &&
|
|
git commit -m F &&
|
|
git checkout br1 &&
|
|
git merge -m G br2 &&
|
|
git checkout --orphan br3 &&
|
|
git commit -m H
|
|
'
|
|
|
|
test_expect_success 'diff with one merge base' '
|
|
git diff commit-D...br1 >tmp &&
|
|
tail -n 1 tmp >actual &&
|
|
echo +f >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# The output (in tmp) can have +b or +c depending
|
|
# on which merge base (commit B or C) is picked.
|
|
# It should have one of those two, which comes out
|
|
# to seven lines.
|
|
test_expect_success 'diff with two merge bases' '
|
|
git diff br1...master >tmp 2>err &&
|
|
test_line_count = 7 tmp &&
|
|
test_line_count = 1 err
|
|
'
|
|
|
|
test_expect_success 'diff with no merge bases' '
|
|
test_must_fail git diff br2...br3 2>err &&
|
|
test_i18ngrep "fatal: br2...br3: no merge base" err
|
|
'
|
|
|
|
test_expect_success 'diff with too many symmetric differences' '
|
|
test_must_fail git diff br1...master br2...br3 2>err &&
|
|
test_i18ngrep "usage" err
|
|
'
|
|
|
|
test_expect_success 'diff with symmetric difference and extraneous arg' '
|
|
test_must_fail git diff master br1...master 2>err &&
|
|
test_i18ngrep "usage" err
|
|
'
|
|
|
|
test_expect_success 'diff with two ranges' '
|
|
test_must_fail git diff master br1..master br2..br3 2>err &&
|
|
test_i18ngrep "usage" err
|
|
'
|
|
|
|
test_expect_success 'diff with ranges and extra arg' '
|
|
test_must_fail git diff master br1..master commit-D 2>err &&
|
|
test_i18ngrep "usage" err
|
|
'
|
|
|
|
test_expect_success 'diff --merge-base with no commits' '
|
|
test_must_fail git diff --merge-base
|
|
'
|
|
|
|
test_expect_success 'diff --merge-base with three commits' '
|
|
test_must_fail git diff --merge-base br1 br2 master 2>err &&
|
|
test_i18ngrep "usage" err
|
|
'
|
|
|
|
for cmd in diff-index diff
|
|
do
|
|
test_expect_success "$cmd --merge-base with one commit" '
|
|
git checkout master &&
|
|
git $cmd commit-C >expect &&
|
|
git $cmd --merge-base br2 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "$cmd --merge-base with one commit and unstaged changes" '
|
|
git checkout master &&
|
|
test_when_finished git reset --hard &&
|
|
echo unstaged >>c &&
|
|
git $cmd commit-C >expect &&
|
|
git $cmd --merge-base br2 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "$cmd --merge-base with one commit and staged and unstaged changes" '
|
|
git checkout master &&
|
|
test_when_finished git reset --hard &&
|
|
echo staged >>c &&
|
|
git add c &&
|
|
echo unstaged >>c &&
|
|
git $cmd commit-C >expect &&
|
|
git $cmd --merge-base br2 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "$cmd --merge-base --cached with one commit and staged and unstaged changes" '
|
|
git checkout master &&
|
|
test_when_finished git reset --hard &&
|
|
echo staged >>c &&
|
|
git add c &&
|
|
echo unstaged >>c &&
|
|
git $cmd --cached commit-C >expect &&
|
|
git $cmd --cached --merge-base br2 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "$cmd --merge-base with non-commit" '
|
|
git checkout master &&
|
|
test_must_fail git $cmd --merge-base master^{tree} 2>err &&
|
|
test_i18ngrep "fatal: --merge-base only works with commits" err
|
|
'
|
|
|
|
test_expect_success "$cmd --merge-base with no merge bases and one commit" '
|
|
git checkout master &&
|
|
test_must_fail git $cmd --merge-base br3 2>err &&
|
|
test_i18ngrep "fatal: no merge base found" err
|
|
'
|
|
|
|
test_expect_success "$cmd --merge-base with multiple merge bases and one commit" '
|
|
git checkout master &&
|
|
test_must_fail git $cmd --merge-base br1 2>err &&
|
|
test_i18ngrep "fatal: multiple merge bases found" err
|
|
'
|
|
done
|
|
|
|
for cmd in diff-tree diff
|
|
do
|
|
test_expect_success "$cmd --merge-base with two commits" '
|
|
git $cmd commit-C master >expect &&
|
|
git $cmd --merge-base br2 master >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "$cmd --merge-base commit and non-commit" '
|
|
test_must_fail git $cmd --merge-base br2 master^{tree} 2>err &&
|
|
test_i18ngrep "fatal: --merge-base only works with commits" err
|
|
'
|
|
|
|
test_expect_success "$cmd --merge-base with no merge bases and two commits" '
|
|
test_must_fail git $cmd --merge-base br2 br3 2>err &&
|
|
test_i18ngrep "fatal: no merge base found" err
|
|
'
|
|
|
|
test_expect_success "$cmd --merge-base with multiple merge bases and two commits" '
|
|
test_must_fail git $cmd --merge-base master br1 2>err &&
|
|
test_i18ngrep "fatal: multiple merge bases found" err
|
|
'
|
|
done
|
|
|
|
test_expect_success 'diff-tree --merge-base with one commit' '
|
|
test_must_fail git diff-tree --merge-base master 2>err &&
|
|
test_i18ngrep "fatal: --merge-base only works with two commits" err
|
|
'
|
|
|
|
test_expect_success 'diff --merge-base with range' '
|
|
test_must_fail git diff --merge-base br2..br3 2>err &&
|
|
test_i18ngrep "fatal: --merge-base does not work with ranges" err
|
|
'
|
|
|
|
test_done
|