From 43be7a782e08489062a3b8130cbb7ffbe8807191 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Sat, 18 Apr 2009 13:26:42 +0200 Subject: [PATCH 1/5] imap-send: use correct configuration variable in documentation It's imap.pass (not imap.password). Signed-off-by: Paul Bolle Signed-off-by: Junio C Hamano --- Documentation/git-imap-send.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt index 1685f04ef..eed50572e 100644 --- a/Documentation/git-imap-send.txt +++ b/Documentation/git-imap-send.txt @@ -51,7 +51,7 @@ imap.host:: imap.user:: The username to use when logging in to the server. -imap.password:: +imap.pass:: The password to use when logging in to the server. imap.port:: From 32d1776b1341c17b99da862e80ddf151a5b558fe Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Sat, 18 Apr 2009 16:14:02 +0200 Subject: [PATCH 2/5] init: Do not segfault on big GIT_TEMPLATE_DIR environment variable Signed-off-by: Frank Lichtenheld Signed-off-by: Junio C Hamano --- builtin-init-db.c | 4 +++- t/t0001-init.sh | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/builtin-init-db.c b/builtin-init-db.c index d30c3fe2c..6cc945d50 100644 --- a/builtin-init-db.c +++ b/builtin-init-db.c @@ -122,8 +122,10 @@ static void copy_templates(const char *template_dir) template_dir = system_path(DEFAULT_GIT_TEMPLATE_DIR); if (!template_dir[0]) return; + template_len = strlen(template_dir); + if (PATH_MAX <= (template_len+strlen("/config"))) + die("insanely long template path %s", template_dir); strcpy(template_path, template_dir); - template_len = strlen(template_path); if (template_path[template_len-1] != '/') { template_path[template_len++] = '/'; template_path[template_len] = 0; diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 5ac0a273a..e3d846420 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -199,4 +199,13 @@ test_expect_success 'init honors global core.sharedRepository' ' x`git config -f shared-honor-global/.git/config core.sharedRepository` ' +test_expect_success 'init rejects insanely long --template' ' + ( + insane=$(printf "x%09999dx" 1) && + mkdir test && + cd test && + test_must_fail git init --template=$insane + ) +' + test_done From 62854410449ec407a363e4bb1dc980a75aa1699d Mon Sep 17 00:00:00 2001 From: Markus Heidelberg Date: Sat, 18 Apr 2009 11:46:06 +0200 Subject: [PATCH 3/5] doc/git-daemon: add missing arguments to options Also fix some spellings and typos. Signed-off-by: Markus Heidelberg Signed-off-by: Junio C Hamano --- Documentation/git-daemon.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index 4ba4b75c1..2172e1fed 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -47,7 +47,7 @@ OPTIONS 'git-daemon' will refuse to start when this option is enabled and no whitelist is specified. ---base-path:: +--base-path=path:: Remap all the path requests as relative to the given path. This is sort of "GIT root" - if you run 'git-daemon' with '--base-path=/srv/git' on example.com, then if you later try to pull @@ -80,8 +80,8 @@ OPTIONS Incompatible with --port, --listen, --user and --group options. --listen=host_or_ipaddr:: - Listen on an a specific IP address or hostname. IP addresses can - be either an IPv4 address or an IPV6 address if supported. If IPv6 + Listen on a specific IP address or hostname. IP addresses can + be either an IPv4 address or an IPv6 address if supported. If IPv6 is not supported, then --listen=hostname is also not supported and --listen must be given an IPv4 address. Incompatible with '--inetd' option. @@ -89,15 +89,15 @@ OPTIONS --port=n:: Listen on an alternative port. Incompatible with '--inetd' option. ---init-timeout:: +--init-timeout=n:: Timeout between the moment the connection is established and the client request is received (typically a rather low value, since that should be basically immediate). ---timeout:: +--timeout=n:: Timeout for specific client sub-requests. This includes the time - it takes for the server to process the sub-request and time spent - waiting for next client's request. + it takes for the server to process the sub-request and the time spent + waiting for the next client's request. --syslog:: Log to syslog instead of stderr. Note that this option does not imply @@ -145,7 +145,7 @@ the facility of inet daemon to achieve the same before spawning Enable/disable the service site-wide per default. Note that a service disabled site-wide can still be enabled per repository if it is marked overridable and the - repository enables the service with an configuration + repository enables the service with a configuration item. --allow-override=service:: From 2aa3140bc07d7b593efe2d963d8d9b0a9a0cbf05 Mon Sep 17 00:00:00 2001 From: Markus Heidelberg Date: Sat, 18 Apr 2009 11:46:06 +0200 Subject: [PATCH 4/5] doc/git-daemon: add missing arguments to max-connections option Signed-off-by: Markus Heidelberg Signed-off-by: Junio C Hamano --- Documentation/git-daemon.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index d5596672a..a85121c68 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -100,7 +100,7 @@ OPTIONS it takes for the server to process the sub-request and the time spent waiting for the next client's request. ---max-connections:: +--max-connections=n:: Maximum number of concurrent clients, defaults to 32. Set it to zero for no limit. From 67daebfd3b9ba020d677e069000782b9b1e8cf75 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 18 Apr 2009 14:01:50 -0700 Subject: [PATCH 5/5] Describe fixes since 1.6.2.3 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.6.2.4.txt | 31 ++++++++++++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes-1.6.2.4.txt diff --git a/Documentation/RelNotes-1.6.2.4.txt b/Documentation/RelNotes-1.6.2.4.txt new file mode 100644 index 000000000..21bf4f3a3 --- /dev/null +++ b/Documentation/RelNotes-1.6.2.4.txt @@ -0,0 +1,31 @@ +GIT v1.6.2.4 Release Notes +========================== + +Fixes since v1.6.2.3 +-------------------- + +* The configuration parser had a buffer overflow while parsing an overlong + value. + +* "git-checkout " did not update the index entry at + the named path; it now does. + +* "git init" segfaulted when given an overlong template location via + the --template= option. + +* "git-ls-tree" and "git-diff-tree" used a pathspec correctly when + deciding to descend into a subdirectory but they did not match the + individual paths correctly. This caused pathspecs "abc/d ab" to match + "abc/0" ("abc/d" made them decide to descend into the directory "abc/", + and then "ab" incorrectly matched "abc/0" when it shouldn't). + +* "git-merge-recursive" was broken when a submodule entry was involved in + a criss-cross merge situation. + +Many small documentation updates are included as well. + +--- +exec >/var/tmp/1 +echo O=$(git describe maint) +O=v1.6.2.3-21-ga51609a +git shortlog --no-merges $O..maint diff --git a/RelNotes b/RelNotes index e90dc8ee4..22ea275ee 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.6.2.3.txt \ No newline at end of file +Documentation/RelNotes-1.6.2.4.txt \ No newline at end of file