proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-11 18:17:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2609 from linquize/describe-opts

Browse Source 
Handle describe options better
This commit is contained in:
Edward Thomson 2014-10-13 16:59:56 -04:00
commit e0383fa35f
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/describe.c
View File

@ -665,7 +665,6 @@ int git_describe_commit(
GITERR_CHECK_ALLOC(data.result); GITERR_CHECK_ALLOC(data.result);
data.result->repo = git_object_owner(committish); data.result->repo = git_object_owner(committish);
data.opts = opts;
data.repo = git_object_owner(committish); data.repo = git_object_owner(committish);
if ((error = normalize_options(&normalized, opts)) < 0) if ((error = normalize_options(&normalized, opts)) < 0)
@ -675,6 +674,7 @@ int git_describe_commit(
&normalized, &normalized,
GIT_DESCRIBE_OPTIONS_VERSION, GIT_DESCRIBE_OPTIONS_VERSION,
"git_describe_options"); "git_describe_options");
data.opts = &normalized;
data.names = git_oidmap_alloc(); data.names = git_oidmap_alloc();
GITERR_CHECK_ALLOC(data.names); GITERR_CHECK_ALLOC(data.names);
@ -759,19 +759,35 @@ out:
return error; return error;
} }
int git_describe_format(git_buf *out, const git_describe_result *result, const git_describe_format_options *opts) static int normalize_format_options(
git_describe_format_options *dst,
const git_describe_format_options *src)
{
if (!src) {
git_describe_init_format_options(dst, GIT_DESCRIBE_FORMAT_OPTIONS_VERSION);
return 0;
}
memcpy(dst, src, sizeof(git_describe_format_options));
return 0;
}
int git_describe_format(git_buf *out, const git_describe_result *result, const git_describe_format_options *given)
{ {
int error; int error;
git_repository *repo; git_repository *repo;
struct commit_name *name; struct commit_name *name;
git_describe_format_options opts;
assert(out && result); assert(out && result);
GITERR_CHECK_VERSION(opts, GIT_DESCRIBE_FORMAT_OPTIONS_VERSION, "git_describe_format_options"); GITERR_CHECK_VERSION(given, GIT_DESCRIBE_FORMAT_OPTIONS_VERSION, "git_describe_format_options");
normalize_format_options(&opts, given);
git_buf_sanitize(out); git_buf_sanitize(out);
if (opts->always_use_long_format && opts->abbreviated_size == 0) { if (opts.always_use_long_format && opts.abbreviated_size == 0) {
giterr_set(GITERR_DESCRIBE, "Cannot describe - " giterr_set(GITERR_DESCRIBE, "Cannot describe - "
"'always_use_long_format' is incompatible with a zero" "'always_use_long_format' is incompatible with a zero"
"'abbreviated_size'"); "'abbreviated_size'");
@ -787,14 +803,14 @@ int git_describe_format(git_buf *out, const git_describe_result *result, const g
if ((error = display_name(out, repo, name)) < 0) if ((error = display_name(out, repo, name)) < 0)
return error; return error;
if (opts->always_use_long_format) { if (opts.always_use_long_format) {
const git_oid *id = name->tag ? git_tag_target_id(name->tag) : &result->commit_id; const git_oid *id = name->tag ? git_tag_target_id(name->tag) : &result->commit_id;
if ((error = show_suffix(out, 0, repo, id, opts->abbreviated_size)) < 0) if ((error = show_suffix(out, 0, repo, id, opts.abbreviated_size)) < 0)
return error; return error;
} }
if (result->dirty && opts->dirty_suffix) if (result->dirty && opts.dirty_suffix)
git_buf_puts(out, opts->dirty_suffix); git_buf_puts(out, opts.dirty_suffix);
return git_buf_oom(out) ? -1 : 0; return git_buf_oom(out) ? -1 : 0;
} }
@ -804,14 +820,14 @@ int git_describe_format(git_buf *out, const git_describe_result *result, const g
char hex_oid[GIT_OID_HEXSZ + 1] = {0}; char hex_oid[GIT_OID_HEXSZ + 1] = {0};
int size; int size;
if ((error = find_unique_abbrev_size( if ((error = find_unique_abbrev_size(
&size, repo, &result->commit_id, opts->abbreviated_size)) < 0) &size, repo, &result->commit_id, opts.abbreviated_size)) < 0)
return -1; return -1;
git_oid_fmt(hex_oid, &result->commit_id); git_oid_fmt(hex_oid, &result->commit_id);
git_buf_put(out, hex_oid, size); git_buf_put(out, hex_oid, size);
if (result->dirty && opts->dirty_suffix) if (result->dirty && opts.dirty_suffix)
git_buf_puts(out, opts->dirty_suffix); git_buf_puts(out, opts.dirty_suffix);
return git_buf_oom(out) ? -1 : 0; return git_buf_oom(out) ? -1 : 0;
} }
@ -822,14 +838,14 @@ int git_describe_format(git_buf *out, const git_describe_result *result, const g
if ((error = display_name(out, repo, name)) < 0) if ((error = display_name(out, repo, name)) < 0)
return error; return error;
if (opts->abbreviated_size) { if (opts.abbreviated_size) {
if ((error = show_suffix(out, result->tag->depth, repo, if ((error = show_suffix(out, result->tag->depth, repo,
&result->commit_id, opts->abbreviated_size)) < 0) &result->commit_id, opts.abbreviated_size)) < 0)
return error; return error;
} }
if (result->dirty && opts->dirty_suffix) { if (result->dirty && opts.dirty_suffix) {
git_buf_puts(out, opts->dirty_suffix); git_buf_puts(out, opts.dirty_suffix);
} }
return git_buf_oom(out) ? -1 : 0; return git_buf_oom(out) ? -1 : 0;