Merge branch 'sv/checkout'

* sv/checkout:
git-update-ref: add --no-deref option for overwriting/detaching ref

diff --combined builtin-fetch--tool.c
index 12adb3833cd60771f8e63b2ebaecff3769fa74e2,b14e78ac3ffc95c99c2334fab5792f6c49a6c93d..ed4d5de5d5e6d0bef5b29f3d21a3e58ff7778c8b
--- 1/builtin-fetch--tool.c
--- 2/builtin-fetch--tool.c
+++ b/builtin-fetch--tool.c
@@@ -6,11 -6,11 +6,11 @@@
  
  static char *get_stdin(void)
  {
 -      int offset = 0;
 +      size_t offset = 0;
        char *data = xmalloc(CHUNK_SIZE);
  
        while (1) {
 -              int cnt = xread(0, data + offset, CHUNK_SIZE);
 +              ssize_t cnt = xread(0, data + offset, CHUNK_SIZE);
                if (cnt < 0)
                        die("error reading standard input: %s",
                            strerror(errno));
@@@ -42,7 -42,7 +42,7 @@@ static int update_ref(const char *actio
        if (!rla)
                rla = "(reflog update)";
        snprintf(msg, sizeof(msg), "%s: %s", rla, action);
-       lock = lock_any_ref_for_update(refname, oldval);
+       lock = lock_any_ref_for_update(refname, oldval, 0);
        if (!lock)
                return 1;
        if (write_ref_sha1(lock, sha1, msg) < 0)