Skip to content

Commit

Permalink
shallow: remove unused code
Browse files Browse the repository at this point in the history
Commit 58babff ("shallow.c: the 8 steps to select new commits for
.git/shallow", 05-12-2013) added a function to implement step 5 of
the quoted eight steps, namely 'remove_nonexistent_ours_in_pack()'.
This function implements an optional optimization step in the new
shallow commit selection algorithm. However, this function has no
callers. (The commented out call sites would need to change, in
order to provide information required by the function.)

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Ramsay Jones authored and Junio C Hamano committed Jan 6, 2014
1 parent 16a2743 commit feefdf6
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 20 deletions.
1 change: 0 additions & 1 deletion builtin/receive-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,6 @@ static void update_shallow_info(struct command *commands,
struct command *cmd;
int *ref_status;
remove_nonexistent_theirs_shallow(si);
/* XXX remove_nonexistent_ours_in_pack() */
if (!si->nr_ours && !si->nr_theirs) {
shallow_update = 0;
return;
Expand Down
2 changes: 0 additions & 2 deletions commit.h
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,6 @@ struct shallow_info {
extern void prepare_shallow_info(struct shallow_info *, struct sha1_array *);
extern void clear_shallow_info(struct shallow_info *);
extern void remove_nonexistent_theirs_shallow(struct shallow_info *);
extern void remove_nonexistent_ours_in_pack(struct shallow_info *,
struct packed_git *);
extern void assign_shallow_commits_to_refs(struct shallow_info *info,
uint32_t **used,
int *ref_status);
Expand Down
1 change: 0 additions & 1 deletion fetch-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,6 @@ static void update_shallow(struct fetch_pack_args *args,
return;

remove_nonexistent_theirs_shallow(si);
/* XXX remove_nonexistent_ours_in_pack() */
if (!si->nr_ours && !si->nr_theirs)
return;
for (i = 0; i < nr_sought; i++)
Expand Down
16 changes: 0 additions & 16 deletions shallow.c
Original file line number Diff line number Diff line change
Expand Up @@ -359,22 +359,6 @@ void remove_nonexistent_theirs_shallow(struct shallow_info *info)
info->nr_theirs = dst;
}

/* Step 5, remove non-existent ones in "ours" in the pack */
void remove_nonexistent_ours_in_pack(struct shallow_info *info,
struct packed_git *p)
{
unsigned char (*sha1)[20] = info->shallow->sha1;
int i, dst;
trace_printf_key(TRACE_KEY, "shallow: remove_nonexistent_ours_in_pack\n");
for (i = dst = 0; i < info->nr_ours; i++) {
if (i != dst)
info->ours[dst] = info->ours[i];
if (find_pack_entry_one(sha1[info->ours[i]], p))
dst++;
}
info->nr_ours = dst;
}

define_commit_slab(ref_bitmap, uint32_t *);

struct paint_info {
Expand Down

0 comments on commit feefdf6

Please sign in to comment.