From: Junio C Hamano <junkio@cox.net>
Date: Sat, 18 Feb 2006 01:34:31 +0000 (-0800)
Subject: Merge branch 'fix'
X-Git-Tag: v1.3.0-rc1~54^2~65
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0f4aa3993de5fc7252e43ebd872fd9e4b615873d;p=git.git

Merge branch 'fix'

* fix:
  Document --short and --git-dir in git-rev-parse(1)
  git-rev-parse: Fix --short= option parsing
  Prevent git-upload-pack segfault if object cannot be found
  Abstract test_create_repo out for use in tests.
  Trap exit to clean up created directory if clone fails.
---

0f4aa3993de5fc7252e43ebd872fd9e4b615873d