diff options
| author |  Jeff King <peff@peff.net> | 2012-11-13 21:12:46 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-11-18 19:18:13 -0800 |
| commit | d9c552f17a28e5ab1b72135038d4888ea02651ea (patch) | |
| tree | 964319be555eee7d75b5543b94b3fb8b9fc7478a /t | |
| parent | diff: introduce diff.submodule configuration variable (diff) | |
| download | tgif-d9c552f17a28e5ab1b72135038d4888ea02651ea.tar.xz | |
diff: rename "set" variable
Once upon a time the builtin_diff function used one color, and the color
variables were called "set" and "reset". Nowadays it is a much longer
function and we use several colors (e.g., "add", "del"). Rename "set" to
"meta" to show that it is the color for showing diff meta-info (it still
does not indicate that it is a "color", but at least it matches the
scheme of the other color variables).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4041-diff-submodule-option.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh index 876800ff24..57e8a9dacb 100755 --- a/t/t4041-diff-submodule-option.sh +++ b/t/t4041-diff-submodule-option.sh @@ -71,6 +71,21 @@ EOF test_cmp expected actual " +test_expect_success 'diff.submodule does not affect plumbing' ' + test_config diff.submodule log && + git diff-index -p HEAD >actual && + cat >expected <<-EOF && + diff --git a/sm1 b/sm1 + new file mode 160000 + index 0000000..a2c4dab + --- /dev/null + +++ b/sm1 + @@ -0,0 +1 @@ + +Subproject commit $fullhead1 + EOF + test_cmp expected actual +' + commit_file sm1 && head2=$(add_file sm1 foo3) |