Documentation: --cherry-pick

diff --git a/config.c b/config.c
index 0ff413b804afc1ec042ed5190ae4f9055a17ea87..70d105567921fe75518d8d5fe3d3df4aad0659cd 100644 (file)
--- a/config.c
+++ b/config.c
@@ -269,6 +269,11 @@ int git_default_config(const char *var, const char *value)
                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;
@@ -326,6 +331,11 @@ int git_default_config(const char *var, const char *value)
                return 0;
        }
 
+       if (!strcmp(var, "core.deltabasecachelimit")) {
+               delta_base_cache_limit = git_config_int(var, value);
+               return 0;
+       }
+
        if (!strcmp(var, "core.autocrlf")) {
                if (value && !strcasecmp(value, "input")) {
                        auto_crlf = -1;
@@ -346,12 +356,12 @@ int git_default_config(const char *var, const char *value)
        }
 
        if (!strcmp(var, "i18n.commitencoding")) {
-               git_commit_encoding = strdup(value);
+               git_commit_encoding = xstrdup(value);
                return 0;
        }
 
        if (!strcmp(var, "i18n.logoutputencoding")) {
-               git_log_output_encoding = strdup(value);
+               git_log_output_encoding = xstrdup(value);
                return 0;
        }
 
@@ -426,7 +436,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;
@@ -574,11 +584,11 @@ static int store_write_pair(int fd, const char* key, const char* value)
        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--)
@@ -722,7 +732,8 @@ int git_config_set_multivar(const char* key, const char* value,
        } 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;
@@ -779,7 +790,8 @@ int git_config_set_multivar(const char* key, const char* value,
                }
 
                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);
 
@@ -788,12 +800,12 @@ int git_config_set_multivar(const char* key, const char* value,
 
                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 */
@@ -820,13 +832,13 @@ int git_config_set_multivar(const char* key, const char* value,
                }
 
                /* 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);
        }
 
@@ -854,9 +866,37 @@ int git_config_set_multivar(const char* key, const char* value,
 
 }
 
+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;
@@ -876,8 +916,8 @@ int git_config_rename_section(const char *old_name, const char *new_name)
        }
 
        if (!(config_file = fopen(config_filename, "rb"))) {
-               ret = error("Could not open config file!");
-               goto out;
+               /* no config file means nothing to rename, no error */
+               goto unlock_and_out;
        }
 
        while (fgets(buf, sizeof(buf), config_file)) {
@@ -887,31 +927,12 @@ int git_config_rename_section(const char *old_name, const char *new_name)
                        ; /* 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();
@@ -919,7 +940,10 @@ int git_config_rename_section(const char *old_name, const char *new_name)
                                }
                                continue;
                        }
+                       remove = 0;
                }
+               if (remove)
+                       continue;
                length = strlen(buf);
                if (write_in_full(out_fd, buf, length) != length) {
                        ret = write_error();
@@ -927,6 +951,7 @@ int git_config_rename_section(const char *old_name, const char *new_name)
                }
        }
        fclose(config_file);
+ unlock_and_out:
        if (close(out_fd) || commit_lock_file(lock) < 0)
                        ret = error("Cannot commit config file!");
  out: