[PATCH 2/3] am: do not corrupt the index stat state
Reported-by: Linus Torvalds
Signed-off-by: David Aguilar <davvid@gmail.com>
---
builtin/am.c | 14 +++++++++++++-
t/t4151-am-abort.sh | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index 1399c8d..9db1b34 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1949,6 +1949,8 @@ static int clean_index(const unsigned char *head, const unsigned char *remote)
struct tree *head_tree, *remote_tree, *index_tree;
unsigned char index[GIT_SHA1_RAWSZ];
struct pathspec pathspec;
+ struct tree_desc desc;
+ struct unpack_trees_options opts;
head_tree = parse_tree_indirect(head);
if (!head_tree)
@@ -1975,10 +1977,20 @@ static int clean_index(const unsigned char *head, const unsigned char *remote)
memset(&pathspec, 0, sizeof(pathspec));
+ memset(&opts, 0, sizeof(opts));
+ opts.fn = oneway_merge;
+ opts.pathspec = &pathspec;
+ opts.src_index = &the_index;
+ opts.dst_index = &the_index;
+ opts.head_idx = 1;
+ opts.merge = 1;
+ opts.reset = 1;
+ init_tree_desc(&desc, remote_tree->buffer, remote_tree->size);
+
lock_file = xcalloc(1, sizeof(struct lock_file));
hold_locked_index(lock_file, 1);
- if (read_tree(remote_tree, 0, &pathspec)) {
+ if (unpack_trees(1, &desc, &opts)) {
rollback_lock_file(lock_file);
return -1;
}
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index bf2e6f4..9c3bbd1 100755
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -168,7 +168,7 @@ test_expect_success 'am --abort on unborn branch will keep local commits intact'
test_cmp expect actual
'
-test_expect_failure 'am --abort leaves index stat info alone' '
+test_expect_success 'am --abort leaves index stat info alone' '
git checkout -f --orphan stat-info &&
git reset &&
test_commit should-be-untouched &&
--
2.5.0.403.gd17121e
David Aguilar <davvid@gmail.com>