diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-12 19:19:57 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-12 19:19:57 +0200 |
| commit | 8702fee6171abb2e353499fa0cecba90ad5f277f (patch) | |
| tree | 64366b7892e0fa5aac9c9526f77f532535c7f548 /submodule.c | |
| parent | Prepare for 1.7.6.3 maintenance release (diff) | |
| parent | fetch: skip on-demand checking when no submodules are configured (diff) | |
| download | git-8702fee6171abb2e353499fa0cecba90ad5f277f.tar.xz git-8702fee6171abb2e353499fa0cecba90ad5f277f.zip | |
Merge branch 'jl/maint-fetch-submodule-check-fix' into maint
* jl/maint-fetch-submodule-check-fix:
fetch: skip on-demand checking when no submodules are configured
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/submodule.c b/submodule.c index 1ba9646d34..b648927509 100644 --- a/submodule.c +++ b/submodule.c @@ -373,6 +373,10 @@ void check_for_new_submodule_commits(unsigned char new_sha1[20]) const char *argv[] = {NULL, NULL, "--not", "--all", NULL}; int argc = ARRAY_SIZE(argv) - 1; + /* No need to check if there are no submodules configured */ + if (!config_name_for_path.nr) + return; + init_revisions(&rev, NULL); argv[1] = xstrdup(sha1_to_hex(new_sha1)); setup_revisions(argc, argv, &rev, NULL); |