mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 04:10:41 +02:00
Code

do not overwrite files marked "assume unchanged"

Browse Source 
A merge will fail gracefully if it needs to update files marked
"assume unchanged", but other similar commands will not. In
particular, checkout and rebase will silently overwrite changes to
such files.

This is a regression introduced in commit 1dcafcc0 (verify_uptodate():
add ce_uptodate(ce) test), which avoids lstat's during a merge, if the
index entry is up-to-date. If the CE_VALID flag is set, however, we
cannot trust CE_UPTODATE.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Clemens Buchacher 2010-05-01 11:25:12 +02:00 committed by Junio C Hamano
parent e92e9cd3c3
commit aecda37c66
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
t/t2106-update-index-assume-unchanged.sh Executable file
View File

@ -0,0 +1,24 @@
#!/bin/sh
test_description='git update-index --assume-unchanged test.
'
. ./test-lib.sh
test_expect_success 'setup' \
': >file &&
git add file &&
git commit -m initial &&
git branch other &&
echo upstream >file &&
git add file &&
git commit -m upstream'
test_expect_success 'do not switch branches with dirty file' \
'git reset --hard &&
git checkout other &&
echo dirt >file &&
git update-index --assume-unchanged file &&
test_must_fail git checkout master'
test_done

2
unpack-trees.c
View File

@ -862,7 +862,7 @@ static int verify_uptodate_1(struct cache_entry *ce,
{
struct stat st;
if (o->index_only || (!ce_skip_worktree(ce) && (o->reset || ce_uptodate(ce))))
if (o->index_only || (!((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) && (o->reset || ce_uptodate(ce))))
return 0;
if (!lstat(ce->name, &st)) {