diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-10 12:13:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-10 12:13:46 -0700 |
| commit | 055e1e29696c0fb06582c1592ee6b58643dcc514 (patch) | |
| tree | c02d254d4cd428587da4556b16c550434b09f369 /t/t4041-diff-submodule.sh | |
| parent | 3b0c19663e7976cd32188b42e762c980d1bb93d4 (diff) | |
| parent | eee49b6ce4b7b3fed28794676c67ad3609f658ac (diff) | |
| download | git-055e1e29696c0fb06582c1592ee6b58643dcc514.tar.gz | |
Merge branch 'jl/maint-submodule-gitfile-awareness'
* jl/maint-submodule-gitfile-awareness:
Teach diff --submodule and status to handle .git files in submodules
Diffstat (limited to 't/t4041-diff-submodule.sh')
| -rwxr-xr-x | t/t4041-diff-submodule.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t4041-diff-submodule.sh b/t/t4041-diff-submodule.sh index 11b19972ca..019acb926d 100755 --- a/t/t4041-diff-submodule.sh +++ b/t/t4041-diff-submodule.sh @@ -329,4 +329,19 @@ index 0000000..$head7 EOF " +test_expect_success 'setup .git file for sm2' ' + (cd sm2 && + REAL="$(pwd)/../.real" && + mv .git "$REAL" + echo "gitdir: $REAL" >.git) +' + +test_expect_success 'diff --submodule with .git file' ' + git diff --submodule HEAD^ >actual && + diff actual - <<-EOF +Submodule sm1 $head6...0000000 (submodule deleted) +Submodule sm2 0000000...$head7 (new submodule) +EOF +' + test_done |