undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs.c: add an err argument to repack_without_refs

Browse Source 
Update repack_without_refs to take an err argument and update it if there
is a failure. Pass the err variable from ref_transaction_commit to this
function so that callers can print a meaningful error message if _commit
fails due to this function.

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Michael Haggerty <mhagger@alum.mit.edu>
This commit is contained in:
Ronnie Sahlberg 2014-06-20 07:42:49 -07:00 committed by Junio C Hamano
parent 447ff1bf0a
commit 60bca085c8
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/remote.c
View File

@ -755,7 +755,7 @@ static int remove_branches(struct string_list *branches)
branch_names = xmalloc(branches->nr * sizeof(*branch_names)); branch_names = xmalloc(branches->nr * sizeof(*branch_names));
for (i = 0; i < branches->nr; i++) for (i = 0; i < branches->nr; i++)
branch_names[i] = branches->items[i].string; branch_names[i] = branches->items[i].string;
result |= repack_without_refs(branch_names, branches->nr); result |= repack_without_refs(branch_names, branches->nr, NULL);
free(branch_names); free(branch_names);
for (i = 0; i < branches->nr; i++) { for (i = 0; i < branches->nr; i++) {
@ -1333,7 +1333,8 @@ static int prune_remote(const char *remote, int dry_run)
for (i = 0; i < states.stale.nr; i++) for (i = 0; i < states.stale.nr; i++)
delete_refs[i] = states.stale.items[i].util; delete_refs[i] = states.stale.items[i].util;
if (!dry_run) if (!dry_run)
result |= repack_without_refs(delete_refs, states.stale.nr); result |= repack_without_refs(delete_refs,
states.stale.nr, NULL);
free(delete_refs); free(delete_refs);
} }

19
refs.c
View File

@ -2456,12 +2456,12 @@ static int curate_packed_ref_fn(struct ref_entry *entry, void *cb_data)
return 0; return 0;
} }
int repack_without_refs(const char **refnames, int n) int repack_without_refs(const char **refnames, int n, struct strbuf *err)
{ {
struct ref_dir *packed; struct ref_dir *packed;
struct string_list refs_to_delete = STRING_LIST_INIT_DUP; struct string_list refs_to_delete = STRING_LIST_INIT_DUP;
struct string_list_item *ref_to_delete; struct string_list_item *ref_to_delete;
int i, removed = 0; int i, ret, removed = 0;
/* Look for a packed ref */ /* Look for a packed ref */
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
@ -2473,6 +2473,11 @@ int repack_without_refs(const char **refnames, int n)
return 0; /* no refname exists in packed refs */ return 0; /* no refname exists in packed refs */
if (lock_packed_refs(0)) { if (lock_packed_refs(0)) {
if (err) {
unable_to_lock_message(git_path("packed-refs"), errno,
err);
return -1;
}
unable_to_lock_error(git_path("packed-refs"), errno); unable_to_lock_error(git_path("packed-refs"), errno);
return error("cannot delete '%s' from packed refs", refnames[i]); return error("cannot delete '%s' from packed refs", refnames[i]);
} }
@ -2499,12 +2504,16 @@ int repack_without_refs(const char **refnames, int n)
} }
/* Write what remains */ /* Write what remains */
return commit_packed_refs(); ret = commit_packed_refs();
if (ret && err)
strbuf_addf(err, "unable to overwrite old ref-pack file: %s",
strerror(errno));
return ret;
} }
static int repack_without_ref(const char *refname) static int repack_without_ref(const char *refname)
{ {
return repack_without_refs(&refname, 1); return repack_without_refs(&refname, 1, NULL);
} }
static int delete_ref_loose(struct ref_lock *lock, int flag) static int delete_ref_loose(struct ref_lock *lock, int flag)
@ -3508,7 +3517,7 @@ int ref_transaction_commit(struct ref_transaction *transaction,
} }
} }
ret |= repack_without_refs(delnames, delnum); ret |= repack_without_refs(delnames, delnum, err);
for (i = 0; i < delnum; i++) for (i = 0; i < delnum; i++)
unlink_or_warn(git_path("logs/%s", delnames[i])); unlink_or_warn(git_path("logs/%s", delnames[i]));
clear_loose_ref_cache(&ref_cache); clear_loose_ref_cache(&ref_cache);

3
refs.h
View File

@ -122,7 +122,8 @@ extern void rollback_packed_refs(void);
*/ */
int pack_refs(unsigned int flags); int pack_refs(unsigned int flags);
extern int repack_without_refs(const char **refnames, int n); extern int repack_without_refs(const char **refnames, int n,
struct strbuf *err);
extern int ref_exists(const char *); extern int ref_exists(const char *);