Merge branch 'lt/fix-config' into lt/config

* lt/fix-config:
  git config syntax updates
  Another config file parsing fix.
  checkout: use --aggressive when running a 3-way merge (-m).
  Fix git-pack-objects for 64-bit platforms

with manual adjustment of t/t1300 for "git repo-config --list" option.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --cc pack-objects.c
Simple merge

diff --cc repo-config.c
index 63eda1b,58b6c52..127afd7
--- 1/repo-config.c
--- 2/repo-config.c
+++ b/repo-config.c
@@@ -64,21 -47,15 +64,22 @@@ static int show_config(const char* key_
  
  static int get_value(const char* key_, const char* regex_)
  {
--      int i;
+       char *tl;
  
-       key = malloc(strlen(key_)+1);
-       for (i = 0; key_[i]; i++)
-               key[i] = tolower(key_[i]);
-       key[i] = 0;
+       key = strdup(key_);
+       for (tl=key+strlen(key)-1; tl >= key && *tl != '.'; --tl)
+               *tl = tolower(*tl);
+       for (tl=key; *tl && *tl != '.'; ++tl)
+               *tl = tolower(*tl);
  
 +      if (use_key_regexp) {
 +              key_regexp = (regex_t*)malloc(sizeof(regex_t));
 +              if (regcomp(key_regexp, key, REG_EXTENDED)) {
 +                      fprintf(stderr, "Invalid key pattern: %s\n", key_);
 +                      return -1;
 +              }
 +      }
 +
        if (regex_) {
                if (regex_[0] == '!') {
                        do_not_match = 1;

diff --cc sha1_file.c
Simple merge

diff --cc t/t1300-repo-config.sh
index 7090ea9,028d159..8260d57
--- 1/t/t1300-repo-config.sh
--- 2/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@@ -247,24 -247,6 +247,24 @@@ EO
  
  test_expect_success 'hierarchical section value' 'cmp .git/config expect'
  
- 1.2.3.alpha=beta
 +cat > expect << EOF
 +beta.noindent=sillyValue
 +nextsection.nonewline=wow2 for me
 +123456.a123=987
++version.1.2.3eX.alpha=beta
 +EOF
 +
 +test_expect_success 'working --list' \
 +      'git-repo-config --list > output && cmp output expect'
 +
 +cat > expect << EOF
 +beta.noindent sillyValue
 +nextsection.nonewline wow2 for me
 +EOF
 +
 +test_expect_success '--get-regexp' \
 +      'git-repo-config --get-regexp in > output && cmp output expect'
 +
  cat > .git/config << EOF
  [novalue]
        variable