From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 13 Jun 2010 18:21:11 +0000 (-0700)
Subject: Merge branch 'cb/assume-unchanged-fix'
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/git.git/commitdiff_plain/40e9b27dec28692464f43d1c213d465fed8994ba?hp=-c

Merge branch 'cb/assume-unchanged-fix'

* cb/assume-unchanged-fix:
  Documentation: git-add does not update files marked "assume unchanged"
  do not overwrite files marked "assume unchanged"
---

40e9b27dec28692464f43d1c213d465fed8994ba
diff --combined unpack-trees.c
index c29a9e067,1a8030ced..490cd5f6f
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@@ -67,8 -67,16 +67,8 @@@ static void unlink_entry(struct cache_e
  {
  	if (has_symlink_or_noent_leading_path(ce->name, ce_namelen(ce)))
  		return;
 -	if (S_ISGITLINK(ce->ce_mode)) {
 -		if (rmdir(ce->name)) {
 -			warning("unable to rmdir %s: %s",
 -				ce->name, strerror(errno));
 -			return;
 -		}
 -	}
 -	else
 -		if (unlink_or_warn(ce->name))
 -			return;
 +	if (remove_or_warn(ce->ce_mode, ce->name))
 +		return;
  	schedule_dir_for_removal(ce->name, ce_namelen(ce));
  }
  
@@@ -854,7 -862,7 +854,7 @@@ static int verify_uptodate_1(struct cac
  {
  	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)) {