Subject: [PATCH v2 0/1] submodule: Fix 'submodule status' when called from a subdirectory

From: "Manish Goregaokar via GitGitGadget" <[email-masked]>
Date: Sun, 24 Nov 2019 08:01:12 +0000

Updated to include a test and a more standard commit message.

Manish Goregaokar (1):
  submodule: fix 'submodule status' when called from a subdirectory

 builtin/submodule--helper.c |  3 ++-
 t/t7400-submodule-basic.sh  | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

base-commit: 5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-472%2FManishearth%2Fsubdir-status-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-472/Manishearth/subdir-status-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/472

Range-diff vs v1:

 1:  2004f4aaa9 ! 1:  e4c932bd09 submodule: Fix 'submodule status' when called from a subdirectory
     @@ -1,18 +1,18 @@
      Author: Manish Goregaokar <[email-masked]>
      
     -    submodule: Fix 'submodule status' when called from a subdirectory
     +    submodule: fix 'submodule status' when called from a subdirectory
      
     -    Previously, when calling `git submodule status` while in a
     -    subdirectory, it was incorrectly not detecting modified submodules and
     -    thus reporting that all of the submodules were unchanged.
     +    When calling `git submodule status` while in a subdirectory, we are
     +    incorrectly not detecting modified submodules and
     +    thus reporting that all of the submodules are unchanged.
      
     -    This was because the submodule helper was calling `diff-index` with the
     -    submodule path assuming the path was relative to the current prefix
     +    This is because the submodule helper is calling `diff-index` with the
     +    submodule path assuming the path is relative to the current prefix
          directory, however the submodule path used is actually relative to the root.
      
     -    This fixes the bug by setting the `prefix` to NULL when running
     -    `diff-index` from the helper, so that it correctly interprets the path
     -    as relative to the repository root.
     +    Always pass NULL as the `prefix` when running diff-files on the
     +    submodule, to make sure the submodule's path is interpreted as relative
     +    to the superproject's repository root.
      
          Signed-off-by: Manish Goregaokar <[email-masked]>
      
     @@ -24,10 +24,38 @@
       
       	git_config(git_diff_basic_config, NULL);
      -	repo_init_revisions(the_repository, &rev, prefix);
     -+	/*
     -+	 * prefix is NULL since path is an absolute path
     -+	 */
     ++
      +	repo_init_revisions(the_repository, &rev, NULL);
       	rev.abbrev = 0;
       	diff_files_args.argc = setup_revisions(diff_files_args.argc,
       					       diff_files_args.argv,
     +
     + diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
     + --- a/t/t7400-submodule-basic.sh
     + +++ b/t/t7400-submodule-basic.sh
     +@@
     + 	test_line_count = 1 lines
     + '
     + 
     ++test_expect_success 'status from subdirectory should have the same SHA1' '
     ++	test_when_finished "rmdir addtest/subdir" &&
     ++	(
     ++		cd addtest &&
     ++		git status > /tmp/foo &&
     ++		git submodule status | awk "{print \$1}" >expected &&
     ++		mkdir subdir &&
     ++		cd subdir &&
     ++		git submodule status | awk "{print \$1}" >../actual &&
     ++		test_cmp ../expected ../actual &&
     ++		git -C ../submod checkout @^ &&
     ++		git submodule status | awk "{print \$1}" >../actual2 &&
     ++		cd .. &&
     ++		git submodule status | awk "{print \$1}" >expected2 &&
     ++		test_cmp actual2 expected2 &&
     ++		test_must_fail test_cmp actual actual2
     ++	)
     ++'
     ++
     + test_expect_success 'setup - fetch commit name from submodule' '
     + 	rev1=$(cd .subrepo && git rev-parse HEAD) &&
     + 	printf "rev1: %s\n" "$rev1" &&

-- 
gitgitgadget