mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'maint'
* 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
This commit is contained in:
commit
609eb9f7ff
|
@ -263,7 +263,7 @@ the above checkout would fail like this:
|
||||||
+
|
+
|
||||||
------------
|
------------
|
||||||
$ git checkout mytopic
|
$ 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
|
You can give the `-m` flag to the command, which would try a
|
||||||
|
|
|
@ -119,7 +119,7 @@ both.
|
||||||
ofs-delta
|
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
|
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.
|
send/read OBJ_OFS_DELTA (aka type 6) in a packfile.
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ test_expect_success 'sigchain works' '
|
||||||
test-sigchain >actual
|
test-sigchain >actual
|
||||||
case "$?" in
|
case "$?" in
|
||||||
143) true ;; # POSIX w/ SIGTERM=15
|
143) true ;; # POSIX w/ SIGTERM=15
|
||||||
|
271) true ;; # ksh w/ SIGTERM=15
|
||||||
3) true ;; # Windows
|
3) true ;; # Windows
|
||||||
*) false ;;
|
*) false ;;
|
||||||
esac &&
|
esac &&
|
||||||
|
|
Loading…
Reference in a new issue