Merge branch 'master' into next

* master:
Fix silly typo in new builtin grep
Fix pack-index issue on 64-bit platforms a bit more portably.
Install git-send-email by default
Fix compilation on newer NetBSD systems

diff --git a/Makefile b/Makefile
index 506f6407935b20ba5efbd1f09390bfb2cd3c2d58..55d193780fd49768ed8a8490059a82387ba3b4ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -287,7 +287,9 @@ ifeq ($(uname_S),OpenBSD)
        ALL_LDFLAGS += -L/usr/local/lib
 endif
 ifeq ($(uname_S),NetBSD)
-       NEEDS_LIBICONV = YesPlease
+       ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
+               NEEDS_LIBICONV = YesPlease
+       endif
        ALL_CFLAGS += -I/usr/pkg/include
        ALL_LDFLAGS += -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib
 endif

diff --git a/builtin-grep.c b/builtin-grep.c
index 3d6e515f1f04f07de5d2237dee7cb62c6b66dd24..66111de5148c17a156fdbfbc0d92b0c93c2b2c34 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -455,7 +455,7 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached)
        push_arg("grep");
        push_arg("-H");
        if (opt->fixed)
-               push_arg("-H");
+               push_arg("-F");
        if (opt->linenum)
                push_arg("-n");
        if (opt->regflags & REG_EXTENDED)

diff --git a/pack-objects.c b/pack-objects.c
index b430b02cf7f5b39c97bc090634ef26346a022ade..566a2a2349871d05378b1b8de27d315b7451f89c 100644 (file)
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -10,7 +10,6 @@
 #include "tree-walk.h"
 #include <sys/time.h>
 #include <signal.h>
-#include <stdint.h>
 
 static const char pack_usage[] = "git-pack-objects [-q] [--no-reuse-delta] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list";
 
@@ -157,7 +156,7 @@ static void prepare_pack_revindex(struct pack_revindex *rix)
 
        rix->revindex = xmalloc(sizeof(unsigned long) * (num_ent + 1));
        for (i = 0; i < num_ent; i++) {
-               uint32_t hl = *((uint32_t *)(index + 24 * i));
+               unsigned int hl = *((unsigned int *)(index + 24 * i));
                rix->revindex[i] = ntohl(hl);
        }
        /* This knows the pack format -- the 20-byte trailer

diff --git a/sha1_file.c b/sha1_file.c
index 3372ebcdcac0d36b81663f958784e8a1ec84b900..223001033c30eed20d7c5ee59719bffd25036ded 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -13,7 +13,6 @@
 #include "commit.h"
 #include "tag.h"
 #include "tree.h"
-#include <stdint.h>
 
 #ifndef O_NOATIME
 #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
@@ -1162,7 +1161,7 @@ int find_pack_entry_one(const unsigned char *sha1,
                int mi = (lo + hi) / 2;
                int cmp = memcmp(index + 24 * mi + 4, sha1, 20);
                if (!cmp) {
-                       e->offset = ntohl(*((uint32_t *)(index + 24 * mi)));
+                       e->offset = ntohl(*((unsigned int *)(index + 24 * mi)));
                        memcpy(e->sha1, sha1, 20);
                        e->p = p;
                        return 1;