diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-07-14 15:35:51 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:56:08 -0700 |
commit | 5ab06518a71a8bd128a2aea38ddb537870d3ea2b (patch) | |
tree | 4f7b5a7afece7747e97ee537e3e0f4cbd6ece1a2 /rerere.c | |
parent | 480ca6449ed0981311b8aef2fbaa89d024b881ee (diff) | |
download | git-5ab06518a71a8bd128a2aea38ddb537870d3ea2b.tar.gz |
convert unmerge_cache to take struct pathspec
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rerere.c')
-rw-r--r-- | rerere.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -668,7 +668,7 @@ int rerere_forget(struct pathspec *pathspec) fd = setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE); - unmerge_cache(pathspec->raw); + unmerge_cache(pathspec); find_conflict(&conflict); for (i = 0; i < conflict.nr; i++) { struct string_list_item *it = &conflict.items[i]; |