Skip to content

Commit 3e3d4ee

Browse files
spearcespearce
committed
Merge branch 'pb/gitweb-tagcloud' into pb/gitweb
* pb/gitweb-tagcloud: gitweb: Support for simple project search form gitweb: Make the by_tag filter delve in forks as well gitweb: Support for tag clouds ... (+ many updates from master) ... Conflicts: gitweb/gitweb.perl
2 parents d627f68 + 0d1d154 commit 3e3d4ee

38 files changed

+447
-169
lines changed

‎Documentation/technical/api-run-command.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Functions
3030
start_command() followed by finish_command(). Takes a pointer
3131
to a `struct child_process` that specifies the details.
3232

33-
`run_command_v_opt`, `run_command_v_opt_cd`, `run_command_v_opt_cd_env`::
33+
`run_command_v_opt`, `run_command_v_opt_cd_env`::
3434

3535
Convenience functions that encapsulate a sequence of
3636
start_command() followed by finish_command(). The argument argv

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,7 @@ ifeq ($(uname_S),SunOS)
648648
NO_MEMMEM = YesPlease
649649
NO_HSTRERROR = YesPlease
650650
NO_MKDTEMP = YesPlease
651+
OLD_ICONV = UnfortunatelyYes
651652
ifeq ($(uname_R),5.8)
652653
NEEDS_LIBICONV = YesPlease
653654
NO_UNSETENV = YesPlease

