Staging
v0.8.1
v0.8.1
https://github.com/git/git
Revision 497171e765b7b4f903d21379bee050380e539cf3 authored by Peter Eriksen on 24 January 2007, 19:54:46 UTC, committed by Junio C Hamano on 24 January 2007, 23:32:52 UTC
We used to get the following confusing error message: $ git commit --amend -a -m foo Option -m cannot be combined with -c/-C/-F This is because --amend cannot be combined with -c/-C/-F, which makes sense, because they try to handle the same log message in different ways. So update the documentation to reflect this. Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 191453f
Tip revision: 497171e765b7b4f903d21379bee050380e539cf3 authored by Peter Eriksen on 24 January 2007, 19:54:46 UTC
Documentation: --amend cannot be combined with -c/-C/-F.
Documentation: --amend cannot be combined with -c/-C/-F.
Tip revision: 497171e
patch-id.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;
}
Computing file changes ...