averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync with 1.7.6.3

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2011-09-12 10:43:17 -07:00
parent e49450327e 740a8fc224
commit 81a5bdd9c5
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/RelNotes/1.7.6.3.txt
View File

@@ -7,6 +7,10 @@ Fixes since v1.7.6.2
* "git -c var=value subcmd" misparsed the custom configuration when * "git -c var=value subcmd" misparsed the custom configuration when
value contained an equal sign. value contained an equal sign.
* "git fetch" had a major performance regression, wasting many
needless cycles in a repository where there is no submodules
present. This was especially bad, when there were many refs.
* "git reflog $refname" did not default to the "show" subcommand as * "git reflog $refname" did not default to the "show" subcommand as
the documentation advertised the command to do. the documentation advertised the command to do.

3
Documentation/git.txt
View File

@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: Documentation for older releases are available here:
* link:v1.7.6.2/git.html[documentation for release 1.7.6.2] * link:v1.7.6.3/git.html[documentation for release 1.7.6.3]
* release notes for * release notes for
link:RelNotes/1.7.6.3.txt[1.7.6.3],
link:RelNotes/1.7.6.2.txt[1.7.6.2], link:RelNotes/1.7.6.2.txt[1.7.6.2],
link:RelNotes/1.7.6.1.txt[1.7.6.1], link:RelNotes/1.7.6.1.txt[1.7.6.1],
link:RelNotes/1.7.6.txt[1.7.6]. link:RelNotes/1.7.6.txt[1.7.6].

15
builtin/fetch.c
View File

@@ -941,6 +941,15 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, argc = parse_options(argc, argv, prefix,
builtin_fetch_options, builtin_fetch_usage, 0); builtin_fetch_options, builtin_fetch_usage, 0);
if (recurse_submodules != RECURSE_SUBMODULES_OFF) {
if (recurse_submodules_default) {
int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default);
set_config_fetch_recurse_submodules(arg);
}
gitmodules_config();
git_config(submodule_config, NULL);
}
if (all) { if (all) {
if (argc == 1) if (argc == 1)
die(_("fetch --all does not take a repository argument")); die(_("fetch --all does not take a repository argument"));
@@ -976,12 +985,6 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) { if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
const char *options[10]; const char *options[10];
int num_options = 0; int num_options = 0;
if (recurse_submodules_default) {
int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default);
set_config_fetch_recurse_submodules(arg);
}
gitmodules_config();
git_config(submodule_config, NULL);
add_options_to_argv(&num_options, options); add_options_to_argv(&num_options, options);
result = fetch_populated_submodules(num_options, options, result = fetch_populated_submodules(num_options, options,
submodule_prefix, submodule_prefix,

4
submodule.c
View File

@@ -481,6 +481,10 @@ void check_for_new_submodule_commits(unsigned char new_sha1[20])
const char *argv[] = {NULL, NULL, "--not", "--all", NULL}; const char *argv[] = {NULL, NULL, "--not", "--all", NULL};
int argc = ARRAY_SIZE(argv) - 1; 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); init_revisions(&rev, NULL);
argv[1] = xstrdup(sha1_to_hex(new_sha1)); argv[1] = xstrdup(sha1_to_hex(new_sha1));
setup_revisions(argc, argv, &rev, NULL); setup_revisions(argc, argv, &rev, NULL);