From ef7a8e3b9575a6dc60e2d9e35008914a9eaabfff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Mon, 14 Jun 2010 23:40:05 +0000 Subject: [PATCH 1/3] notes: Initialize variable to appease Sun Studio MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sun Studio 12 Update 1 thinks that *t could be uninitialized, ostensibly because it doesn't take rewrite_cmd into account in its static analysis. builtin/notes.c: In function `notes_copy_from_stdin': builtin/notes.c:419: warning: 't' might be used uninitialized in this function Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- builtin/notes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/notes.c b/builtin/notes.c index 52b72fca68..26617546c8 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -416,7 +416,7 @@ int notes_copy_from_stdin(int force, const char *rewrite_cmd) { struct strbuf buf = STRBUF_INIT; struct notes_rewrite_cfg *c = NULL; - struct notes_tree *t; + struct notes_tree *t = NULL; int ret = 0; if (rewrite_cmd) { From 45a0ee116348d1b36756fe47d338713c06b918ad Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 16 Jun 2010 16:56:53 -0700 Subject: [PATCH 2/3] Prepare draft release notes to 1.7.1.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.1.1.txt | 46 ++++++++++++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes-1.7.1.1.txt diff --git a/Documentation/RelNotes-1.7.1.1.txt b/Documentation/RelNotes-1.7.1.1.txt new file mode 100644 index 0000000000..2eef0380ea --- /dev/null +++ b/Documentation/RelNotes-1.7.1.1.txt @@ -0,0 +1,46 @@ +Git v1.7.1.1 Release Notes (draft) +================================== + +Fixes since v1.7.1 +------------------ + + * Authentication over http transport can now be made lazily, in that the + request can first go to a URL without username, get a 401 response and + then the client will ask for the username to use. + + * We used to mistakenly think "../work" is a subdirectory of the current + directory when we are in "../work-xyz". + + * The attribute mechanism now allows an entry that uses an attribute + macro that set/unset one attribute, immediately followed by an + overriding setting; this makes attribute macros much easier to use. + + * "git am -3" did not show diagnosis when the patch in the message was corrupt. + + * "git bundle --stdin" segfaulted. + + * "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. + + * "git fetch" over HTTP verifies the downloaded packfiles more robustly. + + * The memory usage by "git index-pack" (run during "git fetch" and "git + push") got leaner. + + * "GIT_DIR=foo.git git init --bare bar.git" created foo.git instead of bar.git. + + * "git log --abbrev=$num --format='%h' ignored --abbrev=$num. + + * "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 stash" incorrectly lost paths in the working tree that were + previously removed from the index. + + * "git status" stopped refreshing the index by mistake in 1.7.1. + + * "git status" showed excess "hints" even when advice.statusHints is set to false. + +And other minor fixes and documentation updates. diff --git a/RelNotes b/RelNotes index 00e77229dd..136c1b6afa 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.7.1.txt \ No newline at end of file +Documentation/RelNotes-1.7.1.1.txt \ No newline at end of file From d0b8d79510cd9c45a4c6bc08a37c6348f8293e8a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 16 Jun 2010 17:10:11 -0700 Subject: [PATCH 3/3] Update draft release notes to 1.7.2 ... to exclude items meant to go to 1.7.1.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.2.txt | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/Documentation/RelNotes-1.7.2.txt b/Documentation/RelNotes-1.7.2.txt index 2dea6ffcf6..1df22be126 100644 --- a/Documentation/RelNotes-1.7.2.txt +++ b/Documentation/RelNotes-1.7.2.txt @@ -8,10 +8,6 @@ Updates since v1.7.1 gained a new member in the family (tab-in-indent) to help projects with policy to indent only with spaces. - * Authentication over http transport can now be made lazily, in that the - request can first go to a URL without username, get a 401 response and - then the client will ask for the username to use. - * When working from a subdirectory, by default, git does not look for its metadirectory ".git" across filesystems, primarily to help people who have invocations of git in their custom PS1 prompts, as being outside @@ -37,9 +33,6 @@ Updates since v1.7.1 * "git cvsserver" can be told to use pserver; its password file can be stored outside the repository. - * "git describe" tie-breaks tags that point at the same commit better by - paying attention to the tagger date (newer ones are preferred). - * The output from the textconv filter used by "git diff" can be cached to speed up their reuse. @@ -54,17 +47,12 @@ Updates since v1.7.1 been enhanced for visibility modifiers (public, protected, etc.) to better support PHP5. - * "git fetch" over HTTP verifies the downloaded packfiles more robustly. - * "git for-each-ref" learned "%(objectname:short)" that gives the object name abbreviated. * Various options to "git grep" (e.g. --count, --name-only) work better with binary files. - * The memory usage by "git index-pack" (run during "git fetch" and "git - push") got leaner. - * "git log --follow " follows across copies (it used to only follow renames). This may make the processing more expensive. @@ -76,9 +64,6 @@ Updates since v1.7.1 * "git revert" learned --strategy option to specify the merge strategy. - * "git send-email" learned --smtp-domain option to specify the domainname - used in the EHLO/HELO exchange. - * "git status [-s] --ignored" can be used to list ignored paths. * Various "gitweb" enhancements and clean-ups, including syntax @@ -93,19 +78,13 @@ release, unless otherwise noted. * We didn't recognize timezone "Z" as a synonym for "UTC" (75b37e70). - * In 1.7.1, "git status" stopped refreshing the index by mistake - (e251a7b3^2). - - * We used to mistakenly think "../work" is a subdirectory of the current - directory when we are in "../work-xyz" (490544b). - * "git checkout" and "git rebase" overwrote paths that are marked "assume unchanged" (aecda37c). * "git clone/fetch/pull" issued an incorrect error message when a ref and a symref that points to the ref were updated at the same time. This obviously would update them to the same value, and should not result in - an error condition (da3efdb). + an error condition (7223dcaf). * "git clone" did not configure remote.origin.url correctly for bare clones (df61c889). @@ -121,9 +100,6 @@ release, unless otherwise noted. * "git reset --hard" started from a wrong directory and a working tree in a nonstandard location is in use got confused (560fb6a1). - * "git stash" incorrectly lost paths in the working tree that were - previously removed from the index (7aa5d43). - -- exec >/var/tmp/1 O=v1.7.1-336-g0925c02