mirror of
https://github.com/git/git.git
synced 2024-11-05 08:47:56 +01:00
81b50f3ce4
This shrinks the top-level directory a bit, and makes it much more pleasant to use auto-completion on the thing. Instead of [torvalds@nehalem git]$ em buil<tab> Display all 180 possibilities? (y or n) [torvalds@nehalem git]$ em builtin-sh builtin-shortlog.c builtin-show-branch.c builtin-show-ref.c builtin-shortlog.o builtin-show-branch.o builtin-show-ref.o [torvalds@nehalem git]$ em builtin-shor<tab> builtin-shortlog.c builtin-shortlog.o [torvalds@nehalem git]$ em builtin-shortlog.c you get [torvalds@nehalem git]$ em buil<tab> [type] builtin/ builtin.h [torvalds@nehalem git]$ em builtin [auto-completes to] [torvalds@nehalem git]$ em builtin/sh<tab> [type] shortlog.c shortlog.o show-branch.c show-branch.o show-ref.c show-ref.o [torvalds@nehalem git]$ em builtin/sho [auto-completes to] [torvalds@nehalem git]$ em builtin/shor<tab> [type] shortlog.c shortlog.o [torvalds@nehalem git]$ em builtin/shortlog.c which doesn't seem all that different, but not having that annoying break in "Display all 180 possibilities?" is quite a relief. NOTE! If you do this in a clean tree (no object files etc), or using an editor that has auto-completion rules that ignores '*.o' files, you won't see that annoying 'Display all 180 possibilities?' message - it will just show the choices instead. I think bash has some cut-off around 100 choices or something. So the reason I see this is that I'm using an odd editory, and thus don't have the rules to cut down on auto-completion. But you can simulate that by using 'ls' instead, or something similar. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
85 lines
1.6 KiB
C
85 lines
1.6 KiB
C
#include "cache.h"
|
|
#include "exec_cmd.h"
|
|
|
|
static void flush_current_id(int patchlen, unsigned char *id, git_SHA_CTX *c)
|
|
{
|
|
unsigned char result[20];
|
|
char name[50];
|
|
|
|
if (!patchlen)
|
|
return;
|
|
|
|
git_SHA1_Final(result, c);
|
|
memcpy(name, sha1_to_hex(id), 41);
|
|
printf("%s %s\n", sha1_to_hex(result), name);
|
|
git_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];
|
|
git_SHA_CTX ctx;
|
|
int patchlen = 0;
|
|
|
|
git_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;
|
|
git_SHA1_Update(&ctx, line, len);
|
|
}
|
|
flush_current_id(patchlen, sha1, &ctx);
|
|
}
|
|
|
|
static const char patch_id_usage[] = "git patch-id < patch";
|
|
|
|
int cmd_patch_id(int argc, const char **argv, const char *prefix)
|
|
{
|
|
if (argc != 1)
|
|
usage(patch_id_usage);
|
|
|
|
generate_id_list();
|
|
return 0;
|
|
}
|