Merge git://github.com/git-l10n/git-po

* git://github.com/git-l10n/git-po:
l10n: de.po: correct singular form
l10n: de.po: translate "leave behind" correctly
l10n: de.po: fix typo
l10n: ca.po: update translation

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 2f6b6aabd74a24abdb3ac189118095fcee19f8d2..3e39e2815baca82fe5f1fff8791de37c3c7247ac 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -103,7 +103,7 @@ ASCIIDOC_HTML = xhtml11
 ASCIIDOC_DOCBOOK = docbook
 ASCIIDOC_CONF = -f asciidoc.conf
 ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \
-               -agit-version=$(GIT_VERSION)
+               -agit_version=$(GIT_VERSION)
 TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML)
 TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK)
 MANPAGE_XSL = manpage-normal.xsl

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 750b5a24b4e7c1781adde09ac2717f7cbf02b872..31b133b357f34e9bc0a63dec5ce2dbceba43e765 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -75,8 +75,6 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
                if (type_from_string(exp_type) == OBJ_BLOB) {
                        unsigned char blob_sha1[20];
                        if (sha1_object_info(sha1, NULL) == OBJ_TAG) {
-                               enum object_type type;
-                               unsigned long size;
                                char *buffer = read_sha1_file(sha1, &type, &size);
                                const char *target;
                                if (!skip_prefix(buffer, "object ", &target) ||

diff --git a/t/t1050-large.sh b/t/t1050-large.sh
index f5a91192903b455df3d7d13d8009ea90999405e3..f9f3d1391ff496da38e0ed25780d1fdae173c91d 100755 (executable)
--- a/t/t1050-large.sh
+++ b/t/t1050-large.sh
@@ -9,10 +9,10 @@ test_expect_success setup '
        # clone does not allow us to pass core.bigfilethreshold to
        # new repos, so set core.bigfilethreshold globally
        git config --global core.bigfilethreshold 200k &&
-       echo X | dd of=large1 bs=1k seek=2000 &&
-       echo X | dd of=large2 bs=1k seek=2000 &&
-       echo X | dd of=large3 bs=1k seek=2000 &&
-       echo Y | dd of=huge bs=1k seek=2500 &&
+       printf "%2000000s" X >large1 &&
+       cp large1 large2 &&
+       cp large1 large3 &&
+       printf "%2500000s" Y >huge &&
        GIT_ALLOC_LIMIT=1500k &&
        export GIT_ALLOC_LIMIT
 '
@@ -61,7 +61,7 @@ test_expect_success 'checkout a large file' '
        large1=$(git rev-parse :large1) &&
        git update-index --add --cacheinfo 100644 $large1 another &&
        git checkout another &&
-       cmp large1 another ;# this must not be test_cmp
+       test_cmp large1 another
 '
 
 test_expect_success 'packsize limit' '
@@ -162,7 +162,7 @@ test_expect_success 'pack-objects with large loose object' '
        test_create_repo packed &&
        mv pack-* packed/.git/objects/pack &&
        GIT_DIR=packed/.git git cat-file blob $SHA1 >actual &&
-       cmp huge actual
+       test_cmp huge actual
 '
 
 test_expect_success 'tar achiving' '

diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 245406ab979d63d3588c4e2000b02cc5f24e493b..8cffd35fb03d7ca5abbd1a229c6c8533f8c5e917 100755 (executable)
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -658,7 +658,7 @@ test_expect_success '--show-notes=* adds to GIT_NOTES_DISPLAY_REF' '
 '
 
 test_expect_success '--no-standard-notes' '
-       cat >expect-commits <<EOF
+       cat >expect-commits <<-EOF &&
                commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
                Author: A U Thor <author@example.com>
                Date:   Thu Apr 7 15:18:13 2005 -0700