Re: What's cooking in git.git (Jun 2016, #04; Tue, 14)
Jeff King writes: > On Wed, Jun 15, 2016 at 09:35:20AM +0200, Elia Pinto wrote: > >> > * ep/http-curl-trace (2016-05-24) 2 commits >> > - imap-send.c: introduce the GIT_TRACE_CURL enviroment variable >> > - http.c: implement the GIT_TRACE_CURL environment variable >> > >> > HTTP transport gained an option to produce more detailed debugging >> > trace. >> > >> > Rerolled. Is everybody happy with this version? >> > >> The refs is there >> http://git.661346.n2.nabble.com/PATCH-v7-0-2-Implement-the-GIT-TRACE-CURL-environment-variable-td7657079.html >> >> If kindly someone who has reviewed and helped me to do the patch >> could give an ack (or a nack eventually). Thanks in advance > > I gave another look at what is queued in pu, and I think it is OK. I > still find the output a little verbose, but I think we should ship it > and see how it fares in practice while debugging. I don't think its > exact format needs to be set in stone, so we can tweak it later if we > choose. Thanks, let's push it forwared then. > > -Peff > > PS Please trim your quotes to just the relevant bits. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jun 2016, #04; Tue, 14)
On Wed, Jun 15, 2016 at 09:35:20AM +0200, Elia Pinto wrote: > > * ep/http-curl-trace (2016-05-24) 2 commits > > - imap-send.c: introduce the GIT_TRACE_CURL enviroment variable > > - http.c: implement the GIT_TRACE_CURL environment variable > > > > HTTP transport gained an option to produce more detailed debugging > > trace. > > > > Rerolled. Is everybody happy with this version? > > > The refs is there > http://git.661346.n2.nabble.com/PATCH-v7-0-2-Implement-the-GIT-TRACE-CURL-environment-variable-td7657079.html > > If kindly someone who has reviewed and helped me to do the patch > could give an ack (or a nack eventually). Thanks in advance I gave another look at what is queued in pu, and I think it is OK. I still find the output a little verbose, but I think we should ship it and see how it fares in practice while debugging. I don't think its exact format needs to be set in stone, so we can tweak it later if we choose. -Peff PS Please trim your quotes to just the relevant bits. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jun 2016, #04; Tue, 14)
On Wed, Jun 15, 2016 at 11:32:39AM -0700, Junio C Hamano wrote: > Mike Hommey writes: > > > On Tue, Jun 14, 2016 at 03:08:04PM -0700, Junio C Hamano wrote: > > >> * mh/connect (2016-06-06) 10 commits > >> - connect: [host:port] is legacy for ssh > >> ... > >> - connect: document why we sometimes call get_port after get_host_and_port > >> > >> Ok, folks, is everybody happy with this version? > > > > $gmane/296609 > > $gmane/296610 > > Oh, I have seen these, and I know you two are happy. > > But I am having a hard time coming up with a few-line summary for > this topic. I can write the beginning part, i.e. "Git-URL parsing > routine has been rewritten", but the concluding part of the sentence > cannot be "... has been rewritten for no good reason." if I were to > mark the topic as "Will merge to 'next'". The best I can come up > with is "... has been rewritten (hopefully) without changing the > benaviour.", but that is not a strong-enough justificaiton to make > the change to the codebase, either. > > In short, while the update may not introduce new bugs, why would we > want to have this change in the first place? My original motivation was to avoid having to copy code from connect.c into git-cinnabar, which is what I'm currently doing[1]. Things derailed a little, and we got ourselves somewhat in the middle of a refactor, that I'm willing to push a little further (like, refactor things such that host_end only happens once). My hope is that this makes the code more maintainable. Mike 1. https://github.com/glandium/git-cinnabar/blob/master/connect.c -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jun 2016, #04; Tue, 14)
Duy Nguyen writes:
>> * nd/worktree-cleanup-post-head-protection (2016-05-24) 6 commits
>> - worktree: simplify prefixing paths
>> - worktree: avoid 0{40}, too many zeroes, hard to read
>> - worktree.c: use is_dot_or_dotdot()
>> - git-worktree.txt: keep subcommand listing in alphabetical order
>> - worktree.c: rewrite mark_current_worktree() to avoid strbuf
>> - completion: support git-worktree
>> (this branch is used by nd/worktree-lock.)
>>
>> Further preparatory clean-up for "worktree" feature.
>>
>> Expecting a reroll.
>> ($gmane/294136, etc.)
>
> Hmm.. I think what's in 'pu' (which is v2, $gmane/295260) is ok now.
Yes, thanks for spotting. I should have updated the status text
when I picked up the reroll.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jun 2016, #04; Tue, 14)
Mike Hommey writes: > On Tue, Jun 14, 2016 at 03:08:04PM -0700, Junio C Hamano wrote: >> * mh/connect (2016-06-06) 10 commits >> - connect: [host:port] is legacy for ssh >> ... >> - connect: document why we sometimes call get_port after get_host_and_port >> >> Ok, folks, is everybody happy with this version? > > $gmane/296609 > $gmane/296610 Oh, I have seen these, and I know you two are happy. But I am having a hard time coming up with a few-line summary for this topic. I can write the beginning part, i.e. "Git-URL parsing routine has been rewritten", but the concluding part of the sentence cannot be "... has been rewritten for no good reason." if I were to mark the topic as "Will merge to 'next'". The best I can come up with is "... has been rewritten (hopefully) without changing the benaviour.", but that is not a strong-enough justificaiton to make the change to the codebase, either. In short, while the update may not introduce new bugs, why would we want to have this change in the first place? By the way, please do not quote the whole thing when you are responding to a tiny part of the original message. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jun 2016, #04; Tue, 14)
On Wed, Jun 15, 2016 at 5:08 AM, Junio C Hamano wrote:
> * nd/i-t-a-commitable (2016-06-06) 3 commits
> - commit: don't count i-t-a entries when checking if the new commit is empty
> - Resurrect "diff-lib.c: adjust position of i-t-a entries in diff"
> - diff.h: extend "flags" field to 64 bits because we're out of bits
>
> "rm .git/index && git add -N * && git commit" allows you to create
> an empty commit without --allow-empty; attempt to forbid it.
>
> Breaks many tests by completely butchering "git commit", it seems.
Not surprising. I did run some basic tests, but not the test suite. It
was more an excuse to bring up the topic again. Please drop it. I will
probably resend (with more or less the same idea, since you haven't
given a loud and clear "NO").
> * nd/worktree-cleanup-post-head-protection (2016-05-24) 6 commits
> - worktree: simplify prefixing paths
> - worktree: avoid 0{40}, too many zeroes, hard to read
> - worktree.c: use is_dot_or_dotdot()
> - git-worktree.txt: keep subcommand listing in alphabetical order
> - worktree.c: rewrite mark_current_worktree() to avoid strbuf
> - completion: support git-worktree
> (this branch is used by nd/worktree-lock.)
>
> Further preparatory clean-up for "worktree" feature.
>
> Expecting a reroll.
> ($gmane/294136, etc.)
Hmm.. I think what's in 'pu' (which is v2, $gmane/295260) is ok now.
--
Duy
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jun 2016, #04; Tue, 14)
2016-06-15 0:08 GMT+02:00 Junio C Hamano : > Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with > '+' are in 'next'. The ones marked with '.' do not appear in any of > the integration branches, but I am still holding onto them. > > Git 2.9 has been tagged. Let's wait for a few days to clean up > possible fallout and then start a new cycle by rewinding the tip of > 'next'. I expect I'd eject a few premature topics out of 'next' > while doing so. > > You can find the changes described here in the integration branches > of the repositories listed at > > http://git-blame.blogspot.com/p/git-public-repositories.html > > -- > [Graduated to "master"] > > * jc/t2300-setup (2016-06-01) 1 commit > (merged to 'next' on 2016-06-06 at 20f7f83) > + t2300: run git-sh-setup in an environment that better mimics the real life > (this branch is used by va/i18n-even-more.) > > A test fix. > > > * jk/diff-compact-heuristic (2016-06-10) 1 commit > - diff: disable compaction heuristic for now > > It turns out that the earlier effort to update the heuristics may > want to use a bit more time to mature. Turn it off by default. > > > * jk/shell-portability (2016-06-01) 2 commits > (merged to 'next' on 2016-06-06 at 5de784e) > + t5500 & t7403: lose bash-ism "local" > + test-lib: add in-shell "env" replacement > > test fixes. > > -- > [New Topics] > > * lv/status-say-working-tree-not-directory (2016-06-09) 1 commit > - Use "working tree" instead of "working directory" for git status > > "git status" used to say "working directory" when it meant "working > tree". > > Will merge to 'next'. > > > * jk/parseopt-string-list (2016-06-13) 3 commits > - blame,shortlog: don't make local option variables static > - interpret-trailers: don't duplicate option strings > - parse_opt_string_list: stop allocating new strings > (this branch is used by jk/string-list-static-init.) > > The command line argument parsing that uses OPT_STRING_LIST() often > made a copy of the argv[] element, which was unnecessary. > > Will merge to 'next'. > > > * jk/repack-keep-unreachable (2016-06-14) 3 commits > - repack: extend --keep-unreachable to loose objects > - repack: add --keep-unreachable option > - repack: document --unpack-unreachable option > > "git repack" learned the "--keep-unreachable" option, which sends > loose unreachable objects to a pack instead of leaving them loose. > This helps heuristics based on the number of loose objects > (e.g. "gc --auto"). > > Will merge to 'next'. > > > * lf/recv-sideband-cleanup (2016-06-13) 1 commit > - sideband.c: refactor recv_sideband() > > Code simplification. It however loses the atomicity of the output > 9ac13ec9 (atomic write for sideband remote messages, 2006-10-11) > tried to add to an once-much-simpler codebase. > > Expecting a reroll. > > > * nd/test-lib-httpd-show-error-log-in-verbose (2016-06-13) 1 commit > - lib-httpd.sh: print error.log on error > > Debugging aid. > > Will merge to 'next'. > > > * pc/occurred (2016-06-10) 2 commits > - config.c: fix misspelt "occurred" in an error message > - refs.h: fix misspelt "occurred" in a comment > > Will merge to 'next'. > > > * sb/submodule-clone-retry (2016-06-13) 2 commits > - submodule update: continue when a clone fails > - submodule--helper: initial clone learns retry logic > (this branch uses sb/submodule-recommend-shallowness.) > > "git submodule update" that drives many "git clone" could > eventually hit flaky servers/network conditions on one of the > submodules; the command learned to retry the attempt. > > > * jc/blame-reverse (2016-06-14) 2 commits > - blame: dwim "blame --reverse OLD" as "blame --reverse OLD.." > - blame: improve diagnosis for "--reverse NEW" > > > * jc/deref-tag (2016-06-14) 1 commit > - blame, line-log: do not loop around deref_tag() > > Code clean-up. > > Will merge to 'next'. > > > * jk/fetch-prune-doc (2016-06-14) 1 commit > - fetch: document that pruning happens before fetching > > Will merge to 'next'. > > > * km/fetch-do-not-free-remote-name (2016-06-14) 1 commit > - builtin/fetch.c: don't free remote->name after fetch > > Will merge to 'next'. > > > * nb/gnome-keyring-build (2016-06-14) 1 commit > - gnome-keyring: Don't hard-code pkg-config executable > > Build improvements for gnome-keyring (in contrib/) > > Will merge to 'next'. > > > * pb/strbuf-read-file-doc (2016-06-14) 1 commit > - strbuf: describe the return value of strbuf_read_file > > Will merge to 'next'. > > -- > [Stalled] > > * sb/bisect (2016-04-15) 22 commits > - SQUASH??? > - bisect: get back halfway shortcut > - bisect: compute best bisection in compute_relevant_weights() > - bisect: use a bottom-up traversal to find relevant weights > - bisect: prepare fo
Re: What's cooking in git.git (Jun 2016, #04; Tue, 14)
On Tue, Jun 14, 2016 at 03:08:04PM -0700, Junio C Hamano wrote: > Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with > '+' are in 'next'. The ones marked with '.' do not appear in any of > the integration branches, but I am still holding onto them. > > Git 2.9 has been tagged. Let's wait for a few days to clean up > possible fallout and then start a new cycle by rewinding the tip of > 'next'. I expect I'd eject a few premature topics out of 'next' > while doing so. > > You can find the changes described here in the integration branches > of the repositories listed at > > http://git-blame.blogspot.com/p/git-public-repositories.html > > -- > [Graduated to "master"] > > * jc/t2300-setup (2016-06-01) 1 commit > (merged to 'next' on 2016-06-06 at 20f7f83) > + t2300: run git-sh-setup in an environment that better mimics the real life > (this branch is used by va/i18n-even-more.) > > A test fix. > > > * jk/diff-compact-heuristic (2016-06-10) 1 commit > - diff: disable compaction heuristic for now > > It turns out that the earlier effort to update the heuristics may > want to use a bit more time to mature. Turn it off by default. > > > * jk/shell-portability (2016-06-01) 2 commits > (merged to 'next' on 2016-06-06 at 5de784e) > + t5500 & t7403: lose bash-ism "local" > + test-lib: add in-shell "env" replacement > > test fixes. > > -- > [New Topics] > > * lv/status-say-working-tree-not-directory (2016-06-09) 1 commit > - Use "working tree" instead of "working directory" for git status > > "git status" used to say "working directory" when it meant "working > tree". > > Will merge to 'next'. > > > * jk/parseopt-string-list (2016-06-13) 3 commits > - blame,shortlog: don't make local option variables static > - interpret-trailers: don't duplicate option strings > - parse_opt_string_list: stop allocating new strings > (this branch is used by jk/string-list-static-init.) > > The command line argument parsing that uses OPT_STRING_LIST() often > made a copy of the argv[] element, which was unnecessary. > > Will merge to 'next'. > > > * jk/repack-keep-unreachable (2016-06-14) 3 commits > - repack: extend --keep-unreachable to loose objects > - repack: add --keep-unreachable option > - repack: document --unpack-unreachable option > > "git repack" learned the "--keep-unreachable" option, which sends > loose unreachable objects to a pack instead of leaving them loose. > This helps heuristics based on the number of loose objects > (e.g. "gc --auto"). > > Will merge to 'next'. > > > * lf/recv-sideband-cleanup (2016-06-13) 1 commit > - sideband.c: refactor recv_sideband() > > Code simplification. It however loses the atomicity of the output > 9ac13ec9 (atomic write for sideband remote messages, 2006-10-11) > tried to add to an once-much-simpler codebase. > > Expecting a reroll. > > > * nd/test-lib-httpd-show-error-log-in-verbose (2016-06-13) 1 commit > - lib-httpd.sh: print error.log on error > > Debugging aid. > > Will merge to 'next'. > > > * pc/occurred (2016-06-10) 2 commits > - config.c: fix misspelt "occurred" in an error message > - refs.h: fix misspelt "occurred" in a comment > > Will merge to 'next'. > > > * sb/submodule-clone-retry (2016-06-13) 2 commits > - submodule update: continue when a clone fails > - submodule--helper: initial clone learns retry logic > (this branch uses sb/submodule-recommend-shallowness.) > > "git submodule update" that drives many "git clone" could > eventually hit flaky servers/network conditions on one of the > submodules; the command learned to retry the attempt. > > > * jc/blame-reverse (2016-06-14) 2 commits > - blame: dwim "blame --reverse OLD" as "blame --reverse OLD.." > - blame: improve diagnosis for "--reverse NEW" > > > * jc/deref-tag (2016-06-14) 1 commit > - blame, line-log: do not loop around deref_tag() > > Code clean-up. > > Will merge to 'next'. > > > * jk/fetch-prune-doc (2016-06-14) 1 commit > - fetch: document that pruning happens before fetching > > Will merge to 'next'. > > > * km/fetch-do-not-free-remote-name (2016-06-14) 1 commit > - builtin/fetch.c: don't free remote->name after fetch > > Will merge to 'next'. > > > * nb/gnome-keyring-build (2016-06-14) 1 commit > - gnome-keyring: Don't hard-code pkg-config executable > > Build improvements for gnome-keyring (in contrib/) > > Will merge to 'next'. > > > * pb/strbuf-read-file-doc (2016-06-14) 1 commit > - strbuf: describe the return value of strbuf_read_file > > Will merge to 'next'. > > -- > [Stalled] > > * sb/bisect (2016-04-15) 22 commits > - SQUASH??? > - bisect: get back halfway shortcut > - bisect: compute best bisection in compute_relevant_weights() > - bi
What's cooking in git.git (Jun 2016, #04; Tue, 14)
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. Git 2.9 has been tagged. Let's wait for a few days to clean up possible fallout and then start a new cycle by rewinding the tip of 'next'. I expect I'd eject a few premature topics out of 'next' while doing so. You can find the changes described here in the integration branches of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -- [Graduated to "master"] * jc/t2300-setup (2016-06-01) 1 commit (merged to 'next' on 2016-06-06 at 20f7f83) + t2300: run git-sh-setup in an environment that better mimics the real life (this branch is used by va/i18n-even-more.) A test fix. * jk/diff-compact-heuristic (2016-06-10) 1 commit - diff: disable compaction heuristic for now It turns out that the earlier effort to update the heuristics may want to use a bit more time to mature. Turn it off by default. * jk/shell-portability (2016-06-01) 2 commits (merged to 'next' on 2016-06-06 at 5de784e) + t5500 & t7403: lose bash-ism "local" + test-lib: add in-shell "env" replacement test fixes. -- [New Topics] * lv/status-say-working-tree-not-directory (2016-06-09) 1 commit - Use "working tree" instead of "working directory" for git status "git status" used to say "working directory" when it meant "working tree". Will merge to 'next'. * jk/parseopt-string-list (2016-06-13) 3 commits - blame,shortlog: don't make local option variables static - interpret-trailers: don't duplicate option strings - parse_opt_string_list: stop allocating new strings (this branch is used by jk/string-list-static-init.) The command line argument parsing that uses OPT_STRING_LIST() often made a copy of the argv[] element, which was unnecessary. Will merge to 'next'. * jk/repack-keep-unreachable (2016-06-14) 3 commits - repack: extend --keep-unreachable to loose objects - repack: add --keep-unreachable option - repack: document --unpack-unreachable option "git repack" learned the "--keep-unreachable" option, which sends loose unreachable objects to a pack instead of leaving them loose. This helps heuristics based on the number of loose objects (e.g. "gc --auto"). Will merge to 'next'. * lf/recv-sideband-cleanup (2016-06-13) 1 commit - sideband.c: refactor recv_sideband() Code simplification. It however loses the atomicity of the output 9ac13ec9 (atomic write for sideband remote messages, 2006-10-11) tried to add to an once-much-simpler codebase. Expecting a reroll. * nd/test-lib-httpd-show-error-log-in-verbose (2016-06-13) 1 commit - lib-httpd.sh: print error.log on error Debugging aid. Will merge to 'next'. * pc/occurred (2016-06-10) 2 commits - config.c: fix misspelt "occurred" in an error message - refs.h: fix misspelt "occurred" in a comment Will merge to 'next'. * sb/submodule-clone-retry (2016-06-13) 2 commits - submodule update: continue when a clone fails - submodule--helper: initial clone learns retry logic (this branch uses sb/submodule-recommend-shallowness.) "git submodule update" that drives many "git clone" could eventually hit flaky servers/network conditions on one of the submodules; the command learned to retry the attempt. * jc/blame-reverse (2016-06-14) 2 commits - blame: dwim "blame --reverse OLD" as "blame --reverse OLD.." - blame: improve diagnosis for "--reverse NEW" * jc/deref-tag (2016-06-14) 1 commit - blame, line-log: do not loop around deref_tag() Code clean-up. Will merge to 'next'. * jk/fetch-prune-doc (2016-06-14) 1 commit - fetch: document that pruning happens before fetching Will merge to 'next'. * km/fetch-do-not-free-remote-name (2016-06-14) 1 commit - builtin/fetch.c: don't free remote->name after fetch Will merge to 'next'. * nb/gnome-keyring-build (2016-06-14) 1 commit - gnome-keyring: Don't hard-code pkg-config executable Build improvements for gnome-keyring (in contrib/) Will merge to 'next'. * pb/strbuf-read-file-doc (2016-06-14) 1 commit - strbuf: describe the return value of strbuf_read_file Will merge to 'next'. -- [Stalled] * sb/bisect (2016-04-15) 22 commits - SQUASH??? - bisect: get back halfway shortcut - bisect: compute best bisection in compute_relevant_weights() - bisect: use a bottom-up traversal to find relevant weights - bisect: prepare for different algorithms based on find_all - bisect: rename count_distance() to compute_weight() - bisect: make total number of commits global - bisect: introduce distance_direction() - bisect: extract get_distance() function from code duplication - bisect: use commit instead of commit list as argu
