2007-04-23 00:52:55 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='external diff interface test'
|
|
|
|
|
2021-10-30 22:24:19 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2007-04-23 00:52:55 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success setup '
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
echo initial >file &&
|
|
|
|
git add file &&
|
|
|
|
git commit -m initial &&
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
echo second >file &&
|
2018-05-21 02:01:37 +00:00
|
|
|
before=$(git hash-object file) &&
|
|
|
|
before=$(git rev-parse --short $before) &&
|
2007-04-23 00:52:55 +00:00
|
|
|
git add file &&
|
|
|
|
git commit -m second &&
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
echo third >file
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'GIT_EXTERNAL_DIFF environment' '
|
2022-03-07 12:48:56 +00:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
|
|
|
|
EOF
|
|
|
|
GIT_EXTERNAL_DIFF=echo git diff >out &&
|
|
|
|
cut -d" " -f1,3- <out >actual &&
|
|
|
|
test_cmp expect actual
|
2007-04-23 00:52:55 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2022-07-27 23:13:40 +00:00
|
|
|
test_expect_success 'GIT_EXTERNAL_DIFF environment should apply only to diff' '
|
2022-03-07 12:48:55 +00:00
|
|
|
GIT_EXTERNAL_DIFF=echo git log -p -1 HEAD >out &&
|
|
|
|
grep "^diff --git a/file b/file" out
|
2007-04-23 00:52:55 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-11-26 17:58:41 +00:00
|
|
|
test_expect_success 'GIT_EXTERNAL_DIFF environment and --no-ext-diff' '
|
2022-03-07 12:48:55 +00:00
|
|
|
GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >out &&
|
|
|
|
grep "^diff --git a/file b/file" out
|
2008-11-26 17:58:41 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2012-07-18 05:08:59 +00:00
|
|
|
test_expect_success SYMLINKS 'typechange diff' '
|
|
|
|
rm -f file &&
|
|
|
|
ln -s elif file &&
|
2022-03-07 12:48:56 +00:00
|
|
|
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 120000
|
|
|
|
EOF
|
|
|
|
GIT_EXTERNAL_DIFF=echo git diff >out &&
|
|
|
|
cut -d" " -f1,3-4,6- <out >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
2012-07-18 05:08:59 +00:00
|
|
|
GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >actual &&
|
|
|
|
git diff >expect &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
diff: test precedence of external diff drivers
There are three ways to specify an external diff command:
GIT_EXTERNAL_DIFF in the environment, diff.external in the
config, or a "diff" gitattribute. The current order of
precedence is:
1. gitattribute
2. GIT_EXTERNAL_DIFF
3. diff.external
Usually our rule is that environment variables should take
precedence over on-disk config (i.e., option 2 should come
before option 1). However, this situation is trickier than
some, because option 1 is more specific to the individual
file than option 2 (which affects all files), so it might be
preferable. So the current behavior can be seen as
implementing "do the specific thing if we can, but fall back
to this general thing".
This is probably not what we would do if we were writing git
from scratch, but it has been this way for several years,
and is not worth changing. So let's at least document that
this is the way it's supposed to work with a test.
While we're there, let's also make sure that diff.external
(which was not previously tested at all) works by running it
through the same tests as GIT_EXTERNAL_DIFF.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-07-19 11:49:38 +00:00
|
|
|
test_expect_success 'diff.external' '
|
|
|
|
git reset --hard &&
|
|
|
|
echo third >file &&
|
|
|
|
test_config diff.external echo &&
|
2022-03-07 12:48:56 +00:00
|
|
|
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
|
|
|
|
EOF
|
|
|
|
git diff >out &&
|
|
|
|
cut -d" " -f1,3-4,6- <out >actual &&
|
|
|
|
test_cmp expect actual
|
diff: test precedence of external diff drivers
There are three ways to specify an external diff command:
GIT_EXTERNAL_DIFF in the environment, diff.external in the
config, or a "diff" gitattribute. The current order of
precedence is:
1. gitattribute
2. GIT_EXTERNAL_DIFF
3. diff.external
Usually our rule is that environment variables should take
precedence over on-disk config (i.e., option 2 should come
before option 1). However, this situation is trickier than
some, because option 1 is more specific to the individual
file than option 2 (which affects all files), so it might be
preferable. So the current behavior can be seen as
implementing "do the specific thing if we can, but fall back
to this general thing".
This is probably not what we would do if we were writing git
from scratch, but it has been this way for several years,
and is not worth changing. So let's at least document that
this is the way it's supposed to work with a test.
While we're there, let's also make sure that diff.external
(which was not previously tested at all) works by running it
through the same tests as GIT_EXTERNAL_DIFF.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-07-19 11:49:38 +00:00
|
|
|
'
|
|
|
|
|
2022-07-27 23:13:40 +00:00
|
|
|
test_expect_success 'diff.external should apply only to diff' '
|
diff: test precedence of external diff drivers
There are three ways to specify an external diff command:
GIT_EXTERNAL_DIFF in the environment, diff.external in the
config, or a "diff" gitattribute. The current order of
precedence is:
1. gitattribute
2. GIT_EXTERNAL_DIFF
3. diff.external
Usually our rule is that environment variables should take
precedence over on-disk config (i.e., option 2 should come
before option 1). However, this situation is trickier than
some, because option 1 is more specific to the individual
file than option 2 (which affects all files), so it might be
preferable. So the current behavior can be seen as
implementing "do the specific thing if we can, but fall back
to this general thing".
This is probably not what we would do if we were writing git
from scratch, but it has been this way for several years,
and is not worth changing. So let's at least document that
this is the way it's supposed to work with a test.
While we're there, let's also make sure that diff.external
(which was not previously tested at all) works by running it
through the same tests as GIT_EXTERNAL_DIFF.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-07-19 11:49:38 +00:00
|
|
|
test_config diff.external echo &&
|
2022-03-07 12:48:55 +00:00
|
|
|
git log -p -1 HEAD >out &&
|
|
|
|
grep "^diff --git a/file b/file" out
|
diff: test precedence of external diff drivers
There are three ways to specify an external diff command:
GIT_EXTERNAL_DIFF in the environment, diff.external in the
config, or a "diff" gitattribute. The current order of
precedence is:
1. gitattribute
2. GIT_EXTERNAL_DIFF
3. diff.external
Usually our rule is that environment variables should take
precedence over on-disk config (i.e., option 2 should come
before option 1). However, this situation is trickier than
some, because option 1 is more specific to the individual
file than option 2 (which affects all files), so it might be
preferable. So the current behavior can be seen as
implementing "do the specific thing if we can, but fall back
to this general thing".
This is probably not what we would do if we were writing git
from scratch, but it has been this way for several years,
and is not worth changing. So let's at least document that
this is the way it's supposed to work with a test.
While we're there, let's also make sure that diff.external
(which was not previously tested at all) works by running it
through the same tests as GIT_EXTERNAL_DIFF.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-07-19 11:49:38 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'diff.external and --no-ext-diff' '
|
|
|
|
test_config diff.external echo &&
|
2022-03-07 12:48:55 +00:00
|
|
|
git diff --no-ext-diff >out &&
|
|
|
|
grep "^diff --git a/file b/file" out
|
diff: test precedence of external diff drivers
There are three ways to specify an external diff command:
GIT_EXTERNAL_DIFF in the environment, diff.external in the
config, or a "diff" gitattribute. The current order of
precedence is:
1. gitattribute
2. GIT_EXTERNAL_DIFF
3. diff.external
Usually our rule is that environment variables should take
precedence over on-disk config (i.e., option 2 should come
before option 1). However, this situation is trickier than
some, because option 1 is more specific to the individual
file than option 2 (which affects all files), so it might be
preferable. So the current behavior can be seen as
implementing "do the specific thing if we can, but fall back
to this general thing".
This is probably not what we would do if we were writing git
from scratch, but it has been this way for several years,
and is not worth changing. So let's at least document that
this is the way it's supposed to work with a test.
While we're there, let's also make sure that diff.external
(which was not previously tested at all) works by running it
through the same tests as GIT_EXTERNAL_DIFF.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-07-19 11:49:38 +00:00
|
|
|
'
|
|
|
|
|
2007-04-23 00:52:55 +00:00
|
|
|
test_expect_success 'diff attribute' '
|
2012-07-18 05:08:59 +00:00
|
|
|
git reset --hard &&
|
|
|
|
echo third >file &&
|
2007-04-23 00:52:55 +00:00
|
|
|
|
|
|
|
git config diff.parrot.command echo &&
|
|
|
|
|
|
|
|
echo >.gitattributes "file diff=parrot" &&
|
|
|
|
|
2022-03-07 12:48:56 +00:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
|
|
|
|
EOF
|
|
|
|
git diff >out &&
|
|
|
|
cut -d" " -f1,3-4,6- <out >actual &&
|
|
|
|
test_cmp expect actual
|
2007-04-23 00:52:55 +00:00
|
|
|
'
|
|
|
|
|
2022-03-07 12:48:55 +00:00
|
|
|
test_expect_success !SANITIZE_LEAK 'diff attribute should apply only to diff' '
|
|
|
|
git log -p -1 HEAD >out &&
|
|
|
|
grep "^diff --git a/file b/file" out
|
2007-04-23 00:52:55 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-11-26 17:58:41 +00:00
|
|
|
test_expect_success 'diff attribute and --no-ext-diff' '
|
2022-03-07 12:48:55 +00:00
|
|
|
git diff --no-ext-diff >out &&
|
|
|
|
grep "^diff --git a/file b/file" out
|
2008-11-26 17:58:41 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2007-04-23 00:52:55 +00:00
|
|
|
test_expect_success 'diff attribute' '
|
|
|
|
|
|
|
|
git config --unset diff.parrot.command &&
|
|
|
|
git config diff.color.command echo &&
|
|
|
|
|
|
|
|
echo >.gitattributes "file diff=color" &&
|
|
|
|
|
2022-03-07 12:48:56 +00:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
|
|
|
|
EOF
|
|
|
|
git diff >out &&
|
|
|
|
cut -d" " -f1,3-4,6- <out >actual &&
|
|
|
|
test_cmp expect actual
|
2007-04-23 00:52:55 +00:00
|
|
|
'
|
|
|
|
|
2022-03-07 12:48:55 +00:00
|
|
|
test_expect_success !SANITIZE_LEAK 'diff attribute should apply only to diff' '
|
|
|
|
git log -p -1 HEAD >out &&
|
|
|
|
grep "^diff --git a/file b/file" out
|
2007-04-23 00:52:55 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-11-26 17:58:41 +00:00
|
|
|
test_expect_success 'diff attribute and --no-ext-diff' '
|
2022-03-07 12:48:55 +00:00
|
|
|
git diff --no-ext-diff >out &&
|
|
|
|
grep "^diff --git a/file b/file" out
|
2008-11-26 17:58:41 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
diff: test precedence of external diff drivers
There are three ways to specify an external diff command:
GIT_EXTERNAL_DIFF in the environment, diff.external in the
config, or a "diff" gitattribute. The current order of
precedence is:
1. gitattribute
2. GIT_EXTERNAL_DIFF
3. diff.external
Usually our rule is that environment variables should take
precedence over on-disk config (i.e., option 2 should come
before option 1). However, this situation is trickier than
some, because option 1 is more specific to the individual
file than option 2 (which affects all files), so it might be
preferable. So the current behavior can be seen as
implementing "do the specific thing if we can, but fall back
to this general thing".
This is probably not what we would do if we were writing git
from scratch, but it has been this way for several years,
and is not worth changing. So let's at least document that
this is the way it's supposed to work with a test.
While we're there, let's also make sure that diff.external
(which was not previously tested at all) works by running it
through the same tests as GIT_EXTERNAL_DIFF.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-07-19 11:49:38 +00:00
|
|
|
test_expect_success 'GIT_EXTERNAL_DIFF trumps diff.external' '
|
|
|
|
>.gitattributes &&
|
|
|
|
test_config diff.external "echo ext-global" &&
|
2022-03-07 12:48:56 +00:00
|
|
|
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
ext-env file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
|
|
|
|
EOF
|
|
|
|
GIT_EXTERNAL_DIFF="echo ext-env" git diff >out &&
|
|
|
|
cut -d" " -f1-2,4- <out >actual &&
|
|
|
|
test_cmp expect actual
|
diff: test precedence of external diff drivers
There are three ways to specify an external diff command:
GIT_EXTERNAL_DIFF in the environment, diff.external in the
config, or a "diff" gitattribute. The current order of
precedence is:
1. gitattribute
2. GIT_EXTERNAL_DIFF
3. diff.external
Usually our rule is that environment variables should take
precedence over on-disk config (i.e., option 2 should come
before option 1). However, this situation is trickier than
some, because option 1 is more specific to the individual
file than option 2 (which affects all files), so it might be
preferable. So the current behavior can be seen as
implementing "do the specific thing if we can, but fall back
to this general thing".
This is probably not what we would do if we were writing git
from scratch, but it has been this way for several years,
and is not worth changing. So let's at least document that
this is the way it's supposed to work with a test.
While we're there, let's also make sure that diff.external
(which was not previously tested at all) works by running it
through the same tests as GIT_EXTERNAL_DIFF.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-07-19 11:49:38 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'attributes trump GIT_EXTERNAL_DIFF and diff.external' '
|
|
|
|
test_config diff.foo.command "echo ext-attribute" &&
|
|
|
|
test_config diff.external "echo ext-global" &&
|
|
|
|
echo "file diff=foo" >.gitattributes &&
|
2022-03-07 12:48:56 +00:00
|
|
|
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
ext-attribute file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
|
|
|
|
EOF
|
|
|
|
GIT_EXTERNAL_DIFF="echo ext-env" git diff >out &&
|
|
|
|
cut -d" " -f1-2,4- <out >actual &&
|
|
|
|
test_cmp expect actual
|
diff: test precedence of external diff drivers
There are three ways to specify an external diff command:
GIT_EXTERNAL_DIFF in the environment, diff.external in the
config, or a "diff" gitattribute. The current order of
precedence is:
1. gitattribute
2. GIT_EXTERNAL_DIFF
3. diff.external
Usually our rule is that environment variables should take
precedence over on-disk config (i.e., option 2 should come
before option 1). However, this situation is trickier than
some, because option 1 is more specific to the individual
file than option 2 (which affects all files), so it might be
preferable. So the current behavior can be seen as
implementing "do the specific thing if we can, but fall back
to this general thing".
This is probably not what we would do if we were writing git
from scratch, but it has been this way for several years,
and is not worth changing. So let's at least document that
this is the way it's supposed to work with a test.
While we're there, let's also make sure that diff.external
(which was not previously tested at all) works by running it
through the same tests as GIT_EXTERNAL_DIFF.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-07-19 11:49:38 +00:00
|
|
|
'
|
|
|
|
|
2007-07-07 19:25:11 +00:00
|
|
|
test_expect_success 'no diff with -diff' '
|
|
|
|
echo >.gitattributes "file -diff" &&
|
2022-03-07 12:48:55 +00:00
|
|
|
git diff >out &&
|
|
|
|
grep Binary out
|
2007-07-07 19:25:11 +00:00
|
|
|
'
|
|
|
|
|
2024-05-05 10:20:03 +00:00
|
|
|
test_expect_success 'diff.external and --exit-code with output' '
|
|
|
|
test_expect_code 1 git -c diff.external=echo diff --exit-code
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'diff.external and --exit-code without output' '
|
|
|
|
git -c diff.external=true diff --exit-code
|
|
|
|
'
|
|
|
|
|
2013-10-29 01:23:03 +00:00
|
|
|
echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file
|
2007-07-07 19:25:11 +00:00
|
|
|
|
|
|
|
test_expect_success 'force diff with "diff"' '
|
2018-05-21 02:01:37 +00:00
|
|
|
after=$(git hash-object file) &&
|
|
|
|
after=$(git rev-parse --short $after) &&
|
2007-07-07 19:25:11 +00:00
|
|
|
echo >.gitattributes "file diff" &&
|
2008-03-12 21:37:37 +00:00
|
|
|
git diff >actual &&
|
2018-05-21 02:01:37 +00:00
|
|
|
sed -e "s/^index .*/index $before..$after 100644/" \
|
|
|
|
"$TEST_DIRECTORY"/t4020/diff.NUL >expected-diff &&
|
|
|
|
test_cmp expected-diff actual
|
2007-07-07 19:25:11 +00:00
|
|
|
'
|
|
|
|
|
2009-02-12 13:36:14 +00:00
|
|
|
test_expect_success 'GIT_EXTERNAL_DIFF with more than one changed files' '
|
|
|
|
echo anotherfile > file2 &&
|
|
|
|
git add file2 &&
|
|
|
|
git commit -m "added 2nd file" &&
|
|
|
|
echo modified >file2 &&
|
|
|
|
GIT_EXTERNAL_DIFF=echo git diff
|
|
|
|
'
|
|
|
|
|
2013-12-05 23:38:46 +00:00
|
|
|
test_expect_success 'GIT_EXTERNAL_DIFF path counter/total' '
|
|
|
|
write_script external-diff.sh <<-\EOF &&
|
|
|
|
echo $GIT_DIFF_PATH_COUNTER of $GIT_DIFF_PATH_TOTAL >>counter.txt
|
|
|
|
EOF
|
|
|
|
>counter.txt &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
1 of 2
|
|
|
|
2 of 2
|
|
|
|
EOF
|
|
|
|
GIT_EXTERNAL_DIFF=./external-diff.sh git diff &&
|
|
|
|
test_cmp expect counter.txt
|
|
|
|
'
|
|
|
|
|
2009-05-31 08:35:52 +00:00
|
|
|
test_expect_success 'GIT_EXTERNAL_DIFF generates pretty paths' '
|
2022-04-20 20:30:10 +00:00
|
|
|
test_when_finished "git rm -f file.ext" &&
|
2009-05-31 08:35:52 +00:00
|
|
|
touch file.ext &&
|
|
|
|
git add file.ext &&
|
|
|
|
echo with extension > file.ext &&
|
2022-03-07 12:48:56 +00:00
|
|
|
|
|
|
|
cat >expect <<-EOF &&
|
2022-04-20 20:30:10 +00:00
|
|
|
file.ext
|
2022-03-07 12:48:56 +00:00
|
|
|
EOF
|
|
|
|
GIT_EXTERNAL_DIFF=echo git diff file.ext >out &&
|
2022-04-20 20:30:10 +00:00
|
|
|
basename $(cut -d" " -f2 <out) >actual &&
|
|
|
|
test_cmp expect actual
|
2009-05-31 08:35:52 +00:00
|
|
|
'
|
|
|
|
|
2009-03-21 11:42:52 +00:00
|
|
|
echo "#!$SHELL_PATH" >fake-diff.sh
|
|
|
|
cat >> fake-diff.sh <<\EOF
|
|
|
|
cat $2 >> crlfed.txt
|
|
|
|
EOF
|
|
|
|
chmod a+x fake-diff.sh
|
|
|
|
|
|
|
|
keep_only_cr () {
|
|
|
|
tr -dc '\015'
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success 'external diff with autocrlf = true' '
|
2014-02-16 16:52:34 +00:00
|
|
|
test_config core.autocrlf true &&
|
2009-03-21 11:42:52 +00:00
|
|
|
GIT_EXTERNAL_DIFF=./fake-diff.sh git diff &&
|
2024-03-15 19:46:06 +00:00
|
|
|
test $(wc -l <crlfed.txt) = $(keep_only_cr <crlfed.txt | wc -c)
|
2009-03-21 11:42:52 +00:00
|
|
|
'
|
|
|
|
|
2009-03-22 22:26:07 +00:00
|
|
|
test_expect_success 'diff --cached' '
|
2014-02-16 16:52:34 +00:00
|
|
|
test_config core.autocrlf true &&
|
2009-03-22 22:26:07 +00:00
|
|
|
git add file &&
|
|
|
|
git update-index --assume-unchanged file &&
|
|
|
|
echo second >file &&
|
|
|
|
git diff --cached >actual &&
|
2018-05-21 02:01:37 +00:00
|
|
|
test_cmp expected-diff actual
|
2009-03-22 22:26:07 +00:00
|
|
|
'
|
|
|
|
|
2014-02-16 16:52:34 +00:00
|
|
|
test_expect_success 'clean up crlf leftovers' '
|
|
|
|
git update-index --no-assume-unchanged file &&
|
|
|
|
rm -f file* &&
|
|
|
|
git reset --hard
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'submodule diff' '
|
|
|
|
git init sub &&
|
|
|
|
( cd sub && test_commit sub1 ) &&
|
|
|
|
git add sub &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m "add submodule" &&
|
|
|
|
( cd sub && test_commit sub2 ) &&
|
|
|
|
write_script gather_pre_post.sh <<-\EOF &&
|
|
|
|
echo "$1 $4" # path, mode
|
|
|
|
cat "$2" # old file
|
|
|
|
cat "$5" # new file
|
|
|
|
EOF
|
|
|
|
GIT_EXTERNAL_DIFF=./gather_pre_post.sh git diff >actual &&
|
|
|
|
cat >expected <<-EOF &&
|
|
|
|
sub 160000
|
|
|
|
Subproject commit $(git rev-parse HEAD:sub)
|
|
|
|
Subproject commit $(cd sub && git rev-parse HEAD)
|
|
|
|
EOF
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
2007-04-23 00:52:55 +00:00
|
|
|
test_done
|