development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-01 14:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

object name: introduce ':/<oneline prefix>' notation

Browse source 
To name a commit, you can now say

	$ git rev-parse ':/Initial revision of "git"'

and it will return the hash of the youngest commit whose
commit message (the oneline) begins with the given prefix.

For future extension, a leading exclamation mark is treated
specially: if you want to match a commit message starting with
a '!', just repeat the exclamation mark. So, to match a commit
which starts with '!Hello World', use

	$ git show ':/!!Hello World'

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Johannes Schindelin 2007-02-24 03:08:20 +01:00 committed by Junio C Hamano
parent 7bd59dee5b
commit 28a4d94044
2 changed files with 65 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Documentation/git-rev-parse.txt
View file

@ -190,6 +190,13 @@ blobs contained in a commit.
and dereference the tag recursively until a non-tag object is
found.
* A colon, followed by a slash, followed by a text: this names
a commit whose commit message starts with the specified text.
This name returns the youngest matching commit which is
reachable from any ref. If the commit message starts with a
'!', you have to repeat that; the special sequence ':/!',
followed by something else than '!' is reserved for now.
* A suffix ':' followed by a path; this names the blob or tree
at the given path in the tree-ish object named by the part
before the colon.

58
sha1_name.c
View file

@ -577,6 +577,62 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1)
return get_short_sha1(name, len, sha1, 0);
}
static int handle_one_ref(const char *path,
const unsigned char *sha1, int flag, void *cb_data)
{
struct commit_list **list = cb_data;
struct object *object = parse_object(sha1);
if (!object)
return 0;
if (object->type == OBJ_TAG)
object = deref_tag(object, path, strlen(path));
if (object->type != OBJ_COMMIT)
return 0;
insert_by_date((struct commit *)object, list);
return 0;
}
/*
* This interprets names like ':/Initial revision of "git"' by searching
* through history and returning the first commit whose message starts
* with the given string.
*
* For future extension, ':/!' is reserved. If you want to match a message
* beginning with a '!', you have to repeat the exclamation mark.
*/
#define ONELINE_SEEN (1u<<20)
int get_sha1_oneline(const char *prefix, unsigned char *sha1)
{
struct commit_list *list = NULL, *backup = NULL, *l;
struct commit *commit;
if (prefix[0] == '!') {
if (prefix[1] != '!')
die ("Invalid search pattern: %s", prefix);
prefix++;
}
if (!save_commit_buffer)
return error("Could not expand oneline-name.");
for_each_ref(handle_one_ref, &list);
for (l = list; l; l = l->next)
commit_list_insert(l->item, &backup);
while ((commit = pop_most_recent_commit(&list, ONELINE_SEEN))) {
char *p;
parse_object(commit->object.sha1);
if (!commit->buffer || !(p = strstr(commit->buffer, "\n\n")))
continue;
if (!prefixcmp(p + 2, prefix)) {
hashcpy(sha1, commit->object.sha1);
break;
}
}
free_commit_list(list);
for (l = backup; l; l = l->next)
clear_commit_marks(l->item, ONELINE_SEEN);
return commit == NULL;
}
/*
* This is like "get_sha1_basic()", except it allows "sha1 expressions",
* notably "xyz^" for "parent of xyz"
@ -600,6 +656,8 @@ int get_sha1(const char *name, unsigned char *sha1)
int stage = 0;
struct cache_entry *ce;
int pos;
if (namelen > 2 && name[1] == '/')
return get_sha1_oneline(name + 2, sha1);
if (namelen < 3 ||
name[2] != ':' ||
name[1] < '0' || '3' < name[1])