mirror of
https://github.com/git/git.git
synced 2024-11-09 02:33:11 +01:00
e702496e43
This abstracts away the size of the hash values when copying them from memory location to memory location, much as the introduction of hashcmp abstracted away hash value comparsion. A few call sites were using char* rather than unsigned char* so I added the cast rather than open hashcpy to be void*. This is a reasonable tradeoff as most call sites already use unsigned char* and the existing hashcmp is also declared to be unsigned char*. [jc: Splitted the patch to "master" part, to be followed by a patch for merge-recursive.c which is not in "master" yet. Fixed the cast in the latter hunk to combine-diff.c which was wrong in the original. Also converted ones left-over in combine-diff.c, diff-lib.c and upload-pack.c ] Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
84 lines
1.6 KiB
C
84 lines
1.6 KiB
C
#include "cache.h"
|
|
|
|
static void flush_current_id(int patchlen, unsigned char *id, SHA_CTX *c)
|
|
{
|
|
unsigned char result[20];
|
|
char name[50];
|
|
|
|
if (!patchlen)
|
|
return;
|
|
|
|
SHA1_Final(result, c);
|
|
memcpy(name, sha1_to_hex(id), 41);
|
|
printf("%s %s\n", sha1_to_hex(result), name);
|
|
SHA1_Init(c);
|
|
}
|
|
|
|
static int remove_space(char *line)
|
|
{
|
|
char *src = line;
|
|
char *dst = line;
|
|
unsigned char c;
|
|
|
|
while ((c = *src++) != '\0') {
|
|
if (!isspace(c))
|
|
*dst++ = c;
|
|
}
|
|
return dst - line;
|
|
}
|
|
|
|
static void generate_id_list(void)
|
|
{
|
|
static unsigned char sha1[20];
|
|
static char line[1000];
|
|
SHA_CTX ctx;
|
|
int patchlen = 0;
|
|
|
|
SHA1_Init(&ctx);
|
|
while (fgets(line, sizeof(line), stdin) != NULL) {
|
|
unsigned char n[20];
|
|
char *p = line;
|
|
int len;
|
|
|
|
if (!memcmp(line, "diff-tree ", 10))
|
|
p += 10;
|
|
else if (!memcmp(line, "commit ", 7))
|
|
p += 7;
|
|
|
|
if (!get_sha1_hex(p, n)) {
|
|
flush_current_id(patchlen, sha1, &ctx);
|
|
hashcpy(sha1, n);
|
|
patchlen = 0;
|
|
continue;
|
|
}
|
|
|
|
/* Ignore commit comments */
|
|
if (!patchlen && memcmp(line, "diff ", 5))
|
|
continue;
|
|
|
|
/* Ignore git-diff index header */
|
|
if (!memcmp(line, "index ", 6))
|
|
continue;
|
|
|
|
/* Ignore line numbers when computing the SHA1 of the patch */
|
|
if (!memcmp(line, "@@ -", 4))
|
|
continue;
|
|
|
|
/* Compute the sha without whitespace */
|
|
len = remove_space(line);
|
|
patchlen += len;
|
|
SHA1_Update(&ctx, line, len);
|
|
}
|
|
flush_current_id(patchlen, sha1, &ctx);
|
|
}
|
|
|
|
static const char patch_id_usage[] = "git-patch-id < patch";
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
if (argc != 1)
|
|
usage(patch_id_usage);
|
|
|
|
generate_id_list();
|
|
return 0;
|
|
}
|