mirror of
https://github.com/git/git
synced 2024-08-23 18:00:25 +00:00
![Junio C Hamano](/assets/img/avatar_default.png)
In the implementation of "git difftool", there is a case where the user wants to start viewing the diffs at a specific path and continue on to the rest, optionally wrapping around to the beginning. Since it is somewhat cumbersome to implement such a feature as a post-processing step of "git diff" output, let's support it internally with two new options. - "git diff --rotate-to=C", when the resulting patch would show paths A B C D E without the option, would "rotate" the paths to shows patch to C D E A B instead. It is an error when there is no patch for C is shown. - "git diff --skip-to=C" would instead "skip" the paths before C, and shows patch to C D E. Again, it is an error when there is no patch for C is shown. - "git log [-p]" also accepts these two options, but it is not an error if there is no change to the specified path. Instead, the set of output paths are rotated or skipped to the specified path or the first path that sorts after the specified path. Signed-off-by: Junio C Hamano <gitster@pobox.com>
201 lines
4.1 KiB
Bash
Executable file
201 lines
4.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='diff order & rotate'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
create_files () {
|
|
echo "$1" >a.h &&
|
|
echo "$1" >b.c &&
|
|
echo "$1" >c/Makefile &&
|
|
echo "$1" >d.txt &&
|
|
git add a.h b.c c/Makefile d.txt &&
|
|
git commit -m"$1"
|
|
}
|
|
|
|
test_expect_success 'setup' '
|
|
mkdir c &&
|
|
create_files 1 &&
|
|
create_files 2 &&
|
|
|
|
cat >order_file_1 <<-\EOF &&
|
|
*Makefile
|
|
*.txt
|
|
*.h
|
|
EOF
|
|
|
|
cat >order_file_2 <<-\EOF &&
|
|
*Makefile
|
|
*.h
|
|
*.c
|
|
EOF
|
|
|
|
cat >expect_none <<-\EOF &&
|
|
a.h
|
|
b.c
|
|
c/Makefile
|
|
d.txt
|
|
EOF
|
|
|
|
cat >expect_1 <<-\EOF &&
|
|
c/Makefile
|
|
d.txt
|
|
a.h
|
|
b.c
|
|
EOF
|
|
|
|
cat >expect_2 <<-\EOF
|
|
c/Makefile
|
|
a.h
|
|
b.c
|
|
d.txt
|
|
EOF
|
|
'
|
|
|
|
test_expect_success "no order (=tree object order)" '
|
|
git diff --name-only HEAD^..HEAD >actual &&
|
|
test_cmp expect_none actual
|
|
'
|
|
|
|
test_expect_success 'missing orderfile' '
|
|
rm -f bogus_file &&
|
|
test_must_fail git diff -Obogus_file --name-only HEAD^..HEAD
|
|
'
|
|
|
|
test_expect_success POSIXPERM,SANITY 'unreadable orderfile' '
|
|
>unreadable_file &&
|
|
chmod -r unreadable_file &&
|
|
test_must_fail git diff -Ounreadable_file --name-only HEAD^..HEAD
|
|
'
|
|
|
|
test_expect_success "orderfile using option from subdir with --output" '
|
|
mkdir subdir &&
|
|
git -C subdir diff -O../order_file_1 --output ../actual --name-only HEAD^..HEAD &&
|
|
test_cmp expect_1 actual
|
|
'
|
|
|
|
for i in 1 2
|
|
do
|
|
test_expect_success "orderfile using option ($i)" '
|
|
git diff -Oorder_file_$i --name-only HEAD^..HEAD >actual &&
|
|
test_cmp expect_$i actual
|
|
'
|
|
|
|
test_expect_success PIPE "orderfile is fifo ($i)" '
|
|
rm -f order_fifo &&
|
|
mkfifo order_fifo &&
|
|
{
|
|
cat order_file_$i >order_fifo &
|
|
} &&
|
|
git diff -O order_fifo --name-only HEAD^..HEAD >actual &&
|
|
wait &&
|
|
test_cmp expect_$i actual
|
|
'
|
|
|
|
test_expect_success "orderfile using config ($i)" '
|
|
git -c diff.orderfile=order_file_$i diff --name-only HEAD^..HEAD >actual &&
|
|
test_cmp expect_$i actual
|
|
'
|
|
|
|
test_expect_success "cancelling configured orderfile ($i)" '
|
|
git -c diff.orderfile=order_file_$i diff -O/dev/null --name-only HEAD^..HEAD >actual &&
|
|
test_cmp expect_none actual
|
|
'
|
|
done
|
|
|
|
test_expect_success 'setup for testing combine-diff order' '
|
|
git checkout -b tmp HEAD~ &&
|
|
create_files 3 &&
|
|
git checkout main &&
|
|
git merge --no-commit -s ours tmp &&
|
|
create_files 5
|
|
'
|
|
|
|
test_expect_success "combine-diff: no order (=tree object order)" '
|
|
git diff --name-only HEAD HEAD^ HEAD^2 >actual &&
|
|
test_cmp expect_none actual
|
|
'
|
|
|
|
for i in 1 2
|
|
do
|
|
test_expect_success "combine-diff: orderfile using option ($i)" '
|
|
git diff -Oorder_file_$i --name-only HEAD HEAD^ HEAD^2 >actual &&
|
|
test_cmp expect_$i actual
|
|
'
|
|
done
|
|
|
|
### rotate and skip
|
|
|
|
test_expect_success 'rotate and skip setup' '
|
|
>sample1.t &&
|
|
>sample2.t &&
|
|
>sample3.t &&
|
|
>sample4.t &&
|
|
git add sample[1234].t &&
|
|
git commit -m "added" sample[1234].t &&
|
|
echo modified >>sample1.t &&
|
|
echo modified >>sample2.t &&
|
|
echo modified >>sample4.t &&
|
|
git commit -m "updated" sample[1234].t
|
|
'
|
|
|
|
test_expect_success 'diff --rotate-to' '
|
|
git diff --rotate-to=sample2.t --name-only HEAD^ >actual &&
|
|
test_write_lines sample2.t sample4.t sample1.t >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'diff --skip-to' '
|
|
git diff --skip-to=sample2.t --name-only HEAD^ >actual &&
|
|
test_write_lines sample2.t sample4.t >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'diff --rotate/skip-to error condition' '
|
|
test_must_fail git diff --rotate-to=sample3.t HEAD^ &&
|
|
test_must_fail git diff --skip-to=sample3.t HEAD^
|
|
'
|
|
|
|
test_expect_success 'log --rotate-to' '
|
|
git log --rotate-to=sample3.t --raw HEAD~2.. >raw &&
|
|
# just distill the commit header and paths
|
|
sed -n -e "s/^commit.*/commit/p" \
|
|
-e "/^:/s/^.* //p" raw >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
commit
|
|
sample4.t
|
|
sample1.t
|
|
sample2.t
|
|
commit
|
|
sample3.t
|
|
sample4.t
|
|
sample1.t
|
|
sample2.t
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log --skip-to' '
|
|
git log --skip-to=sample3.t --raw HEAD~2.. >raw &&
|
|
# just distill the commit header and paths
|
|
sed -n -e "s/^commit.*/commit/p" \
|
|
-e "/^:/s/^.* //p" raw >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
commit
|
|
sample4.t
|
|
commit
|
|
sample3.t
|
|
sample4.t
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|