From 6c15a1c63634005a0f8fb15696e154cc54b0a359 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 13 Mar 2012 11:38:27 -0700 Subject: [PATCH 1/2] am: officially deprecate -b/--binary option We have had these options as harmless no-op for more than 3 years without officially deprecating them. Let's announce the deprecation and start warning against their use, but without failing the command just not yet, so that we can later repurpose the option if we want to in the future. Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.10.txt | 4 ++-- git-am.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt index 65df74b9c4..6286485bdb 100644 --- a/Documentation/RelNotes/1.7.10.txt +++ b/Documentation/RelNotes/1.7.10.txt @@ -26,8 +26,8 @@ Compatibility Notes Git v1.7.8 or newer. * The "--binary/-b" options to "git am" have been a no-op for quite a - while and was deprecated in mid 2008 (v1.6.0). When you give these - options to "git am", it will now fail with an error. + while and were deprecated in mid 2008 (v1.6.0). When you give these + options to "git am", it will now warn and ask you not to use them. Updates since v1.7.9 diff --git a/git-am.sh b/git-am.sh index faae820719..4da0ddafc4 100755 --- a/git-am.sh +++ b/git-am.sh @@ -380,8 +380,8 @@ do -i|--interactive) interactive=t ;; -b|--binary) - echo >&2 "The -b/--binary option was deprecated in 1.6.0 and removed in 1.7.10." - die "Please adjust your scripts." + echo >&2 "The $1 option has been a no-op for long time, and" + echo >&2 "it will be removed. Please do not use it anymore." ;; -3|--3way) threeway=t ;; From 0e2d57fd50f61e668be3180bc8f25991ea88aa8c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 14 Mar 2012 15:38:47 -0700 Subject: [PATCH 2/2] Git 1.7.10-rc1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.10.txt | 14 +++++++++++--- GIT-VERSION-GEN | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt index 6286485bdb..540ce38c45 100644 --- a/Documentation/RelNotes/1.7.10.txt +++ b/Documentation/RelNotes/1.7.10.txt @@ -119,8 +119,8 @@ UI, Workflows & Features * Project search in "gitweb" shows the substring that matched in the project name and description highlighted. - * A new script "diffall" is added to contrib/; it drives an external - an external tool to perform a directory diff of two Git revisions + * A new script "diffall" is added to contrib/; it drives an + external tool to perform a directory diff of two Git revisions in one go, unlike "difftool" that compares one file at a time. Foreign Interface @@ -180,17 +180,25 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance releases are contained in this release (see release notes to them for details). + * The "remaining" subcommand to "git rerere" was not documented. + (merge 3e7a1df ph/rerere-doc later to maint). + * "git tag -s" honored "gpg.program" configuration variable since 1.7.9, but "git tag -v" and "git verify-tag" didn't. (merge a2c2506 az/verify-tag-use-gpg-config later to maint). + * When "git config" diagnoses an error in a configuration file and + shows the line number for the offending line, it miscounted if the + error was at the end of line. + (merge 4b34059 ms/maint-config-error-at-eol-linecount later to maint). + * "gitweb" used to drop warnings in the log file when "heads" view is accessed in a repository whose HEAD does not point at a valid branch. --- exec >/var/tmp/1 -O=v1.7.10-rc0-40-g57cec0a +O=v1.7.10-rc0-50-gd973dc0 echo O=$(git describe) git log --first-parent --oneline ^maint $O.. echo diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index f28ceef12e..1c06cec047 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.10-rc0 +DEF_VER=v1.7.10-rc1 LF=' '