mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 20:14:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

sha1_name.c: introduce get_sha1_committish()

Browse Source 
Many callers know that the user meant to name a committish by
syntactical positions where the object name appears.  Calling this
function allows the machinery to disambiguate shorter-than-unique
abbreviated object names between committish and others.

Note that this does NOT error out when the named object is not a
committish. It is merely to give a hint to the disambiguation
machinery.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-07-02 12:04:52 -07:00
parent 33bd598c39
commit cd74e4733d
5 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cache.h
View File

@ -817,6 +817,7 @@ struct object_context {
#define GET_SHA1_ONLY_TO_DIE 04000 #define GET_SHA1_ONLY_TO_DIE 04000
extern int get_sha1(const char *str, unsigned char *sha1); extern int get_sha1(const char *str, unsigned char *sha1);
extern int get_sha1_committish(const char *str, unsigned char *sha1);
extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix); extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix);
extern int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *orc); extern int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *orc);

2
commit.c
View File

@ -67,7 +67,7 @@ struct commit *lookup_commit_reference_by_name(const char *name)
unsigned char sha1[20]; unsigned char sha1[20];
struct commit *commit; struct commit *commit;
if (get_sha1(name, sha1)) if (get_sha1_committish(name, sha1))
return NULL; return NULL;
commit = lookup_commit_reference(sha1); commit = lookup_commit_reference(sha1);
if (!commit || parse_commit(commit)) if (!commit || parse_commit(commit))

6
revision.c
View File

@ -979,7 +979,7 @@ static int add_parents_only(struct rev_info *revs, const char *arg_, int flags)
flags ^= UNINTERESTING; flags ^= UNINTERESTING;
arg++; arg++;
} }
if (get_sha1(arg, sha1)) if (get_sha1_committish(arg, sha1))
return 0; return 0;
while (1) { while (1) {
it = get_reference(revs, arg, sha1, 0); it = get_reference(revs, arg, sha1, 0);
@ -1120,8 +1120,8 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs,
next = "HEAD"; next = "HEAD";
if (dotdot == arg) if (dotdot == arg)
this = "HEAD"; this = "HEAD";
if (!get_sha1(this, from_sha1) && if (!get_sha1_committish(this, from_sha1) &&
!get_sha1(next, sha1)) { !get_sha1_committish(next, sha1)) {
struct commit *a, *b; struct commit *a, *b;
struct commit_list *exclude; struct commit_list *exclude;

21
sha1_name.c
View File

@ -872,7 +872,7 @@ int get_sha1_mb(const char *name, unsigned char *sha1)
struct strbuf sb; struct strbuf sb;
strbuf_init(&sb, dots - name); strbuf_init(&sb, dots - name);
strbuf_add(&sb, name, dots - name); strbuf_add(&sb, name, dots - name);
st = get_sha1(sb.buf, sha1_tmp); st = get_sha1_committish(sb.buf, sha1_tmp);
strbuf_release(&sb); strbuf_release(&sb);
} }
if (st) if (st)
@ -881,7 +881,7 @@ int get_sha1_mb(const char *name, unsigned char *sha1)
if (!one) if (!one)
return -1; return -1;
if (get_sha1(dots[3] ? (dots + 3) : "HEAD", sha1_tmp)) if (get_sha1_committish(dots[3] ? (dots + 3) : "HEAD", sha1_tmp))
return -1; return -1;
two = lookup_commit_reference_gently(sha1_tmp, 0); two = lookup_commit_reference_gently(sha1_tmp, 0);
if (!two) if (!two)
@ -999,6 +999,23 @@ int get_sha1(const char *name, unsigned char *sha1)
return get_sha1_with_context(name, 0, sha1, &unused); return get_sha1_with_context(name, 0, sha1, &unused);
} }
/*
* Many callers know that the user meant to name a committish by
* syntactical positions where the object name appears. Calling this
* function allows the machinery to disambiguate shorter-than-unique
* abbreviated object names between committish and others.
*
* Note that this does NOT error out when the named object is not a
* committish. It is merely to give a hint to the disambiguation
* machinery.
*/
int get_sha1_committish(const char *name, unsigned char *sha1)
{
struct object_context unused;
return get_sha1_with_context(name, GET_SHA1_COMMITTISH,
sha1, &unused);
}
/* Must be called only when object_name:filename doesn't exist. */ /* Must be called only when object_name:filename doesn't exist. */
static void diagnose_invalid_sha1_path(const char *prefix, static void diagnose_invalid_sha1_path(const char *prefix,
const char *filename, const char *filename,

2
t/t1512-rev-parse-disambiguation.sh
View File

@ -102,7 +102,7 @@ test_expect_failure 'disambiguate commit' '
test $(git rev-parse $commit^) = $(git rev-parse 0000000000e4f) test $(git rev-parse $commit^) = $(git rev-parse 0000000000e4f)
' '
test_expect_failure 'log name1..name2 takes only commit-ishes on both ends' ' test_expect_success 'log name1..name2 takes only commit-ishes on both ends' '
git log 000000000..000000000 && git log 000000000..000000000 &&
git log ..000000000 && git log ..000000000 &&
git log 000000000.. && git log 000000000.. &&