From 1844f8d591340bb43e4990c96afd0aba424adf48 Mon Sep 17 00:00:00 2001 From: Brandon Casey Date: Wed, 5 Oct 2011 23:21:33 -0500 Subject: [PATCH 1/4] strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline() This use of strbuf_grow() is a historical artifact that was once used to ensure that strbuf.buf was allocated and properly nul-terminated. This was added before the introduction of the slopbuf in b315c5c0, which guarantees that strbuf.buf always points to a usable nul-terminated string. So let's remove it. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano --- strbuf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/strbuf.c b/strbuf.c index 9ff1b597c9..3ad2cc0016 100644 --- a/strbuf.c +++ b/strbuf.c @@ -357,7 +357,6 @@ int strbuf_getwholeline(struct strbuf *sb, FILE *fp, int term) { int ch; - strbuf_grow(sb, 0); if (feof(fp)) return EOF; From 795290e528deeb4b0578b366af6b4c0c6773e2c9 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Wed, 19 Oct 2011 09:37:06 +0200 Subject: [PATCH 2/4] t1300: attempting to remove a non-existent .git/config is not an error Since some tests before test number 79 ("quoting") are skipped, .git/config does not exist and 'rm .git/config' fails. Fix this particular case. While at it, move other instance of 'rm .git/config' that occur in this file inside the test function to document that the test cases want to protect themselves from remnants of earlier tests. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- t/t1300-repo-config.sh | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index 8a37f96396..39e2244c1f 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -552,8 +552,6 @@ EOF test_expect_success "section was removed properly" \ "test_cmp expect .git/config" -rm .git/config - cat > expect << EOF [gitcvs] enabled = true @@ -564,6 +562,7 @@ EOF test_expect_success 'section ending' ' + rm -f .git/config && git config gitcvs.enabled true && git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite && git config gitcvs.dbname %Ggitcvs2.%a.%m.sqlite && @@ -636,8 +635,6 @@ test_expect_success 'invalid bool (set)' ' test_must_fail git config --bool bool.nobool foobar' -rm .git/config - cat > expect <<\EOF [bool] true1 = true @@ -652,6 +649,7 @@ EOF test_expect_success 'set --bool' ' + rm -f .git/config && git config --bool bool.true1 01 && git config --bool bool.true2 -1 && git config --bool bool.true3 YeS && @@ -662,8 +660,6 @@ test_expect_success 'set --bool' ' git config --bool bool.false4 FALSE && cmp expect .git/config' -rm .git/config - cat > expect <<\EOF [int] val1 = 1 @@ -673,13 +669,12 @@ EOF test_expect_success 'set --int' ' + rm -f .git/config && git config --int int.val1 01 && git config --int int.val2 -1 && git config --int int.val3 5m && cmp expect .git/config' -rm .git/config - cat >expect <<\EOF [bool] true1 = true @@ -693,6 +688,7 @@ cat >expect <<\EOF EOF test_expect_success 'get --bool-or-int' ' + rm -f .git/config && ( echo "[bool]" echo true1 @@ -712,7 +708,6 @@ test_expect_success 'get --bool-or-int' ' ' -rm .git/config cat >expect <<\EOF [bool] true1 = true @@ -726,6 +721,7 @@ cat >expect <<\EOF EOF test_expect_success 'set --bool-or-int' ' + rm -f .git/config && git config --bool-or-int bool.true1 true && git config --bool-or-int bool.false1 false && git config --bool-or-int bool.true2 yes && @@ -736,8 +732,6 @@ test_expect_success 'set --bool-or-int' ' test_cmp expect .git/config ' -rm .git/config - cat >expect <<\EOF [path] home = ~/ @@ -746,6 +740,7 @@ cat >expect <<\EOF EOF test_expect_success NOT_MINGW 'set --path' ' + rm -f .git/config && git config --path path.home "~/" && git config --path path.normal "/dev/null" && git config --path path.trailingtilde "foo~" && @@ -794,7 +789,7 @@ cat > expect << EOF hash = "test#test" EOF test_expect_success 'quoting' ' - rm .git/config && + rm -f .git/config && git config quote.leading " test" && git config quote.ending "test " && git config quote.semicolon "test;test" && From 40d6987d241cfdf45c420a91353fa47e43c47e27 Mon Sep 17 00:00:00 2001 From: Brandon Casey Date: Wed, 19 Oct 2011 09:26:02 -0700 Subject: [PATCH 3/4] t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir script Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano --- t/t3000-ls-files-others.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh index e9160dfc1d..88be904c09 100755 --- a/t/t3000-ls-files-others.sh +++ b/t/t3000-ls-files-others.sh @@ -77,7 +77,7 @@ test_expect_success SYMLINKS 'ls-files --others with symlinked submodule' ' ) && ( cd super && - "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" ../sub sub + "$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" ../sub sub git ls-files --others --exclude-standard >../actual ) && echo sub/ >expect && From 87009edcbd0b4987ccb7ba050a1efe368a315753 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 18 Oct 2011 22:03:30 -0700 Subject: [PATCH 4/4] Update draft release notes to 1.7.8 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.8.txt | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/Documentation/RelNotes/1.7.8.txt b/Documentation/RelNotes/1.7.8.txt index 0576c36f8a..c8eb0eb5ab 100644 --- a/Documentation/RelNotes/1.7.8.txt +++ b/Documentation/RelNotes/1.7.8.txt @@ -4,7 +4,7 @@ Git v1.7.8 Release Notes (draft) Updates since v1.7.7 -------------------- - * Some git-svn and git-gui updates. + * Some git-svn, git-gui and msysgit updates. * Updates to bash completion scripts. @@ -40,6 +40,9 @@ Updates since v1.7.7 * "git diff" learned "--minimal" option to spend extra cycles to come up with a minimal patch output. + * "git diff" learned "--function-context" option to show the whole + function as context that was affected by a change. + * "git fetch" learned to honor transfer.fsckobjects configuration to validate the objects that were received from the other end, just like "git receive-pack" (the receiving end of "git push") does. @@ -63,8 +66,16 @@ Updates since v1.7.7 files in the working tree, so that matches in new but not yet added files do not get missed. + * The recursive merge backend no longer looks for meaningless + existing merges in submodules unless in the outermost merge. + + * "git log" and friends learned "--children" option. + * "git ls-remote" learned to respond to "-h"(elp) requests. + * "git merge" learned the "--edit" option to allow users to edit the + merge commit log message. + * "git send-email" learned to respond to "-h"(elp) requests. * "git send-email" allows the value given to sendemail.aliasfile to begin @@ -93,6 +104,8 @@ Updates since v1.7.7 * "gitweb" leaked unescaped control characters from syntax hiliter outputs. + * "gitweb" now has its own manual pages. + Also contains other documentation updates and minor code cleanups. @@ -142,6 +155,9 @@ included in this release. of the file. (merge 8557263 jc/apply-blank-at-eof-fix later to maint). + * "git apply --index" did not check corrupted patch. + (merge 2c93286 jm/maint-apply-detects-corrupt-patch-header later to maint). + * "git bisect" did not notice when it failed to update the working tree to the next commit to be tested. (merge 1acf11717 js/bisect-no-checkout later to maint). @@ -179,13 +195,17 @@ included in this release. hooks for attempted removal of non-existing refs. (merge 160b81ed ph/push-to-delete-nothing later to maint). + * "git send-email" did not honor the configured hostname when restarting + the HELO/EHLO exchange after switching TLS on. + (merge 155b940 md/smtp-tls-hello-again later to maint). + * "gitweb" used to produce a non-working link while showing the contents of a blob, when JavaScript actions are enabled. (merge 2b07ff3ff ps/gitweb-js-with-lineno later to maint). --- exec >/var/tmp/1 -O=v1.7.7-368-g9638384 +O=v1.7.7-418-g40d6987 echo O=$(git describe --always master) git log --first-parent --oneline --reverse ^$O master echo