mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint
* sb/maint-1.6.2-opt-filename-fix: apply, fmt-merge-msg: use relative filenames commit: -F overrides -t
This commit is contained in:
commit
b91ffd37d5
|
@ -3315,6 +3315,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))
|
||||||
|
|
|
@ -699,7 +699,11 @@ static int parse_and_validate_options(int argc, const char *argv[],
|
||||||
|
|
||||||
argc = parse_options(argc, argv, builtin_commit_options, usage, 0);
|
argc = parse_options(argc, argv, builtin_commit_options, usage, 0);
|
||||||
logfile = parse_options_fix_filename(prefix, logfile);
|
logfile = parse_options_fix_filename(prefix, logfile);
|
||||||
|
if (logfile)
|
||||||
|
logfile = xstrdup(logfile);
|
||||||
template_file = parse_options_fix_filename(prefix, template_file);
|
template_file = parse_options_fix_filename(prefix, template_file);
|
||||||
|
if (template_file)
|
||||||
|
template_file = xstrdup(template_file);
|
||||||
|
|
||||||
if (force_author && !strchr(force_author, '>'))
|
if (force_author && !strchr(force_author, '>'))
|
||||||
force_author = find_author_by_nickname(force_author);
|
force_author = find_author_by_nickname(force_author);
|
||||||
|
|
|
@ -363,6 +363,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
42
t/t4131-apply-fake-ancestor.sh
Executable 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
|
|
@ -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
|
||||||
|
|
|
@ -183,4 +183,14 @@ test_expect_success 'commit message from stdin' '
|
||||||
commit_msg_is "Log with foo word"
|
commit_msg_is "Log with foo word"
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'commit -F overrides -t' '
|
||||||
|
(
|
||||||
|
cd subdir &&
|
||||||
|
echo "-F log" > f.log &&
|
||||||
|
echo "-t template" > t.template &&
|
||||||
|
git commit --allow-empty -F f.log -t t.template
|
||||||
|
) &&
|
||||||
|
commit_msg_is "-F log"
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue