kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'mv/merge-refresh' 

* mv/merge-refresh:
  builtin-merge: refresh the index before calling a strategy
maint
Shawn O. Pearce 2008-10-09 10:19:23 -07:00
parent c9618ff939 668f26fff6
commit 76c3fb1f84
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin-merge.c
View File

@ -546,6 +546,16 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
int i = 0, ret;
struct commit_list *j;
struct strbuf buf;
int index_fd;
struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));

index_fd = hold_locked_index(lock, 1);
refresh_cache(REFRESH_QUIET);
if (active_cache_changed &&
(write_cache(index_fd, active_cache, active_nr) ||
commit_locked_index(lock)))
return error("Unable to write index.");
rollback_lock_file(lock);

if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) {
int clean;

9
t/t7600-merge.sh
View File

@ -511,4 +511,13 @@ test_expect_success 'in-index merge' '

test_debug 'gitk --all'

test_expect_success 'refresh the index before merging' '
git reset --hard c1 &&
sleep 1 &&
touch file &&
git merge c3
'

test_debug 'gitk --all'

test_done