mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/code-cleaning'

Browse Source 
* rs/code-cleaning:
  remote-testsvn: use internal argv_array of struct child_process in cmd_import()
  bundle: use internal argv_array of struct child_process in create_bundle()
  fast-import: use hashcmp() for SHA1 hash comparison
  transport: simplify fetch_objs_via_rsync() using argv_array
  run-command: use internal argv_array of struct child_process in run_hook_ve()
  use commit_list_count() to count the members of commit_lists
  strbuf: use strbuf_addstr() for adding C strings
This commit is contained in:
Junio C Hamano
2014-07-22 10:59:36 -07:00
parent 4328190a81 1cefa14325
commit 12621cb222
13 changed files with 41 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
commit.c
View File

@ -970,12 +970,7 @@ struct commit_list *get_merge_bases_many(struct commit *one,
}
/* There are more than one */
cnt = 0;
list = result;
while (list) {
list = list->next;
cnt++;
}
cnt = commit_list_count(result);
rslt = xcalloc(cnt, sizeof(*rslt));
for (list = result, i = 0; list; list = list->next)
rslt[i++] = list->item;