Merge branch 'maint'

gitster · gitster · commit 609eb9f7ff2a · 2010-07-11T23:47:29.000-07:00
* maint:
  Documentation: Spelling fix in protocol-capabilities.txt
  checkout: accord documentation to what git does
  t0005: work around strange $? in ksh when program terminated by a signal
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
@@ -263,7 +263,7 @@ the above checkout would fail like this:
 +
 ------------
 $ git checkout mytopic
-fatal: Entry 'frotz' not uptodate. Cannot merge.
+error: You have local changes to 'frotz'; not switching branches.
 ------------
 +
 You can give the `-m` flag to the command, which would try a
diff --git a/Documentation/technical/protocol-capabilities.txt b/Documentation/technical/protocol-capabilities.txt
@@ -119,7 +119,7 @@ both.
 ofs-delta
 ---------
 
-Server can send, and client understand PACKv2 with delta refering to
+Server can send, and client understand PACKv2 with delta referring to
 its base by position in pack rather than by an obj-id.  That is, they can
 send/read OBJ_OFS_DELTA (aka type 6) in a packfile.
 
diff --git a/t/t0005-signals.sh b/t/t0005-signals.sh
@@ -13,6 +13,7 @@ test_expect_success 'sigchain works' '
 	test-sigchain >actual
 	case "$?" in
 	143) true ;; # POSIX w/ SIGTERM=15
+	271) true ;; # ksh w/ SIGTERM=15
 	  3) true ;; # Windows
 	  *) false ;;
 	esac &&

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ the above checkout would fail like this:`
`263`	`263`	`+`
`264`	`264`	`------------`
`265`	`265`	`$ git checkout mytopic`
`266`		`-fatal: Entry 'frotz' not uptodate. Cannot merge.`
	`266`	`+error: You have local changes to 'frotz'; not switching branches.`
`267`	`267`	`------------`
`268`	`268`	`+`
`269`	`269`	You can give the `-m` flag to the command, which would try a