mirror of
https://github.com/git/git.git
synced 2024-11-18 15:04:49 +01:00
4c8d4c14c6
Commit dbd0f5c7 (Files given on the command line are relative to $cwd,
2008-08-06) only fixed git-commit and git-tag. But, git-apply and
git-fmt-merge-msg didn't get the update and exhibit the same behavior.
Fix them and add tests for "apply --build-fake-ancestor" and
"fmt-merge-msg -F".
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
42 lines
838 B
Bash
Executable file
42 lines
838 B
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2009 Stephen Boyd
|
|
#
|
|
|
|
test_description='git apply --build-fake-ancestor handling.'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit 1 &&
|
|
test_commit 2 &&
|
|
mkdir sub &&
|
|
test_commit 3 sub/3 &&
|
|
test_commit 4
|
|
'
|
|
|
|
test_expect_success 'apply --build-fake-ancestor' '
|
|
git checkout 2 &&
|
|
echo "A" > 1.t &&
|
|
git diff > 1.patch &&
|
|
git reset --hard &&
|
|
git checkout 1 &&
|
|
git apply --build-fake-ancestor 1.ancestor 1.patch
|
|
'
|
|
|
|
test_expect_success 'apply --build-fake-ancestor in a subdirectory' '
|
|
git checkout 3 &&
|
|
echo "C" > sub/3.t &&
|
|
git diff > 3.patch &&
|
|
git reset --hard &&
|
|
git checkout 4 &&
|
|
(
|
|
cd sub &&
|
|
git apply --build-fake-ancestor 3.ancestor ../3.patch &&
|
|
test -f 3.ancestor
|
|
) &&
|
|
git apply --build-fake-ancestor 3.ancestor 3.patch &&
|
|
test_cmp sub/3.ancestor 3.ancestor
|
|
'
|
|
|
|
test_done
|