You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
114 lines
2.9 KiB
114 lines
2.9 KiB
#!/bin/sh |
|
# |
|
# Copyright (c) 2009 Erick Mattos |
|
# |
|
|
|
test_description='git commit --reset-author' |
|
|
|
. ./test-lib.sh |
|
|
|
author_header () { |
|
git cat-file commit "$1" | |
|
sed -n -e '/^$/q' -e '/^author /p' |
|
} |
|
|
|
message_body () { |
|
git cat-file commit "$1" | |
|
sed -e '1,/^$/d' |
|
} |
|
|
|
test_expect_success '-C option copies authorship and message' ' |
|
echo "Initial" >foo && |
|
git add foo && |
|
test_tick && |
|
git commit -m "Initial Commit" --author Frigate\ \<flying@over.world\> && |
|
git tag Initial && |
|
echo "Test 1" >>foo && |
|
test_tick && |
|
git commit -a -C Initial && |
|
author_header Initial >expect && |
|
author_header HEAD >actual && |
|
test_cmp expect actual && |
|
|
|
message_body Initial >expect && |
|
message_body HEAD >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success '-C option copies only the message with --reset-author' ' |
|
echo "Test 2" >>foo && |
|
test_tick && |
|
git commit -a -C Initial --reset-author && |
|
echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect && |
|
author_header HEAD >actual |
|
test_cmp expect actual && |
|
|
|
message_body Initial >expect && |
|
message_body HEAD >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success '-c option copies authorship and message' ' |
|
echo "Test 3" >>foo && |
|
test_tick && |
|
EDITOR=: VISUAL=: git commit -a -c Initial && |
|
author_header Initial >expect && |
|
author_header HEAD >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success '-c option copies only the message with --reset-author' ' |
|
echo "Test 4" >>foo && |
|
test_tick && |
|
EDITOR=: VISUAL=: git commit -a -c Initial --reset-author && |
|
echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect && |
|
author_header HEAD >actual && |
|
test_cmp expect actual && |
|
|
|
message_body Initial >expect && |
|
message_body HEAD >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success '--amend option copies authorship' ' |
|
git checkout Initial && |
|
echo "Test 5" >>foo && |
|
test_tick && |
|
git commit -a --amend -m "amend test" && |
|
author_header Initial >expect && |
|
author_header HEAD >actual && |
|
|
|
echo "amend test" >expect && |
|
message_body HEAD >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success '--reset-author makes the commit ours even with --amend option' ' |
|
git checkout Initial && |
|
echo "Test 6" >>foo && |
|
test_tick && |
|
git commit -a --reset-author -m "Changed again" --amend && |
|
echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect && |
|
author_header HEAD >actual && |
|
test_cmp expect actual && |
|
|
|
echo "Changed again" >expect && |
|
message_body HEAD >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success '--reset-author and --author are mutually exclusive' ' |
|
git checkout Initial && |
|
echo "Test 7" >>foo && |
|
test_tick && |
|
test_must_fail git commit -a --reset-author --author="Xyzzy <frotz@nitfol.xz>" |
|
' |
|
|
|
test_expect_success '--reset-author should be rejected without -c/-C/--amend' ' |
|
git checkout Initial && |
|
echo "Test 7" >>foo && |
|
test_tick && |
|
test_must_fail git commit -a --reset-author -m done |
|
' |
|
|
|
test_done
|
|
|