Merge branch 'jc/lockfile' into next

* jc/lockfile:
  ref-log: style fixes.
  refs.c: convert it to use lockfile interface.
  Make index file locking code reusable to others.
  HTTP cleanup
  HTTP cleanup
  git-format-patch: add --output-directory long option again

diff --cc builtin-read-tree.c
index 57bc4516a0f7f449870777986449c992009883af,bb50fbd274e2d7e73fc3c6f86a73bd22f636400e..04506da892c1bfb198c706e166efe8a2bf6cf1be
--- 1/builtin-read-tree.c
--- 2/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@@ -875,9 -851,9 +875,9 @@@ static void prime_cache_tree(void
  
  }
  
 -static const char read_tree_usage[] = "git-read-tree (<sha> | -m [--aggressive] [-u | -i] <sha1> [<sha2> [<sha3>]])";
 +static const char read_tree_usage[] = "git-read-tree (<sha> | [[-m [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] <sha1> [<sha2> [<sha3>]])";
  
- static struct cache_file cache_file;
+ static struct lock_file lock_file;
  
  int cmd_read_tree(int argc, const char **argv, char **envp)
  {

diff --cc write-tree.c
index 895e7a359d108312918c27d98c7b529f2e25e300,d6a605893dcbb4d8d65979309cf9ce1199aa8279..bd07da6183b25470b00b9a2eedef29b7275760ec
--- 1/write-tree.c
--- 2/write-tree.c
+++ b/write-tree.c
@@@ -8,12 -8,10 +8,12 @@@
  #include "cache-tree.h"
  
  static int missing_ok = 0;
 +static char *prefix = NULL;
  
 -static const char write_tree_usage[] = "git-write-tree [--missing-ok]";
 +static const char write_tree_usage[] =
 +"git-write-tree [--missing-ok] [--prefix=<prefix>/]";
  
- static struct cache_file cache_file;
+ static struct lock_file lock_file;
  
  int main(int argc, char **argv)
  {
@@@ -21,20 -19,15 +21,20 @@@
  
        setup_git_directory();
  
-       newfd = hold_index_file_for_update(&cache_file, get_index_file());
+       newfd = hold_lock_file_for_update(&lock_file, get_index_file());
        entries = read_cache();
 -      if (argc == 2) {
 -              if (!strcmp(argv[1], "--missing-ok"))
 +
 +      while (1 < argc) {
 +              char *arg = argv[1];
 +              if (!strcmp(arg, "--missing-ok"))
                        missing_ok = 1;
 +              else if (!strncmp(arg, "--prefix=", 9))
 +                      prefix = arg + 9;
                else
                        die(write_tree_usage);
 +              argc--; argv++;
        }
 -      
 +
        if (argc > 2)
                die("too many options");