Merge branch 'jh/msvc'

diff --git a/builtin/am.c b/builtin/am.c
index 252e37ddf08e45eceb98628fe598df3ebcafb1fd..1aea657a7f0b56345e1b2d5f8f32df439e278e80 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1956,7 +1956,7 @@ static int clean_index(const struct object_id *head, const struct object_id *rem
        if (merge_tree(remote_tree))
                return -1;
 
-       remove_branch_state(the_repository);
+       remove_branch_state(the_repository, 0);
 
        return 0;
 }