Merge branch 'ap/maint-apply-modefix' into maint
commitae5a97fdd0c553926aabdf324b6d9108b0699bee
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Jan 2009 08:56:40 +0000 (13 00:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Jan 2009 08:56:40 +0000 (13 00:56 -0800)
tree4e757fbe32df5eb3cc5cb437634aa7ac2831e4be
parent1cbe69f649fc45a3052e82c8e92e4a0f9eff67ed
parent1f7903a371f90f025cfc3b4aa3a0b4a8f8b05b94
Merge branch 'ap/maint-apply-modefix' into maint

* ap/maint-apply-modefix:
  builtin-apply: prevent non-explicit permission changes
builtin-apply.c