From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Oct 2010 19:10:02 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~192
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=90215bf3008f0986a5a8414d6ea1523148f74826;p=git.git

Merge branch 'maint'

* maint:
  Documentation/git-clone: describe --mirror more verbosely
  do not depend on signed integer overflow
  work around buggy S_ISxxx(m) implementations
  xdiff: cast arguments for ctype functions to unsigned char
  init: plug tiny one-time memory leak
  diffcore-pickaxe.c: remove unnecessary curly braces
  t3020 (ls-files-error-unmatch): remove stray '1' from end of file
  setup: make sure git dir path is in a permanent buffer
  environment.c: remove unused variable
  git-svn: fix processing of decorated commit hashes
  git-svn: check_cherry_pick should exclude commits already in our history
  Documentation/git-svn: discourage "noMetadata"
---

90215bf3008f0986a5a8414d6ea1523148f74826