From: Junio C Hamano Date: Wed, 26 Apr 2006 10:29:09 +0000 (-0700) Subject: Merge branch 'master' into jc/cache-tree X-Git-Tag: v1.4.0-rc1~45^2~16 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b8ed7f0f40743dae6111c8950ba55051933298ca;p=git.git Merge branch 'master' into jc/cache-tree * master: commit-tree: allow generic object name for the tree as well. Makefile: remove and create xdiff library from scratch. t0000-basic: Add ls-tree recursive test back. Libified diff-index: backward compatibility fix. Libify diff-index. Libify diff-files. Makefile: remove and create libgit.a from scratch. Document the configuration file Document git-var -l listing also configuration variables rev-parse: better error message for ambiguous arguments make update-index --chmod work with multiple files and --stdin socksetup: don't return on set_reuse_addr() error Fix "git show --stat" git-update-index --unresolve Add git-unresolve ... Add colordiff for git to contrib/colordiff. gitk: Let git-rev-list do the argument list parsing --- b8ed7f0f40743dae6111c8950ba55051933298ca diff --cc update-index.c index d6d3295e,facec8d9..258a88cb --- a/update-index.c +++ b/update-index.c @@@ -6,7 -6,7 +6,8 @@@ #include "cache.h" #include "strbuf.h" #include "quote.h" +#include "cache-tree.h" + #include "tree-walk.h" /* * Default to not allowing changes to the list of files. The @@@ -356,11 -348,13 +357,14 @@@ static void chmod_path(int flip, const case '-': ce->ce_mode &= htonl(~0111); break; default: - return -1; + goto fail; } + cache_tree_invalidate_path(active_cache_tree, path); active_cache_changed = 1; - return 0; + report("chmod %cx '%s'", flip, path); + return; + fail: + die("git-update-index: cannot chmod %cx '%s'", flip, path); } static struct cache_file cache_file;