summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2013-07-14 08:35:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-15 17:56:08 (GMT)
commit5ab06518a71a8bd128a2aea38ddb537870d3ea2b (patch)
tree4f7b5a7afece7747e97ee537e3e0f4cbd6ece1a2 /rerere.c
parent480ca6449ed0981311b8aef2fbaa89d024b881ee (diff)
downloadgit-5ab06518a71a8bd128a2aea38ddb537870d3ea2b.zip
git-5ab06518a71a8bd128a2aea38ddb537870d3ea2b.tar.gz
git-5ab06518a71a8bd128a2aea38ddb537870d3ea2b.tar.bz2
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/rerere.c b/rerere.c
index 27afbfe..4105bca 100644
--- a/rerere.c
+++ b/rerere.c
@@ -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];