diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-27 12:03:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-27 12:03:37 -0700 |
| commit | 82bc9f515c93cdb66f87092c7e270b8de112919f (patch) | |
| tree | f48a26ac8b1a50605da3860e49a071742fef1e26 | |
| parent | 997a1946a55cafb992c4ba8e5e0795aa73f5a4a9 (diff) | |
| parent | a76a326b2af925ab45d2cfffbb6d925763eb6e5d (diff) | |
| download | git-82bc9f515c93cdb66f87092c7e270b8de112919f.tar.gz | |
Merge branch 'maint'
* maint:
clone: Quote user supplied path in a single quote pair
read-cache.c: fix index memory allocation
| -rw-r--r-- | builtin/clone.c | 4 | ||||
| -rw-r--r-- | read-cache.c | 6 | ||||
| -rwxr-xr-x | t/t7511-status-index.sh | 50 |
3 files changed, 55 insertions, 5 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 488f48e9a5..efe8b6cce5 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -577,9 +577,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix) if (0 <= option_verbosity) { if (option_bare) - printf(_("Cloning into bare repository %s...\n"), dir); + printf(_("Cloning into bare repository '%s'...\n"), dir); else - printf(_("Cloning into %s...\n"), dir); + printf(_("Cloning into '%s'...\n"), dir); } init_db(option_template, INIT_DB_QUIET); write_config(&option_config); diff --git a/read-cache.c b/read-cache.c index 01a0e25051..5790a91044 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1249,9 +1249,9 @@ static void convert_from_disk(struct ondisk_cache_entry *ondisk, struct cache_en static inline size_t estimate_cache_size(size_t ondisk_size, unsigned int entries) { - long per_entry; - - per_entry = sizeof(struct cache_entry) - sizeof(struct ondisk_cache_entry); + size_t fix_size_mem = offsetof(struct cache_entry, name); + size_t fix_size_dsk = offsetof(struct ondisk_cache_entry, name); + long per_entry = (fix_size_mem - fix_size_dsk + 7) & ~7; /* * Alignment can cause differences. This should be "alignof", but diff --git a/t/t7511-status-index.sh b/t/t7511-status-index.sh new file mode 100755 index 0000000000..bca359dc1e --- /dev/null +++ b/t/t7511-status-index.sh @@ -0,0 +1,50 @@ +#!/bin/sh + +test_description='git status with certain file name lengths' + +. ./test-lib.sh + +files="0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v w x y z" + +check() { + len=$1 + prefix=$2 + + for i in $files + do + : >$prefix$i + done + + test_expect_success "status, filename length $len" " + git add $prefix* && + git status + " + rm $prefix* .git/index +} + +check 1 +check 2 p +check 3 pr +check 4 pre +check 5 pref +check 6 prefi +check 7 prefix +check 8 prefix- +check 9 prefix-p +check 10 prefix-pr +check 11 prefix-pre +check 12 prefix-pref +check 13 prefix-prefi +check 14 prefix-prefix +check 15 prefix-prefix- +check 16 prefix-prefix-p +check 17 prefix-prefix-pr +check 18 prefix-prefix-pre +check 19 prefix-prefix-pref +check 20 prefix-prefix-prefi +check 21 prefix-prefix-prefix +check 22 prefix-prefix-prefix- +check 23 prefix-prefix-prefix-p +check 24 prefix-prefix-prefix-pr + +test_done |