summaryrefslogtreecommitdiff
path: root/builtin/patch-id.c
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2010-04-19 08:46:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-19 20:01:46 (GMT)
commit9ae144fbf2648a52da1cc5269918931b328180f9 (patch)
treea6d70c7036fb4ec8f87973cabc19f28a1acc7760 /builtin/patch-id.c
parent5469e2dab133a197dc2ca2fa47eb9e846ac19b66 (diff)
downloadgit-9ae144fbf2648a52da1cc5269918931b328180f9.zip
git-9ae144fbf2648a52da1cc5269918931b328180f9.tar.gz
git-9ae144fbf2648a52da1cc5269918931b328180f9.tar.bz2
patch-id: extract parsing one diff out of generate_id_list
This simplifies a bit the next patch, since it will have more than one condition to exit the loop. Signed-off-by: Paolo Bonzini <bonzini@gnu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/patch-id.c')
-rw-r--r--builtin/patch-id.c39
1 files changed, 26 insertions, 13 deletions
diff --git a/builtin/patch-id.c b/builtin/patch-id.c
index af0911e..973d830 100644
--- a/builtin/patch-id.c
+++ b/builtin/patch-id.c
@@ -28,16 +28,12 @@ static int remove_space(char *line)
return dst - line;
}
-static void generate_id_list(void)
+int get_one_patchid(unsigned char *next_sha1, git_SHA_CTX *ctx)
{
- static unsigned char sha1[20];
static char line[1000];
- git_SHA_CTX ctx;
- int patchlen = 0;
+ int patchlen = 0, found_next = 0;
- git_SHA1_Init(&ctx);
while (fgets(line, sizeof(line), stdin) != NULL) {
- unsigned char n[20];
char *p = line;
int len;
@@ -46,11 +42,9 @@ static void generate_id_list(void)
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;
+ if (!get_sha1_hex(p, next_sha1)) {
+ found_next = 1;
+ break;
}
/* Ignore commit comments */
@@ -68,9 +62,28 @@ static void generate_id_list(void)
/* Compute the sha without whitespace */
len = remove_space(line);
patchlen += len;
- git_SHA1_Update(&ctx, line, len);
+ git_SHA1_Update(ctx, line, len);
+ }
+
+ if (!found_next)
+ hashclr(next_sha1);
+
+ return patchlen;
+}
+
+static void generate_id_list(void)
+{
+ unsigned char sha1[20], n[20];
+ git_SHA_CTX ctx;
+ int patchlen;
+
+ git_SHA1_Init(&ctx);
+ hashclr(sha1);
+ while (!feof(stdin)) {
+ patchlen = get_one_patchid(n, &ctx);
+ flush_current_id(patchlen, sha1, &ctx);
+ hashcpy(sha1, n);
}
- flush_current_id(patchlen, sha1, &ctx);
}
static const char patch_id_usage[] = "git patch-id < patch";