{"thread":{"id":"41388","subject":"Interim \"What's cooking\"","startedAt":"2016-02-10T23:43:11Z","lastAt":"2016-02-14T09:26:29Z","messageCount":5,"participants":["Junio C Hamano","Eric Wong"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"277903","messageId":"xmqqsi10xhbk.fsf@gitster.mtv.corp.google.com","threadId":"41388","inReplyTo":null,"subject":"Interim \"What's cooking\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-02-10T23:43:11Z","receivedAt":"2016-02-10T23:43:11Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"In today/tonight's pushout, the 'master' branch will have these\ntopics merged.\n\nThanks for contributing ;-)\n\n\n[Graduated to \"master\"]\n\n* aw/push-force-with-lease-reporting (2016-02-01) 1 commit\n (merged to 'next' on 2016-02-03 at facd28f)\n + push: fix ref status reporting for --force-with-lease\n\n \"git push --force-with-lease\" has been taught to report if the push\n needed to force (or fast-forwarded).\n\n\n* cc/untracked (2016-01-27) 11 commits\n (merged to 'next' on 2016-02-01 at 8203631)\n + t7063: add tests for core.untrackedCache\n + test-dump-untracked-cache: don't modify the untracked cache\n + config: add core.untrackedCache\n + dir: simplify untracked cache \"ident\" field\n + dir: add remove_untracked_cache()\n + dir: add {new,add}_untracked_cache()\n + update-index: move 'uc' var declaration\n + update-index: add untracked cache notifications\n + update-index: add --test-untracked-cache\n + update-index: use enum for untracked cache options\n + dir: free untracked cache when removing it\n\n Update the untracked cache subsystem and change its primary UI from\n \"git update-index\" to \"git config\".\n\n\n* ew/connect-verbose (2016-01-28) 1 commit\n (merged to 'next' on 2016-02-03 at ceac37e)\n + pass transport verbosity down to git_connect\n\n There were a few \"now I am doing this thing\" progress messages in\n the TCP connection code that can be triggered by setting a verbose\n option internally in the code, but \"git fetch -v\" and friends never\n passed the verbose option down to that codepath.\n\n There was a brief discussion about the impact on the end-user\n experience by not limiting this to \"fetch -v -v\", but I think the\n conclusion is that this is OK to enable with a single \"-v\" as it is\n not too noisy.\n\n\n* jk/options-cleanup (2016-02-01) 6 commits\n (merged to 'next' on 2016-02-03 at a78d89d)\n + apply, ls-files: simplify \"-z\" parsing\n + checkout-index: disallow \"--no-stage\" option\n + checkout-index: handle \"--no-index\" option\n + checkout-index: handle \"--no-prefix\" option\n + checkout-index: simplify \"-z\" option parsing\n + give \"nbuf\" strbuf a more meaningful name\n\n Various clean-ups to the command line option parsing.\n\n\n* js/test-lib-windows-emulated-yes (2016-02-02) 1 commit\n (merged to 'next' on 2016-02-03 at bf6b42c)\n + test-lib: limit the output of the yes utility\n\n The emulated \"yes\" command used in our test scripts has been\n tweaked not to spend too much time generating unnecessary output\n that is not used, to help those who test on Windows where it would\n not stop until it fills the pipe buffer due to lack of SIGPIPE.\n\n\n* js/xmerge-marker-eol (2016-01-27) 2 commits\n (merged to 'next' on 2016-02-01 at 05d91a4)\n + merge-file: ensure that conflict sections match eol style\n + merge-file: let conflict markers match end-of-line style of the context\n\n The low-level merge machinery has been taught to use CRLF line\n termination when inserting conflict markers to merged contents that\n are themselves CRLF line-terminated.\n\n\n* ls/clean-smudge-override-in-config (2016-01-29) 1 commit\n (merged to 'next' on 2016-02-03 at 5962354)\n + convert: treat an empty string for clean/smudge filters as \"cat\"\n\n Clean/smudge filters defined in a configuration file of lower\n precedence can now be overridden to be a pass-through no-op by\n setting the variable to an empty string.\n\n\n* nd/do-not-move-worktree-manually (2016-01-22) 2 commits\n (merged to 'next' on 2016-01-26 at c539221)\n + worktree: stop supporting moving worktrees manually\n + worktree.c: fix indentation\n\n \"git worktree\" had a broken code that attempted to auto-fix\n possible inconsistency that results from end-users moving a\n worktree to different places without telling Git (the original\n repository needs to maintain backpointers to its worktrees, but\n \"mv\" run by end-users who are not familiar with that fact will\n obviously not adjust them), which actually made things worse\n when triggered.\n\n\n* wp/sha1-name-negative-match (2016-02-01) 2 commits\n (merged to 'next' on 2016-02-03 at 89fa5ef)\n + object name: introduce '^{/!-}' notation\n + test for '!' handling in rev-parse's named commits\n\n A new \"^{/!-}\" notation can be used to name a\n commit that is reachable from that does not match the\n given .\n"},{"id":"278056","messageId":"20160212234953.GA8691@dcvr.yhbt.net","threadId":"41388","inReplyTo":"xmqqsi10xhbk.fsf@gitster.mtv.corp.google.com","subject":"Re: Interim \"What's cooking\"","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2016-02-12T23:49:53Z","receivedAt":"2016-02-12T23:49:53Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Junio C Hamano wrote:\n> * ew/connect-verbose (2016-01-28) 1 commit\n> (merged to 'next' on 2016-02-03 at ceac37e)\n> + pass transport verbosity down to git_connect\n\nBtw, I posted v2 of this with tests added to t/t5570-git-daemon.sh\n\n http://mid.gmane.org/20160130085056.GA20118@dcvr.yhbt.net\n\nCan you replace it with my v2 or would you prefer a standalone\npatch for just the test? Thanks.\n"},{"id":"278058","messageId":"20160213003526.GA15899@dcvr.yhbt.net","threadId":"41388","inReplyTo":"CAPc5daUd6fQ6hX6W1AzQ9rCzrsTvkXOxZgwVdibbM5S34nF7ZA@mail.gmail.com","subject":"[PATCH] t5570: add tests for \"git fetch -v\"","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2016-02-13T00:35:26Z","receivedAt":"2016-02-13T00:35:26Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Now that git_connect is more information about connectivity\nprogress after: (\"pass transport verbosity down to git_connect\")\nwe should ensure it remains so for future users who need to\nto diagnose networking problems.\n\nSigned-off-by: Eric Wong \n---\n Junio C Hamano wrote:\n > On Fri, Feb 12, 2016 at 3:49 PM, Eric Wong wrote:\n > > Junio C Hamano wrote:\n > >> * ew/connect-verbose (2016-01-28) 1 commit\n > >> (merged to 'next' on 2016-02-03 at ceac37e)\n > >> + pass transport verbosity down to git_connect\n > >\n > > Btw, I posted v2 of this with tests added to t/t5570-git-daemon.sh\n > >\n > > http://mid.gmane.org/20160130085056.GA20118@dcvr.yhbt.net\n > >\n > > Can you replace it with my v2 or would you prefer a standalone\n > > patch for just the test? Thanks.\n > \n > Thanks, that's water under the bridge, so let's have a follow-up patch\n > to add test.\n\n t/t5570-git-daemon.sh | 25 +++++++++++++++++++++++--\n 1 file changed, 23 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh\nindex d76269a..095e862 100755\n--- a/t/t5570-git-daemon.sh\n+++ b/t/t5570-git-daemon.sh\n@@ -6,6 +6,13 @@ test_description='test fetching over git protocol'\n . \"$TEST_DIRECTORY\"/lib-git-daemon.sh\n start_git_daemon\n \n+check_verbose_connect () {\n+\tgrep -qF \"Looking up 127.0.0.1 ...\" stderr &&\n+\tgrep -qF \"Connecting to 127.0.0.1 (port \" stderr &&\n+\tgrep -qF \"done.\" stderr &&\n+\trm stderr\n+}\n+\n test_expect_success 'setup repository' '\n \tgit config push.default matching &&\n \techo content >file &&\n@@ -24,18 +31,32 @@ test_expect_success 'create git-accessible bare repository' '\n '\n \n test_expect_success 'clone git repository' '\n-\tgit clone \"$GIT_DAEMON_URL/repo.git\" clone &&\n+\tgit clone -v \"$GIT_DAEMON_URL/repo.git\" clone 2>stderr &&\n \ttest_cmp file clone/file\n '\n \n+test_expect_success 'clone -v stderr is as expected' check_verbose_connect\n+\n test_expect_success 'fetch changes via git protocol' '\n \techo content >>file &&\n \tgit commit -a -m two &&\n \tgit push public &&\n-\t(cd clone && git pull) &&\n+\t(cd clone && git pull -v) 2>stderr &&\n \ttest_cmp file clone/file\n '\n \n+test_expect_success 'pull -v stderr is as expected' check_verbose_connect\n+\n+test_expect_success 'no-op fetch -v stderr is as expected' '\n+\t(cd clone && git fetch -v) 2>stderr &&\n+\tcheck_verbose_connect\n+'\n+\n+test_expect_success 'no-op fetch without \"-v\" is quiet' '\n+\t(cd clone && git fetch) 2>stderr &&\n+\t! test -s stderr\n+'\n+\n test_expect_success 'remote detects correct HEAD' '\n \tgit push public master:other &&\n \t(cd clone &&\n-- \nEW\n"},{"id":"278084","messageId":"xmqqtwlcs5e6.fsf@gitster.mtv.corp.google.com","threadId":"41388","inReplyTo":"20160213003526.GA15899@dcvr.yhbt.net","subject":"Re: [PATCH] t5570: add tests for \"git fetch -v\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-02-13T20:48:49Z","receivedAt":"2016-02-13T20:48:49Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Wong writes:\n\n> Now that git_connect is more information about connectivity\n> progress after: (\"pass transport verbosity down to git_connect\")\n> we should ensure it remains so for future users who need to\n> to diagnose networking problems.\n\nThanks.\n\n> diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh\n> index d76269a..095e862 100755\n> --- a/t/t5570-git-daemon.sh\n> +++ b/t/t5570-git-daemon.sh\n> @@ -6,6 +6,13 @@ test_description='test fetching over git protocol'\n> . \"$TEST_DIRECTORY\"/lib-git-daemon.sh\n> start_git_daemon\n> \n> +check_verbose_connect () {\n> +\tgrep -qF \"Looking up 127.0.0.1 ...\" stderr &&\n> +\tgrep -qF \"Connecting to 127.0.0.1 (port \" stderr &&\n> +\tgrep -qF \"done.\" stderr &&\n> +\trm stderr\n> +}\n\nIf you run the test without \"-v\", you would not see these strings\nfrom grep hits, right? I'd prefer losing \"-q\" here. Also do we\nneed \"rm stderr\" at the end? Everybody that uses this heler to\ncheck the result will create the file from scratch anyway, so...\n\n> @@ -24,18 +31,32 @@ test_expect_success 'create git-accessible bare repository' '\n> '\n> \n> test_expect_success 'clone git repository' '\n> -\tgit clone \"$GIT_DAEMON_URL/repo.git\" clone &&\n> +\tgit clone -v \"$GIT_DAEMON_URL/repo.git\" clone 2>stderr &&\n> \ttest_cmp file clone/file\n> '\n\nWhat's the point of saving the error output without checking?\n\n> +test_expect_success 'clone -v stderr is as expected' check_verbose_connect\n> +\n\nAhh, you made it into two separate tests, one depending on the\nprevious one not being skipped? I think it is better to fold this\ninto the previous one, i.e.\n\n\tclone -v 2>stderr &&\n check_verbose_output &&\n test_cmp file clone/file\n\nThe same comment applies to the next one.\n\nThe test for \"fetch -v\" is already in that form, so no need to\ncorrect anything there. Also it is good that you test the case\nwithout \"-v\" and ensure it stays quiet.\n\nThanks.\n"},{"id":"278092","messageId":"20160214092629.GA1909@dcvr.yhbt.net","threadId":"41388","inReplyTo":"xmqqtwlcs5e6.fsf@gitster.mtv.corp.google.com","subject":"[PATCH v2] t5570: add tests for \"git {clone,fetch,pull} -v\"","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2016-02-14T09:26:29Z","receivedAt":"2016-02-14T09:26:29Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Now that git_connect is more information about connectivity\nprogress after: (\"pass transport verbosity down to git_connect\")\nwe should ensure it remains so for future users who need to\nto diagnose networking problems.\n\nSigned-off-by: Eric Wong \n---\n Thanks for the feedback, v2 changes as suggested:\n - remove -q flag from grep invocation for verbose git tests\n - do not remove stderr file after testing\n - fold verbosity check into existing tests for skip-ability\n\n t/t5570-git-daemon.sh | 22 ++++++++++++++++++++--\n 1 file changed, 20 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh\nindex d76269a..225a022 100755\n--- a/t/t5570-git-daemon.sh\n+++ b/t/t5570-git-daemon.sh\n@@ -6,6 +6,12 @@ test_description='test fetching over git protocol'\n . \"$TEST_DIRECTORY\"/lib-git-daemon.sh\n start_git_daemon\n \n+check_verbose_connect () {\n+\tgrep -F \"Looking up 127.0.0.1 ...\" stderr &&\n+\tgrep -F \"Connecting to 127.0.0.1 (port \" stderr &&\n+\tgrep -F \"done.\" stderr\n+}\n+\n test_expect_success 'setup repository' '\n \tgit config push.default matching &&\n \techo content >file &&\n@@ -24,7 +30,8 @@ test_expect_success 'create git-accessible bare repository' '\n '\n \n test_expect_success 'clone git repository' '\n-\tgit clone \"$GIT_DAEMON_URL/repo.git\" clone &&\n+\tgit clone -v \"$GIT_DAEMON_URL/repo.git\" clone 2>stderr &&\n+\tcheck_verbose_connect &&\n \ttest_cmp file clone/file\n '\n \n@@ -32,10 +39,21 @@ test_expect_success 'fetch changes via git protocol' '\n \techo content >>file &&\n \tgit commit -a -m two &&\n \tgit push public &&\n-\t(cd clone && git pull) &&\n+\t(cd clone && git pull -v) 2>stderr &&\n+\tcheck_verbose_connect &&\n \ttest_cmp file clone/file\n '\n \n+test_expect_success 'no-op fetch -v stderr is as expected' '\n+\t(cd clone && git fetch -v) 2>stderr &&\n+\tcheck_verbose_connect\n+'\n+\n+test_expect_success 'no-op fetch without \"-v\" is quiet' '\n+\t(cd clone && git fetch) 2>stderr &&\n+\t! test -s stderr\n+'\n+\n test_expect_success 'remote detects correct HEAD' '\n \tgit push public master:other &&\n \t(cd clone &&\n-- \nEW\n"}]}