@matheusbsbs / matheus-bagliano / commits / 17b254cda6

diff: submodule inline diff to initialize env array.

David reported: > When I try to run `git diff --submodule=diff` in a submodule which has > it's own submodules that have changes I get the error: fatal: bad > object. This happens, because we do not properly initialize the environment in which the diff is run in the submodule. That means we inherit the environment from the main process, which sets environment variables. (Apparently we do set environment variables which we do not set when not in a submodules, i.e. the .git directory is linked) This commit, just like fd47ae6a5b (diff: teach diff to display submodule difference with an inline diff, 2016-08-31) introduces bad test code (i.e. hard coded hash values), which will be cleanup up in a later patch. Reported-by: David Parrish <daveparrish@gmail.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Stefan Beller committed Mar 31, 2017 at 16:17 UTC 17b254cda6dd77b1a91ac6f2946943e52698efa9

2 files changed +30

submodule.c

@@ -476,6 +476,7 @@ void show_submodule_inline_diff(FILE *f, const char *path,

476 if (!(dirty_submodule & DIRTY_SUBMODULE_MODIFIED))

477 argv_array_push(&cp.args, oid_to_hex(new));

478

479 + prepare_submodule_repo_env(&cp.env_array);

480 if (run_command(&cp))

481 fprintf(f, "(diff failed)\n");

482

t/t4060-diff-submodule-option-diff-format.sh

+29

@@ -746,4 +746,33 @@ test_expect_success 'diff --submodule=diff with .git file' '

746 test_cmp expected actual

747 '

748

749 +test_expect_success 'setup nested submodule' '

750 + git submodule add -f ./sm2 &&

751 + git commit -a -m "add sm2" &&

752 + git -C sm2 submodule add ../sm2 nested &&

753 + git -C sm2 commit -a -m "nested sub"

754 +'

755 +

756 +test_expect_success 'move nested submodule HEAD' '

757 + echo "nested content" >sm2/nested/file &&

758 + git -C sm2/nested add file &&

759 + git -C sm2/nested commit --allow-empty -m "new HEAD"

760 +'

761 +

762 +test_expect_success 'diff --submodule=diff with moved nested submodule HEAD' '

763 + cat >expected <<-EOF &&

764 + Submodule nested a5a65c9..b55928c:

765 + diff --git a/nested/file b/nested/file

766 + new file mode 100644

767 + index 0000000..ca281f5

768 + --- /dev/null

769 + +++ b/nested/file

770 + @@ -0,0 +1 @@

771 + +nested content

772 + EOF

773 + git -C sm2 diff --submodule=diff >actual 2>err &&

774 + test_must_be_empty err &&

775 + test_cmp expected actual

776 +'

777 +

778 test_done