From e0ae1e6f4d53c68bd219385f6f309c033d0fc673 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 21 Jun 2010 11:18:54 -0700 Subject: [PATCH 1/3] tests: remove unnecessary '^' from 'expr' regular expression As Brandon noticed, a regular expression match given to 'expr' is already anchored at the beginning. Some versions of expr even complain about this. Signed-off-by: Junio C Hamano --- t/t7005-editor.sh | 2 +- t/t7006-pager.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh index 5257f4d261..6355698c6b 100755 --- a/t/t7005-editor.sh +++ b/t/t7005-editor.sh @@ -13,7 +13,7 @@ test_expect_success 'determine default editor' ' ' -if ! expr "$vi" : '^[a-z]*$' >/dev/null +if ! expr "$vi" : '[a-z]*$' >/dev/null then vi= fi diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index 3bc7a2a796..0f6b367832 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh @@ -109,7 +109,7 @@ test_expect_success TTY 'no pager with --no-pager' ' # for the first color; the text "commit" comes later. colorful() { read firstline <$1 - ! expr "$firstline" : "^[a-zA-Z]" >/dev/null + ! expr "$firstline" : "[a-zA-Z]" >/dev/null } test_expect_success 'tests can detect color' ' @@ -167,7 +167,7 @@ test_expect_success 'determine default pager' ' test -n "$less" ' -if expr "$less" : '^[a-z][a-z]*$' >/dev/null && test_have_prereq TTY +if expr "$less" : '[a-z][a-z]*$' >/dev/null && test_have_prereq TTY then test_set_prereq SIMPLEPAGER fi From a4c24549acf16f7917ea3ddd811c6c61afc5689c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 22 Jun 2010 09:18:55 -0700 Subject: [PATCH 2/3] Update draft release notes to 1.7.1.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.1.1.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Documentation/RelNotes-1.7.1.1.txt b/Documentation/RelNotes-1.7.1.1.txt index e0386a43f0..bfdb5ba064 100644 --- a/Documentation/RelNotes-1.7.1.1.txt +++ b/Documentation/RelNotes-1.7.1.1.txt @@ -28,6 +28,9 @@ Fixes since v1.7.1 * "git checkout" and "git rebase" overwrote paths that are marked "assume unchanged". + * "git commit --amend" on a commit with an invalid author-name line that + lacks the display name didn't work. + * "git describe" did not tie-break tags that point at the same commit correctly; newer ones are preferred by paying attention to the tagger date now. @@ -49,14 +52,25 @@ Fixes since v1.7.1 * "git log --abbrev=$num --format='%h' ignored --abbrev=$num. + * "git ls-files ../out/side/cwd" refused to work. + + * "git merge --log" used to replace the custom message given by "-m" with + the shortlog, instead of appending to it. + * "git pull" accepted "--dry-run", gave it to underlying "git fetch" but ignored the option itself, resulting in a bogus attempt to merge unrelated commit. + * "git reset --hard" started from a wrong directory and a working tree in + a nonstandard location is in use got confused. + * "git send-email" lacked a way to specify the domainname used in the EHLO/HELO exchange, causing rejected connection from picky servers. It learned --smtp-domain option to solve this issue. + * "git show -C -C" and other corner cases lost diff metainfo output + in 1.7.0. + * "git stash" incorrectly lost paths in the working tree that were previously removed from the index. @@ -65,3 +79,10 @@ Fixes since v1.7.1 * "git status" showed excess "hints" even when advice.statusHints is set to false. And other minor fixes and documentation updates. + + +-- +exec >/var/tmp/1 +O=v1.7.1-195-gb2ebbd8 +echo O=$(git describe HEAD) +git shortlog --no-merges HEAD ^$O From 6f426c74a4ba6805d6d30619429507aeb6ffbbea Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 22 Jun 2010 10:03:04 -0700 Subject: [PATCH 3/3] Update draft release notes to 1.7.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.2.txt | 53 ++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/Documentation/RelNotes-1.7.2.txt b/Documentation/RelNotes-1.7.2.txt index a1b5428df4..9f6a904286 100644 --- a/Documentation/RelNotes-1.7.2.txt +++ b/Documentation/RelNotes-1.7.2.txt @@ -4,6 +4,11 @@ Git v1.7.2 Release Notes (draft) Updates since v1.7.1 -------------------- + * core.eol configuration and eol attribute are the new way to control + the end of line conventions for files in the working tree; + core.autocrlf overrides it, keeping the traditional behaviour by + default. + * The whitespace rules used in "git apply --whitespace" and "git diff" gained a new member in the family (tab-in-indent) to help projects with policy to indent only with spaces. @@ -16,9 +21,19 @@ Updates since v1.7.1 environment variable can be used to tell git not to stop at a filesystem boundary. + * Usage help messages generated by parse-options library (i.e. most + of the Porcelain commands) are sent to the standard output now. + + * ':/' notation to look for a commit now takes regular expression + and it is not anchored at the beginning of the commit log message + anymore (this is a backward incompatible change). + * "git" wrapper learned "-c name=value" option to override configuration variable from the command line. + * Improved portability for various platforms including older SunOS, + HP-UX 10/11, AIX, Tru64, etc. and platforms with Python 2.4. + * The message from "git am -3" has been improved when conflict resolution ended up making the patch a no-op. @@ -26,8 +41,9 @@ Updates since v1.7.1 prepares to create a root commit that is not connected to any existing commit. - * "git commit --amend" on a commit with an invalid author-name line that - lacks the display name didn't work (fb7749e4). + * "git cherry-pick" learned to pick a range of commits (e.g. "cherry-pick + A..B"); this does not have nicer sequencing control "rebase [-i]" has, + though. * "git cvsserver" can be told to use pserver; its password file can be stored outside the repository. @@ -48,6 +64,10 @@ Updates since v1.7.1 * "git for-each-ref" learned "%(objectname:short)" that gives the object name abbreviated. + * "git format-patch" learned --signature option and format.signature + configuration variable to customize the e-mail signature used in the + output. + * Various options to "git grep" (e.g. --count, --name-only) work better with binary files. @@ -56,7 +76,10 @@ Updates since v1.7.1 * "git log --follow " follows across copies (it used to only follow renames). This may make the processing more expensive. - * "git ls-files ../out/side/cwd" works now. + * "git log --pretty=format: