mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gb/maint-am-patch-format-error-message'

Browse Source 
* gb/maint-am-patch-format-error-message:
  am: format is in $patch_format, not parse_patch

Conflicts:
	git-am.sh
This commit is contained in:
Junio C Hamano
2011-09-02 13:18:07 -07:00
parent c33e30675b dff4b0ef30
commit e7734c6c9b
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/RelNotes/1.7.7.txt
View File

@ -69,6 +69,9 @@ Updates since v1.7.6
generation machinery stolen from jgit, which might give better generation machinery stolen from jgit, which might give better
performance. performance.
* "git diff" had a wierd worst case behaviour that can be triggered
when comparing files with potentially many places that could match.
* "git fetch", "git push" and friends no longer show connection * "git fetch", "git push" and friends no longer show connection
errors for addresses that couldn't be connected when at least one errors for addresses that couldn't be connected when at least one
address succeeds (this is arguably a regression but a deliberate address succeeds (this is arguably a regression but a deliberate
@ -86,12 +89,22 @@ Updates since v1.7.6
* "git rebase master topci" no longer spews usage hints after giving * "git rebase master topci" no longer spews usage hints after giving
"fatal: no such branch: topci" error message. "fatal: no such branch: topci" error message.
* The recursive merge strategy implementation got a fairly large
fixes for many corner cases that may rarely happen in real world
projects (it has been verified that none of the 16000+ merges in
the Linux kernel history back to v2.6.12 is affected with the
corner case bugs this update fixes).
* "git stash" learned --include-untracked option. * "git stash" learned --include-untracked option.
* "git submodule update" used to stop at the first error updating a * "git submodule update" used to stop at the first error updating a
submodule; it now goes on to update other submodules that can be submodule; it now goes on to update other submodules that can be
updated, and reports the ones with errors at the end. updated, and reports the ones with errors at the end.
* "git push" can be told with --recurse-submodules=check option to
refuse pushing of the supermodule, if any of its submodules'
commits hasn't been pushed out to their remotes.
* "git upload-pack" and "git receive-pack" learned to pretend only a * "git upload-pack" and "git receive-pack" learned to pretend only a
subset of the refs exist in a repository. This may help a site to subset of the refs exist in a repository. This may help a site to
put many tiny repositories into one repository (this would not be put many tiny repositories into one repository (this would not be

3
git-am.sh
View File

@ -312,7 +312,8 @@ split_patches () {
msgnum= msgnum=
;; ;;
*) *)
if test -n "$parse_patch" ; then if test -n "$patch_format"
then
clean_abort "$(eval_gettext "Patch format \$patch_format is not supported.")" clean_abort "$(eval_gettext "Patch format \$patch_format is not supported.")"
else else
clean_abort "$(gettext "Patch format detection failed.")" clean_abort "$(gettext "Patch format detection failed.")"