summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-12-05 12:52:47 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-12-05 12:52:47 -0800
commit88cf80949e0a4c3cacd4be80358e5fe62acbf0ae (patch)
tree7a914b9459e5684c1976a75cebb38c413007afce /builtin
parentMerge branch 'dl/t5520-cleanup' (diff)
parentsubmodule: fix 'submodule status' when called from a subdirectory (diff)
downloadtgif-88cf80949e0a4c3cacd4be80358e5fe62acbf0ae.tar.xz
Merge branch 'mg/submodule-status-from-a-subdirectory'
"git submodule status" that is run from a subdirectory of the superproject did not work well, which has been corrected. * mg/submodule-status-from-a-subdirectory: submodule: fix 'submodule status' when called from a subdirectory
Diffstat (limited to 'builtin')
-rw-r--r--builtin/submodule--helper.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 2c2395a620..6f73a7467f 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -802,7 +802,8 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
path, NULL);
git_config(git_diff_basic_config, NULL);
- repo_init_revisions(the_repository, &rev, prefix);
+
+ repo_init_revisions(the_repository, &rev, NULL);
rev.abbrev = 0;
diff_files_args.argc = setup_revisions(diff_files_args.argc,
diff_files_args.argv,