1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 22:07:53 +01:00
git/t/t6200-fmt-merge-msg.sh
Johannes Schindelin 5bd74506cd Get rid of the dependency to GNU diff in the tests
Now that "git diff" handles stdin and relative paths outside the
working tree correctly, we can convert all instances of "diff -u"
to "git diff".

This commit is really the result of

$ perl -pi.bak -e 's/diff -u/git diff/' $(git grep -l "diff -u" t/)

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

(cherry picked from commit c699a40d68215c7e44a5b26117a35c8a56fbd387)
2007-03-04 00:24:15 -08:00

163 lines
2.5 KiB
Bash
Executable file

#!/bin/sh
#
# Copyright (c) 2006, Junio C Hamano
#
test_description='fmt-merge-msg test'
. ./test-lib.sh
datestamp=1151939923
setdate () {
GIT_COMMITTER_DATE="$datestamp +0200"
GIT_AUTHOR_DATE="$datestamp +0200"
datestamp=`expr "$datestamp" + 1`
export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
}
test_expect_success setup '
echo one >one &&
git add one &&
setdate &&
git commit -m "Initial" &&
echo uno >one &&
echo dos >two &&
git add two &&
setdate &&
git commit -a -m "Second" &&
git checkout -b left &&
echo $datestamp >one &&
setdate &&
git commit -a -m "Common #1" &&
echo $datestamp >one &&
setdate &&
git commit -a -m "Common #2" &&
git branch right &&
echo $datestamp >two &&
setdate &&
git commit -a -m "Left #3" &&
echo $datestamp >two &&
setdate &&
git commit -a -m "Left #4" &&
echo $datestamp >two &&
setdate &&
git commit -a -m "Left #5" &&
git checkout right &&
echo $datestamp >three &&
git add three &&
setdate &&
git commit -a -m "Right #3" &&
echo $datestamp >three &&
setdate &&
git commit -a -m "Right #4" &&
echo $datestamp >three &&
setdate &&
git commit -a -m "Right #5" &&
git show-branch
'
cat >expected <<\EOF
Merge branch 'left'
EOF
test_expect_success 'merge-msg test #1' '
git checkout master &&
git fetch . left &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
git diff actual expected
'
cat >expected <<\EOF
Merge branch 'left' of ../trash
EOF
test_expect_success 'merge-msg test #2' '
git checkout master &&
git fetch ../trash left &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
git diff actual expected
'
cat >expected <<\EOF
Merge branch 'left'
* left:
Left #5
Left #4
Left #3
Common #2
Common #1
EOF
test_expect_success 'merge-msg test #3' '
git config merge.summary true &&
git checkout master &&
setdate &&
git fetch . left &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
git diff actual expected
'
cat >expected <<\EOF
Merge branches 'left' and 'right'
* left:
Left #5
Left #4
Left #3
Common #2
Common #1
* right:
Right #5
Right #4
Right #3
Common #2
Common #1
EOF
test_expect_success 'merge-msg test #4' '
git config merge.summary true &&
git checkout master &&
setdate &&
git fetch . left right &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
git diff actual expected
'
test_expect_success 'merge-msg test #5' '
git config merge.summary yes &&
git checkout master &&
setdate &&
git fetch . left right &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
git diff actual expected
'
test_done