‎archive.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ static char const * const archive_usage[] = {
1515

1616
#define USES_ZLIB_COMPRESSION 1
1717

18-
const struct archiver {
18+
static const struct archiver {
1919
const char *name;
2020
write_archive_fn_t write_archive;
2121
unsigned int flags;

‎arm/sha1.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#include <string.h>
99
#include "sha1.h"
1010

11-
extern void sha_transform(uint32_t *hash, const unsigned char *data, uint32_t *W);
11+
extern void arm_sha_transform(uint32_t *hash, const unsigned char *data, uint32_t *W);
1212

13-
void SHA1_Init(SHA_CTX *c)
13+
void arm_SHA1_Init(arm_SHA_CTX *c)
1414
{
1515
c->len = 0;
1616
c->hash[0] = 0x67452301;
@@ -20,7 +20,7 @@ void SHA1_Init(SHA_CTX *c)
2020
c->hash[4] = 0xc3d2e1f0;
2121
}
2222

23-
void SHA1_Update(SHA_CTX *c, const void *p, unsigned long n)
23+
void arm_SHA1_Update(arm_SHA_CTX *c, const void *p, unsigned long n)
2424
{
2525
uint32_t workspace[80];
2626
unsigned int partial;
@@ -32,12 +32,12 @@ void SHA1_Update(SHA_CTX *c, const void *p, unsigned long n)
3232
if (partial) {
3333
done = 64 - partial;
3434
memcpy(c->buffer + partial, p, done);
35-
sha_transform(c->hash, c->buffer, workspace);
35+
arm_sha_transform(c->hash, c->buffer, workspace);
3636
partial = 0;
3737
} else
3838
done = 0;
3939
while (n >= done + 64) {
40-
sha_transform(c->hash, p + done, workspace);
40+
arm_sha_transform(c->hash, p + done, workspace);
4141
done += 64;
4242
}
4343
} else
@@ -46,7 +46,7 @@ void SHA1_Update(SHA_CTX *c, const void *p, unsigned long n)
4646
memcpy(c->buffer + partial, p + done, n - done);
4747
}
4848

49-
void SHA1_Final(unsigned char *hash, SHA_CTX *c)
49+
void arm_SHA1_Final(unsigned char *hash, arm_SHA_CTX *c)
5050
{
5151
uint64_t bitlen;
5252
uint32_t bitlen_hi, bitlen_lo;
@@ -57,7 +57,7 @@ void SHA1_Final(unsigned char *hash, SHA_CTX *c)
5757
bitlen = c->len << 3;
5858
offset = c->len & 0x3f;
5959
padlen = ((offset < 56) ? 56 : (64 + 56)) - offset;
60-
SHA1_Update(c, padding, padlen);
60+
arm_SHA1_Update(c, padding, padlen);
6161

6262
bitlen_hi = bitlen >> 32;
6363
bitlen_lo = bitlen & 0xffffffff;
@@ -69,7 +69,7 @@ void SHA1_Final(unsigned char *hash, SHA_CTX *c)
6969
bits[5] = bitlen_lo >> 16;
7070
bits[6] = bitlen_lo >> 8;
7171
bits[7] = bitlen_lo;
72-
SHA1_Update(c, bits, 8);
72+
arm_SHA1_Update(c, bits, 8);
7373

7474
for (i = 0; i < 5; i++) {
7575
uint32_t v = c->hash[i];

‎arm/sha1.h‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,17 @@
77

88
#include <stdint.h>
99

10-
typedef struct sha_context {
10+
typedef struct {
1111
uint64_t len;
1212
uint32_t hash[5];
1313
unsigned char buffer[64];
14-
} SHA_CTX;
14+
} arm_SHA_CTX;
1515

16-
void SHA1_Init(SHA_CTX *c);
17-
void SHA1_Update(SHA_CTX *c, const void *p, unsigned long n);
18-
void SHA1_Final(unsigned char *hash, SHA_CTX *c);
16+
void arm_SHA1_Init(arm_SHA_CTX *c);
17+
void arm_SHA1_Update(arm_SHA_CTX *c, const void *p, unsigned long n);
18+
void arm_SHA1_Final(unsigned char *hash, arm_SHA_CTX *c);
19+
20+
#define git_SHA_CTX arm_SHA_CTX
21+
#define git_SHA1_Init arm_SHA1_Init
22+
#define git_SHA1_Update arm_SHA1_Update
23+
#define git_SHA1_Final arm_SHA1_Final

‎arm/sha1_arm.S‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
*/
1111

1212
.text
13-
.globl sha_transform
13+
.globl arm_sha_transform
1414

1515
/*
1616
* void sha_transform(uint32_t *hash, const unsigned char *data, uint32_t *W);
1717
*
1818
* note: the "data" pointer may be unaligned.
1919
*/
2020

21-
sha_transform:
21+
arm_sha_transform:
2222

2323
stmfd sp!, {r4 - r8, lr}
2424

‎builtin-unpack-objects.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ static const char unpack_usage[] = "git unpack-objects [-n] [-q] [-r] [--strict]
1919
static unsigned char buffer[4096];
2020
static unsigned int offset, len;
2121
static off_t consumed_bytes;
22-
static SHA_CTX ctx;
22+
static git_SHA_CTX ctx;
2323

2424
/*
2525
* When running under --strict mode, objects whose reachability are
@@ -59,7 +59,7 @@ static void *fill(int min)
5959
if (min > sizeof(buffer))
6060
die("cannot fill %d bytes", min);
6161
if (offset) {
62-
SHA1_Update(&ctx, buffer, offset);
62+
git_SHA1_Update(&ctx, buffer, offset);
6363
memmove(buffer, buffer + offset, len);
6464
offset = 0;
6565
}
@@ -539,10 +539,10 @@ int cmd_unpack_objects(int argc, const char **argv, const char *prefix)
539539
/* We don't take any non-flag arguments now.. Maybe some day */
540540
usage(unpack_usage);
541541
}
542-
SHA1_Init(&ctx);
542+
git_SHA1_Init(&ctx);
543543
unpack_all();
544-
SHA1_Update(&ctx, buffer, offset);
545-
SHA1_Final(sha1, &ctx);
544+
git_SHA1_Update(&ctx, buffer, offset);
545+
git_SHA1_Final(sha1, &ctx);
546546
if (strict)
547547
write_rest();
548548
if (hashcmp(fill(20), sha1))

‎cache.h‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@
66
#include "hash.h"
77

88
#include SHA1_HEADER
9-
#include <zlib.h>
9+
#ifndef git_SHA_CTX
10+
#define git_SHA_CTX SHA_CTX
11+
#define git_SHA1_Init SHA1_Init
12+
#define git_SHA1_Update SHA1_Update
13+
#define git_SHA1_Final SHA1_Final
14+
#endif
1015

16+
#include <zlib.h>
1117
#if defined(NO_DEFLATE_BOUND) || ZLIB_VERNUM < 0x1200
1218
#define deflateBound(c,s) ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11)
1319
#endif
@@ -749,7 +755,6 @@ typedef int (*config_fn_t)(const char *, const char *, void *);
749755
extern int git_default_config(const char *, const char *, void *);
750756
extern int git_config_from_file(config_fn_t fn, const char *, void *);
751757
extern int git_config(config_fn_t fn, void *);
752-
extern int git_parse_long(const char *, long *);
753758
extern int git_parse_ulong(const char *, unsigned long *);
754759
extern int git_config_int(const char *, const char *);
755760
extern unsigned long git_config_ulong(const char *, const char *);

‎commit.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ struct commit_graft *read_graft_line(char *buf, int len)
160160
return graft;
161161
}
162162

163-
int read_graft_file(const char *graft_file)
163+
static int read_graft_file(const char *graft_file)
164164
{
165165
FILE *fp = fopen(graft_file, "r");
166166
char buf[1024];

‎commit.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ struct commit_graft {
118118

119119
struct commit_graft *read_graft_line(char *buf, int len);
120120
int register_commit_graft(struct commit_graft *, int);
121-
int read_graft_file(const char *graft_file);
122121
struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
123122

124123
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);

0 commit comments

Comments
 (0)