From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Jul 2008 00:10:28 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.0-rc0~44
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=88bbda08d7b9503862a8fb8846d78c67825e5e3d;p=git.git

Merge branch 'maint'

* maint:
  Start preparing 1.5.6.4 release notes
  git fetch-pack: do not complain about "no common commits" in an empty repo
  rebase-i: keep old parents when preserving merges
  t7600-merge: Use test_expect_failure to test option parsing
  Fix buffer overflow in prepare_attr_stack
  Fix buffer overflow in git diff
  Fix buffer overflow in git-grep
  git-cvsserver: fix call to nonexistant cleanupWorkDir()
  Documentation/git-cherry-pick.txt et al.: Fix misleading -n description

Conflicts:
	RelNotes
---

88bbda08d7b9503862a8fb8846d78c67825e5e3d
diff --cc t/t7600-merge.sh
index d4cf6289a,daf45b7ff..9ab5bdacc
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@@ -221,37 -221,13 +221,13 @@@ test_expect_success 'setup' 
  
  test_debug 'gitk --all'
  
--test_expect_success 'test option parsing' '
- 	if git merge -$ c1
- 	then
- 		echo "[OOPS] -$ accepted"
- 		false
- 	fi &&
- 	if git merge --no-such c1
- 	then
- 		echo "[OOPS] --no-such accepted"
- 		false
- 	fi &&
- 	if git merge -s foobar c1
- 	then
- 		echo "[OOPS] -s foobar accepted"
- 		false
- 	fi &&
- 	if git merge -s=foobar c1
- 	then
- 		echo "[OOPS] -s=foobar accepted"
- 		false
- 	fi &&
- 	if git merge -m
- 	then
- 		echo "[OOPS] missing commit msg accepted"
- 		false
- 	fi &&
- 	if git merge
- 	then
- 		echo "[OOPS] missing commit references accepted"
- 		false
- 	fi
++test_expect_failure 'test option parsing' '
+ 	test_must_fail git merge -$ c1 &&
+ 	test_must_fail git merge --no-such c1 &&
+ 	test_must_fail git merge -s foobar c1 &&
+ 	test_must_fail git merge -s=foobar c1 &&
+ 	test_must_fail git merge -m &&
+ 	test_must_fail git merge
  '
  
  test_expect_success 'merge c0 with c1' '