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 <paths>...
Add colordiff for git to contrib/colordiff.
gitk: Let git-rev-list do the argument list parsing

diff --cc Makefile
Simple merge

diff --cc update-index.c
index d6d3295e329ed2d0f1f46824a210b86c0c092b8f,facec8d91524ab63117d62134f91df385dcf34ca..258a88cbeac7edc103b94446198383628c2e19cb
--- 1/update-index.c
--- 2/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;