summaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-09-11 14:12:08 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2005-09-12 19:15:03 -0700
commit7f88c8463caa14ca397048f8e576e348ce73203a (patch)
treee0bd6601780818570eb85ef8235b19c40b3c160b /gitk
parent[PATCH] Omit patches that have already been merged from format-patch output. (diff)
downloadtgif-7f88c8463caa14ca397048f8e576e348ce73203a.tar.xz
[PATCH] Make 'git checkout' a bit more forgiving when switching branches.
If you make a commit on a path, and then make the path cache-dirty afterwards without changing its contents, 'git checkout' to switch to another branch is prevented because switching the branches done with 'read-tree -m -u $current $next' detects that the path is cache-dirty, but it does not bother noticing that the contents of the path has not been actualy changed. Since switching branches would involve checking out paths different in the two branches, hence it is reasonably expensive operation, we can afford to run update-index before running read-tree to reduce this kind of false change from triggering the check needlessly. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'gitk')
0 files changed, 0 insertions, 0 deletions