diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-08-13 01:07:09 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-08-13 01:07:09 (GMT) |
commit | 642f7108f68ef622b338d27d94a956e32c8567dd (patch) | |
tree | 32972655c14bdbd803e3842cb2220b9045632199 /cache.h | |
parent | 7980e41746bc5de91eea775f9142ce44b1100361 (diff) | |
parent | 452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e (diff) | |
download | git-642f7108f68ef622b338d27d94a956e32c8567dd.zip git-642f7108f68ef622b338d27d94a956e32c8567dd.tar.gz git-642f7108f68ef622b338d27d94a956e32c8567dd.tar.bz2 |
Merge branch 'maint'
* maint:
push: mention "git pull" in error message for non-fast forwards
Standardize do { ... } while (0) style
t/t7003: replace \t with literal tab in sed expression
index-pack: Don't follow replace refs.
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -449,7 +449,7 @@ extern int init_db(const char *template_dir, unsigned int flags); alloc = alloc_nr(alloc); \ x = xrealloc((x), alloc * sizeof(*(x))); \ } \ - } while(0) + } while (0) /* Initialize and use the cache information */ extern int read_index(struct index_state *); |