Re: What's cooking in git.git (Jun 2015, #06; Wed, 24)
What can I do to help un-stall my gitweb patches? [Stalled] * tf/gitweb-project-listing (2015-03-19) 5 commits - gitweb: make category headings into links when they are directories - gitweb: optionally set project category from its pathname - gitweb: add a link under the search box to clear a project filter - gitweb: if the PATH_INFO is incomplete, use it as a project_filter - gitweb: fix typo in man page Update gitweb to make it more pleasant to deal with a hierarchical forest of repositories. Any comments from those who use or have their own code in Gitweb? Tony. -- f.anthony.n.finch d...@dotat.at http://dotat.at/ South Utsire: Westerly 4, occasionally 5 in east. Smooth or slight, occasionally moderate in east. Fog patches later. Moderate, occasionally very poor later. -- 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 2015, #06; Wed, 24)
* js/rebase-i-clean-up-upon-continue-to-skip (2015-06-23) 2 commits - rebase -i: do not leave a CHERRY_PICK_HEAD file behind - t3404: demonstrate CHERRY_PICK_HEAD bug Abandoning an already applied change in git rebase -i with --continue left CHERRY_PICK_HEAD and confused later steps. Will merge to 'next'. I need a little tweak here: diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 7fd1330..f236128 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1228,7 +1228,7 @@ test_expect_success 'rebase --continue removes CHERRY_PICK_HEAD' ' git checkout -b commit-to-skip for double in X 3 1 do - seq 5 | sed s/$double// seq + test_seq 5 | sed s/$double// seq -- 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 2015, #06; Wed, 24)
Johannes Schindelin johannes.schinde...@gmx.de writes: - I *think* that the current `recreate_opt()` is fine, but if it is used more, we will have to quote the arguments to guard against spaces and quotes and whatnot I admit that that was the reaction I had when I saw it for the first time, until I realized how it is used. And this one I have to disagree. recreate-opt is used to munge a single argument, suitable to be placed into argv[] for execv() like thing---there is no need for shell quoting there. It is a job for the caller that gets its result to shell quote if it wants to pass the result to a shell. So I think this is fine as-is. - There is a loop for (; *argv; argv++) argv_array_push(array, *argv); which might want to be written as while (*argv) argv_array_push(array, *(argv)++); Yeah, the latter is certainly more readable, but I agree this is not a showstopper. I'd gladly take an incremental to update it, though ;-) Thanks, both. -- 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 2015, #06; Wed, 24)
Hi, On 2015-06-25 03:01, Stefan Beller wrote: * pt/pull-builtin (2015-06-18) 19 commits - pull: remove redirection to git-pull.sh - pull --rebase: error on no merge candidate cases - pull --rebase: exit early when the working directory is dirty - pull: configure --rebase via branch.name.rebase or pull.rebase - pull: teach git pull about --rebase - pull: set reflog message - pull: implement pulling into an unborn branch - pull: fast-forward working tree if head is updated - pull: check if in unresolved merge state - pull: support pull.ff config - pull: error on no merge candidates - pull: pass git-fetch's options to git-fetch - pull: pass git-merge's options to git-merge - pull: pass verbosity, --progress flags to fetch and merge - pull: implement fetch + merge - pull: implement skeletal builtin pull - argv-array: implement argv_array_pushv() - parse-options-cb: implement parse_opt_passthru_argv() - parse-options-cb: implement parse_opt_passthru() Reimplement 'git pull' in C. This is v4 ($gmane/271943). Comments from mentors and others? I think the series is good as is. I just had a fresh look. Some comments: - I *think* that the current `recreate_opt()` is fine, but if it is used more, we will have to quote the arguments to guard against spaces and quotes and whatnot - There is a loop for (; *argv; argv++) argv_array_push(array, *argv); which might want to be written as while (*argv) argv_array_push(array, *(argv)++); to conform better with Git's coding style, but this one is not crucial at all. Having said that, I really think this is impressive work, and not only the outcome. It is a real pleasure to have you, Paul! I vote for merging, too, Dscho -- 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 2015, #06; Wed, 24)
Hi Junio, On 2015-06-25 15:14, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: - I *think* that the current `recreate_opt()` is fine, but if it is used more, we will have to quote the arguments to guard against spaces and quotes and whatnot I admit that that was the reaction I had when I saw it for the first time, until I realized how it is used. And this one I have to disagree. recreate-opt is used to munge a single argument, suitable to be placed into argv[] for execv() like thing---there is no need for shell quoting there. It is a job for the caller that gets its result to shell quote if it wants to pass the result to a shell. Ah yes, no single command-line is constructed from those reconstructed options. So yes, you're right, all is good! Ciao, Dscho -- 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
What's cooking in git.git (Jun 2015, #06; Wed, 24)
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Some of the topics in flight have overlaps with each other and have been excluded from 'pu'; most notably, I think the remainder of bc/object-id needs to wait until the for-each-ref topic from Karthik settles and then rebased on it, or something. We will be in the pre-release freeze soonish, and the next cycle would reopen mid next month. In the meantime, let's shift the focus on making sure that what has already been merged to 'master' are good (i.e. regression hunting and fixes). 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] * af/tcsh-completion-noclobber (2015-06-09) 1 commit (merged to 'next' on 2015-06-16 at 621f205) + git-completion.tcsh: fix redirect with noclobber The tcsh completion writes a bash scriptlet but that would have failed for users with noclobber set. * es/configure-getdelim (2015-06-03) 2 commits (merged to 'next' on 2015-06-11 at cdead14) + configure: add getdelim() check + config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases Auto-detect availability of getdelim() that helps optimized version of strbuf_getwholeline(). * es/osx-header-pollutes-mask-macro (2015-06-03) 2 commits (merged to 'next' on 2015-06-11 at cd8c39e) + ewah: use less generic macro name + ewah/bitmap: silence warning about MASK macro redefinition * es/send-email-sendmail-alias (2015-06-01) 10 commits (merged to 'next' on 2015-06-11 at b5e310e) + send-email: further warn about unsupported sendmail aliases features + t9001: add sendmail aliases line continuation tests + t9001: refactor sendmail aliases test infrastructure + send-email: implement sendmail aliases line continuation support + send-email: simplify sendmail aliases comment and blank line recognizer + send-email: refactor sendmail aliases parser + send-email: fix style: cuddle 'elsif' and 'else' with closing brace + send-email: drop noise comments which merely repeat what code says + send-email: visually distinguish sendmail aliases parser warnings + send-email: further document missing sendmail aliases functionality git send-email learned to handle more forms of sendmail style aliases file. * es/utf8-stupid-compiler-workaround (2015-06-05) 1 commit (merged to 'next' on 2015-06-11 at dc0f2d2) + utf8: NO_ICONV: silence uninitialized variable warning A compilation workaround. * fk/doc-format-patch-vn (2015-06-10) 1 commit (merged to 'next' on 2015-06-16 at 9be3516) + doc: format-patch: fix typo Docfix. * jc/apply-reject-noop-hunk (2015-06-01) 1 commit (merged to 'next' on 2015-06-11 at 8063665) + apply: reject a hunk that does not do anything git apply cannot diagnose a patch corruption when the breakage is to mark the length of the hunk shorter than it really is on the hunk header line @@ -l,k +m,n @@; one special case it could is when the hunk becomes no-op (e.g. k == n == 2 for two-line context patch output), and it learned to do so for this special case. * jc/do-not-feed-tags-to-clear-commit-marks (2015-06-01) 1 commit (merged to 'next' on 2015-06-11 at 65b4308) + format-patch: do not feed tags to clear_commit_marks() git format-patch --ignore-if-upstream A..B did not like to be fed tags as boundary commits. * jc/ll-merge-expose-path (2015-06-04) 1 commit (merged to 'next' on 2015-06-11 at 5c5fe41) + ll-merge: pass the original path to external drivers Traditionally, external low-level 3-way merge drivers are expected to produce their results based solely on the contents of the three variants given in temporary files named by %O, %A and %B on their command line. Additionally allow them to look at the final path (given by %P). * jk/index-pack-reduce-recheck (2015-06-09) 1 commit (merged to 'next' on 2015-06-16 at ff83705) + index-pack: avoid excessive re-reading of pack directory Disable have we lost a race with competing repack? check while receiving a huge object transfer that runs index-pack. * jk/stash-require-clean-index (2015-06-15) 1 commit (merged to 'next' on 2015-06-16 at beb4883) + Revert stash: require a clean index to apply A hotfix for the topic already in 'master'. * js/sleep-without-select (2015-06-05) 4 commits (merged to 'next' on 2015-06-11 at 278edb1) + lockfile: wait using sleep_millisec() instead of select() + lockfile: convert retry timeout computations to millisecond + help.c: wrap wait-only poll() invocation in sleep_millisec() + lockfile: replace random() by rand() Portability fix. * ld/p4-changes-block-size (2015-06-10) 4 commits (merged to 'next' on 2015-06-16 at 09b7daa) + git-p4: fixing --changes-block-size handling + git-p4: add tests for non-numeric
Re: What's cooking in git.git (Jun 2015, #06; Wed, 24)
* pt/pull-builtin (2015-06-18) 19 commits - pull: remove redirection to git-pull.sh - pull --rebase: error on no merge candidate cases - pull --rebase: exit early when the working directory is dirty - pull: configure --rebase via branch.name.rebase or pull.rebase - pull: teach git pull about --rebase - pull: set reflog message - pull: implement pulling into an unborn branch - pull: fast-forward working tree if head is updated - pull: check if in unresolved merge state - pull: support pull.ff config - pull: error on no merge candidates - pull: pass git-fetch's options to git-fetch - pull: pass git-merge's options to git-merge - pull: pass verbosity, --progress flags to fetch and merge - pull: implement fetch + merge - pull: implement skeletal builtin pull - argv-array: implement argv_array_pushv() - parse-options-cb: implement parse_opt_passthru_argv() - parse-options-cb: implement parse_opt_passthru() Reimplement 'git pull' in C. This is v4 ($gmane/271943). Comments from mentors and others? I think the series is good as is. -- 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
