summaryrefslogtreecommitdiff
path: root/t/t7110-reset-merge.sh
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2017-09-26 11:27:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-28 14:15:20 +0900
commit2d94dd2fc6428ff5f0a18223aadaaecd49fd18e5 (patch)
tree88b268cb04b414544bca2de3bebc27ecc9ec3251 /t/t7110-reset-merge.sh
parentSync with 2.14.2 (diff)
downloadtgif-2d94dd2fc6428ff5f0a18223aadaaecd49fd18e5.tar.xz
submodule: correct error message for missing commits
When a submodule diff should be displayed we currently just add the submodule objects to the main object store and then e.g. walk the revision graph and create a summary for that submodule. It is possible that we are missing the submodule either completely or partially, which we currently differentiate with different error messages depending on whether (1) the whole submodule object store is missing or (2) just the needed for this particular diff. (1) is reported as "not initialized", and (2) is reported as "commits not present". If a submodule is deinit'ed its repository data is still around inside the superproject, such that the diff can still be produced. In that way the error message (1) is misleading as we can have a diff despite the submodule being not initialized. Downgrade the error message (1) to be the same as (2) and just say the commits are not present, as that is the true reason why the diff cannot be shown. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7110-reset-merge.sh')
0 files changed, 0 insertions, 0 deletions