Merge branch 'js/rebase-i-final'

diff --git a/config.c b/config.c
index a77cae56ed26212c6bfbbd831c85c8cf64deb8b9..345d78c2ba80bbb44c1b700605391ef09d2b3c42 100644 (file)
--- a/config.c
+++ b/config.c
@@ -2200,7 +2200,7 @@ static struct {
        size_t *offset;
        unsigned int offset_alloc;
        enum { START, SECTION_SEEN, SECTION_END_SEEN, KEY_SEEN } state;
-       int seen;
+       unsigned int seen;
 } store;
 
 static int matches(const char *key, const char *value)
@@ -2355,6 +2355,7 @@ static ssize_t write_pair(int fd, const char *key, const char *value)
                case '"':
                case '\\':
                        strbuf_addch(&sb, '\\');
+                       /* fallthrough */
                default:
                        strbuf_addch(&sb, value[i]);
                        break;