Merge branch 'js/config-rename'

* js/config-rename:
git-config: document --rename-section, provide --remove-section

diff --combined config.c
index 8fc4f11f45e83f5ca87b95648db26e068d11fd79,5611d7a6a63885b8be20f7f638185f8f92fa745f..a3c7b772bce1d302e60bbf02212bb4ad4da0ee7b
--- 1/config.c
--- 2/config.c
+++ b/config.c
@@@ -269,11 -269,6 +269,11 @@@ int git_default_config(const char *var
                return 0;
        }
  
 +      if (!strcmp(var, "core.symlinks")) {
 +              has_symlinks = git_config_bool(var, value);
 +              return 0;
 +      }
 +
        if (!strcmp(var, "core.bare")) {
                is_bare_repository_cfg = git_config_bool(var, value);
                return 0;
@@@ -431,7 -426,7 +431,7 @@@ static struct 
        int do_not_match;
        regex_t* value_regex;
        int multi_replace;
 -      off_t offset[MAX_MATCHES];
 +      size_t offset[MAX_MATCHES];
        enum { START, SECTION_SEEN, SECTION_END_SEEN, KEY_SEEN } state;
        int seen;
  } store;
@@@ -579,11 -574,11 +579,11 @@@ static int store_write_pair(int fd, con
        return 1;
  }
  
 -static int find_beginning_of_line(const char* contents, int size,
 -      int offset_, int* found_bracket)
 +static ssize_t find_beginning_of_line(const char* contents, size_t size,
 +      size_t offset_, int* found_bracket)
  {
 -      int equal_offset = size, bracket_offset = size;
 -      int offset;
 +      size_t equal_offset = size, bracket_offset = size;
 +      ssize_t offset;
  
        for (offset = offset_-2; offset > 0 
                        && contents[offset] != '\n'; offset--)
@@@ -727,8 -722,7 +727,8 @@@ int git_config_set_multivar(const char
        } else {
                struct stat st;
                char* contents;
 -              int i, copy_begin, copy_end, new_line = 0;
 +              size_t contents_sz, copy_begin, copy_end;
 +              int i, new_line = 0;
  
                if (value_regex == NULL)
                        store.value_regex = NULL;
@@@ -785,8 -779,7 +785,8 @@@
                }
  
                fstat(in_fd, &st);
 -              contents = xmmap(NULL, st.st_size, PROT_READ,
 +              contents_sz = xsize_t(st.st_size);
 +              contents = xmmap(NULL, contents_sz, PROT_READ,
                        MAP_PRIVATE, in_fd, 0);
                close(in_fd);
  
@@@ -795,12 -788,12 +795,12 @@@
  
                for (i = 0, copy_begin = 0; i < store.seen; i++) {
                        if (store.offset[i] == 0) {
 -                              store.offset[i] = copy_end = st.st_size;
 +                              store.offset[i] = copy_end = contents_sz;
                        } else if (store.state != KEY_SEEN) {
                                copy_end = store.offset[i];
                        } else
                                copy_end = find_beginning_of_line(
 -                                      contents, st.st_size,
 +                                      contents, contents_sz,
                                        store.offset[i]-2, &new_line);
  
                        /* write the first part of the config */
@@@ -827,13 -820,13 +827,13 @@@
                }
  
                /* write the rest of the config */
 -              if (copy_begin < st.st_size)
 +              if (copy_begin < contents_sz)
                        if (write_in_full(fd, contents + copy_begin,
 -                                        st.st_size - copy_begin) <
 -                          st.st_size - copy_begin)
 +                                        contents_sz - copy_begin) <
 +                          contents_sz - copy_begin)
                                goto write_err_out;
  
 -              munmap(contents, st.st_size);
 +              munmap(contents, contents_sz);
                unlink(config_filename);
        }
  
@@@ -861,9 -854,37 +861,37 @@@ write_err_out
  
  }
  
+ static int section_name_match (const char *buf, const char *name)
+ {
+       int i = 0, j = 0, dot = 0;
+       for (; buf[i] && buf[i] != ']'; i++) {
+               if (!dot && isspace(buf[i])) {
+                       dot = 1;
+                       if (name[j++] != '.')
+                               break;
+                       for (i++; isspace(buf[i]); i++)
+                               ; /* do nothing */
+                       if (buf[i] != '"')
+                               break;
+                       continue;
+               }
+               if (buf[i] == '\\' && dot)
+                       i++;
+               else if (buf[i] == '"' && dot) {
+                       for (i++; isspace(buf[i]); i++)
+                               ; /* do_nothing */
+                       break;
+               }
+               if (buf[i] != name[j++])
+                       break;
+       }
+       return (buf[i] == ']' && name[j] == 0);
+ }
+ 
+ /* if new_name == NULL, the section is removed instead */
  int git_config_rename_section(const char *old_name, const char *new_name)
  {
-       int ret = 0;
+       int ret = 0, remove = 0;
        char *config_filename;
        struct lock_file *lock = xcalloc(sizeof(struct lock_file), 1);
        int out_fd;
@@@ -894,31 -915,12 +922,12 @@@
                        ; /* do nothing */
                if (buf[i] == '[') {
                        /* it's a section */
-                       int j = 0, dot = 0;
-                       for (i++; buf[i] && buf[i] != ']'; i++) {
-                               if (!dot && isspace(buf[i])) {
-                                       dot = 1;
-                                       if (old_name[j++] != '.')
-                                               break;
-                                       for (i++; isspace(buf[i]); i++)
-                                               ; /* do nothing */
-                                       if (buf[i] != '"')
-                                               break;
+                       if (section_name_match (&buf[i+1], old_name)) {
+                               ret++;
+                               if (new_name == NULL) {
+                                       remove = 1;
                                        continue;
                                }
-                               if (buf[i] == '\\' && dot)
-                                       i++;
-                               else if (buf[i] == '"' && dot) {
-                                       for (i++; isspace(buf[i]); i++)
-                                               ; /* do_nothing */
-                                       break;
-                               }
-                               if (buf[i] != old_name[j++])
-                                       break;
-                       }
-                       if (buf[i] == ']' && old_name[j] == 0) {
-                               /* old_name matches */
-                               ret++;
                                store.baselen = strlen(new_name);
                                if (!store_write_section(out_fd, new_name)) {
                                        ret = write_error();
@@@ -926,7 -928,10 +935,10 @@@
                                }
                                continue;
                        }
+                       remove = 0;
                }
+               if (remove)
+                       continue;
                length = strlen(buf);
                if (write_in_full(out_fd, buf, length) != length) {
                        ret = write_error();