From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Apr 2009 22:18:01 +0000 (+0200)
Subject: unpack-trees: do not muck with attributes when we are not checking out
X-Git-Tag: v1.6.3-rc1~3^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=66985e6629c4325ec6b1508bf4bda907c2a538cb;p=git.git

unpack-trees: do not muck with attributes when we are not checking out

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/unpack-trees.c b/unpack-trees.c
index 6847c2d96..e4eb8fa3a 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -87,7 +87,8 @@ static int check_updates(struct unpack_trees_options *o)
 		cnt = 0;
 	}
 
-	git_attr_set_direction(GIT_ATTR_CHECKOUT, &o->result);
+	if (o->update)
+		git_attr_set_direction(GIT_ATTR_CHECKOUT, &o->result);
 	for (i = 0; i < index->cache_nr; i++) {
 		struct cache_entry *ce = index->cache[i];
 
@@ -112,7 +113,8 @@ static int check_updates(struct unpack_trees_options *o)
 		}
 	}
 	stop_progress(&progress);
-	git_attr_set_direction(GIT_ATTR_CHECKIN, NULL);
+	if (o->update)
+		git_attr_set_direction(GIT_ATTR_CHECKIN, NULL);
 	return errs != 0;
 }