undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apply, fmt-merge-msg: use relative filenames

Browse Source 
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>
This commit is contained in:
Stephen Boyd 2009-05-23 11:53:11 -07:00 committed by Junio C Hamano
parent aae94ffbc1
commit 4c8d4c14c6
4 changed files with 79 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-apply.c
View File

@ -3316,6 +3316,10 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)
argc = parse_options(argc, argv, builtin_apply_options, argc = parse_options(argc, argv, builtin_apply_options,
apply_usage, 0); apply_usage, 0);
fake_ancestor = parse_options_fix_filename(prefix, fake_ancestor);
if (fake_ancestor)
fake_ancestor = xstrdup(fake_ancestor);
if (apply_with_reject) if (apply_with_reject)
apply = apply_verbosely = 1; apply = apply_verbosely = 1;
if (!force_apply && (diffstat || numstat || summary || check || fake_ancestor)) if (!force_apply && (diffstat || numstat || summary || check || fake_ancestor))

1
builtin-fmt-merge-msg.c
View File

@ -365,6 +365,7 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, options, fmt_merge_msg_usage, 0); argc = parse_options(argc, argv, options, fmt_merge_msg_usage, 0);
if (argc > 0) if (argc > 0)
usage_with_options(fmt_merge_msg_usage, options); usage_with_options(fmt_merge_msg_usage, options);
inpath = parse_options_fix_filename(prefix, inpath);
if (inpath && strcmp(inpath, "-")) { if (inpath && strcmp(inpath, "-")) {
in = fopen(inpath, "r"); in = fopen(inpath, "r");

42
t/t4131-apply-fake-ancestor.sh Executable file
View File

@ -0,0 +1,42 @@
#!/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

32
t/t6200-fmt-merge-msg.sh
View File

@ -208,4 +208,36 @@ test_expect_success 'merge-msg test #5-2' '
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'merge-msg -F' '
git config --unset-all merge.log
git config --unset-all merge.summary
git config merge.summary yes &&
git checkout master &&
setdate &&
git fetch . left right &&
git fmt-merge-msg -F .git/FETCH_HEAD >actual &&
test_cmp expected actual
'
test_expect_success 'merge-msg -F in subdirectory' '
git config --unset-all merge.log
git config --unset-all merge.summary
git config merge.summary yes &&
git checkout master &&
setdate &&
git fetch . left right &&
mkdir sub &&
cp .git/FETCH_HEAD sub/FETCH_HEAD &&
(
cd sub &&
git fmt-merge-msg -F FETCH_HEAD >../actual
) &&
test_cmp expected actual
'
test_done test_done