mirror of
https://github.com/git/git.git
synced 2026-01-21 22:37:17 +09:00
What's cooking (2013/02 #04)
This commit is contained in:
Junio C Hamano
parent
51faf25335
commit
f05cfe504b
@ -1,10 +1,10 @@
|
||||
To: git@vger.kernel.org
|
||||
Bcc: lwn@lwn.net
|
||||
Subject: What's cooking in git.git (Feb 2013, #03; Wed, 6)
|
||||
X-master-at: 2f19ada7f8a5bb768816cf7334f65ae0ab03c8a7
|
||||
X-next-at: 8bc64348c96661c4cb37542730b0df4dd12eb8c2
|
||||
Subject: What's cooking in git.git (Feb 2013, #04; Sat, 9)
|
||||
X-master-at: b3310b5e2f576ef807f90eab0e6e178b65bbfb55
|
||||
X-next-at: f4474081034ce8695a8a64dcf1a0414f6544ae2c
|
||||
|
||||
What's cooking in git.git (Feb 2013, #03; Wed, 6)
|
||||
What's cooking in git.git (Feb 2013, #04; Sat, 9)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with
|
||||
@ -22,99 +22,264 @@ repositories listed at
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* ft/transport-report-segv (2013-01-31) 1 commit
|
||||
(merged to 'next' on 2013-02-02 at 6c450a7)
|
||||
+ push: fix segfault when HEAD points nowhere
|
||||
* ab/gitweb-use-same-scheme (2013-01-28) 1 commit
|
||||
(merged to 'next' on 2013-02-02 at 7e4a108)
|
||||
+ gitweb: refer to picon/gravatar images over the same scheme
|
||||
|
||||
A failure to push due to non-ff while on an unborn branch
|
||||
dereferenced a NULL pointer when showing an error message.
|
||||
Avoid mixed contents on a page coming via http and https when
|
||||
gitweb is hosted on a https server.
|
||||
|
||||
|
||||
* jc/fake-ancestor-with-non-blobs (2013-01-31) 3 commits
|
||||
(merged to 'next' on 2013-02-02 at 86d457a)
|
||||
+ apply: diagnose incomplete submodule object name better
|
||||
+ apply: simplify build_fake_ancestor()
|
||||
+ git-am: record full index line in the patch used while rebasing
|
||||
(this branch is used by jc/extended-fake-ancestor-for-gitlink.)
|
||||
* ct/autoconf-htmldir (2013-02-02) 1 commit
|
||||
(merged to 'next' on 2013-02-05 at bba4f8c)
|
||||
+ Honor configure's htmldir switch
|
||||
|
||||
Rebasing the history of superproject with change in the submodule
|
||||
has been broken since v1.7.12.
|
||||
The autoconf subsystem passed --mandir down to generated
|
||||
config.mak.autogen but forgot to do the same for --htmldir.
|
||||
|
||||
|
||||
* jn/auto-depend-workaround-buggy-ccache (2013-02-01) 1 commit
|
||||
(merged to 'next' on 2013-02-02 at db5940a)
|
||||
+ Makefile: explicitly set target name for autogenerated dependencies
|
||||
* da/mergetool-docs (2013-02-02) 5 commits
|
||||
(merged to 'next' on 2013-02-03 at f822dcf)
|
||||
+ doc: generate a list of valid merge tools
|
||||
+ mergetool--lib: list user configured tools in '--tool-help'
|
||||
+ mergetool--lib: add functions for finding available tools
|
||||
+ mergetool--lib: improve the help text in guess_merge_tool()
|
||||
+ mergetool--lib: simplify command expressions
|
||||
(this branch uses jk/mergetool.)
|
||||
|
||||
An age-old workaround to prevent buggy versions of ccache from
|
||||
breaking the auto-generation of dependencies, which unfortunately
|
||||
is still relevant because some people use ancient distros.
|
||||
Build on top of the clean-up done by jk/mergetool and automatically
|
||||
generate the list of mergetool and difftool backends the build
|
||||
supports to be included in the documentation.
|
||||
|
||||
|
||||
* sb/gpg-plug-fd-leak (2013-01-31) 1 commit
|
||||
(merged to 'next' on 2013-02-02 at c271a31)
|
||||
+ gpg: close stderr once finished with it in verify_signed_buffer()
|
||||
* jc/combine-diff-many-parents (2013-02-05) 2 commits
|
||||
(merged to 'next' on 2013-02-05 at e382aa6)
|
||||
+ t4038: add tests for "diff --cc --raw <trees>"
|
||||
+ combine-diff: lift 32-way limit of combined diff
|
||||
|
||||
We forgot to close the file descriptor reading from "gpg" output,
|
||||
killing "git log --show-signature" on a long history.
|
||||
We used to have an arbitrary 32 limit for combined diff input,
|
||||
resulting in incorrect number of leading colons shown when showing
|
||||
the "--raw --cc" output.
|
||||
|
||||
|
||||
* ta/doc-no-small-caps (2013-02-01) 6 commits
|
||||
(merged to 'next' on 2013-02-02 at 77cbd0e)
|
||||
+ Documentation: StGit is the right spelling, not StGIT
|
||||
+ Documentation: describe the "repository" in repository-layout
|
||||
+ Documentation: add a description for 'gitfile' to glossary
|
||||
+ Documentation: do not use undefined terms git-dir and git-file
|
||||
+ Documentation: the name of the system is 'Git', not 'git'
|
||||
+ Documentation: avoid poor-man's small caps GIT
|
||||
* jk/apply-similaritly-parsing (2013-02-03) 1 commit
|
||||
(merged to 'next' on 2013-02-05 at ccf1c97)
|
||||
+ builtin/apply: tighten (dis)similarity index parsing
|
||||
|
||||
Update documentation to change "GIT" which was a poor-man's small
|
||||
caps to "Git". The latter was the intended spelling.
|
||||
Make sure the similarity value shown in the "apply --summary"
|
||||
output is sensible, even when the input had a bogus value.
|
||||
|
||||
Also change "git" spelled in all-lowercase to "Git" when it refers
|
||||
to the system as the whole or the concept it embodies, as opposed to
|
||||
the command the end users would type.
|
||||
|
||||
* jk/doc-makefile-cleanup (2013-02-01) 1 commit
|
||||
(merged to 'next' on 2013-02-02 at 86ff373)
|
||||
+ Documentation/Makefile: clean up MAN*_TXT lists
|
||||
|
||||
|
||||
* jk/mergetool (2013-01-28) 8 commits
|
||||
(merged to 'next' on 2013-02-03 at 2ff5dee)
|
||||
+ mergetools: simplify how we handle "vim" and "defaults"
|
||||
+ mergetool--lib: don't call "exit" in setup_tool
|
||||
+ mergetool--lib: improve show_tool_help() output
|
||||
+ mergetools/vim: remove redundant diff command
|
||||
+ git-difftool: use git-mergetool--lib for "--tool-help"
|
||||
+ git-mergetool: don't hardcode 'mergetool' in show_tool_help
|
||||
+ git-mergetool: remove redundant assignment
|
||||
+ git-mergetool: move show_tool_help to mergetool--lib
|
||||
(this branch is used by da/mergetool-docs.)
|
||||
|
||||
Cleans up mergetool/difftool combo.
|
||||
|
||||
|
||||
* jk/python-styles (2013-01-30) 1 commit
|
||||
(merged to 'next' on 2013-02-02 at 293edc1)
|
||||
+ CodingGuidelines: add Python coding guidelines
|
||||
|
||||
|
||||
* jk/remote-helpers-doc (2013-02-01) 1 commit
|
||||
(merged to 'next' on 2013-02-02 at ce1461a)
|
||||
+ Rename {git- => git}remote-helpers.txt
|
||||
|
||||
"git help remote-helpers" did not work; 'remote-helpers' is not
|
||||
a subcommand name but a concept, so its documentation should have
|
||||
been in gitremote-helpers, not git-remote-helpers.
|
||||
|
||||
|
||||
* mk/tcsh-complete-only-known-paths (2013-02-03) 1 commit
|
||||
(merged to 'next' on 2013-02-05 at 4409b08)
|
||||
+ completion: handle path completion and colon for tcsh script
|
||||
(this branch uses mp/complete-paths.)
|
||||
|
||||
Manlio's "complete with known paths only" update to completion
|
||||
scripts returns directory names without trailing slash to
|
||||
compensate the addition of '/' done by bash that reads from our
|
||||
completion result. tcsh completion code that reads from our
|
||||
internal completion result does not add '/', so let it ask our
|
||||
complletion code to keep the '/' at the end.
|
||||
|
||||
|
||||
* mp/complete-paths (2013-01-11) 1 commit
|
||||
(merged to 'next' on 2013-01-30 at 70e4f1a)
|
||||
+ git-completion.bash: add support for path completion
|
||||
(this branch is used by mk/tcsh-complete-only-known-paths.)
|
||||
|
||||
The completion script used to let the default completer to suggest
|
||||
pathnames, which gave too many irrelevant choices (e.g. "git add"
|
||||
would not want to add an unmodified path). Teach it to use a more
|
||||
git-aware logic to enumerate only relevant ones.
|
||||
|
||||
|
||||
* nd/branch-error-cases (2013-01-31) 6 commits
|
||||
(merged to 'next' on 2013-02-02 at cf5e745)
|
||||
+ branch: let branch filters imply --list
|
||||
+ docs: clarify git-branch --list behavior
|
||||
+ branch: mark more strings for translation
|
||||
+ Merge branch 'nd/edit-branch-desc-while-detached' into HEAD
|
||||
+ branch: give a more helpful message on redundant arguments
|
||||
+ branch: reject -D/-d without branch name
|
||||
|
||||
Fix various error messages and conditions in "git branch", e.g. we
|
||||
advertised "branch -d/-D" to remove one or more branches but actually
|
||||
implemented removal of zero or more branches---request to remove no
|
||||
branches was not rejected.
|
||||
|
||||
|
||||
* sb/gpg-i18n (2013-01-31) 1 commit
|
||||
(merged to 'next' on 2013-02-02 at 7a54574)
|
||||
+ gpg: allow translation of more error messages
|
||||
|
||||
|
||||
* sb/run-command-fd-error-reporting (2013-02-01) 1 commit
|
||||
(merged to 'next' on 2013-02-02 at be7e970)
|
||||
+ run-command: be more informative about what failed
|
||||
|
||||
|
||||
* ss/mergetools-tortoise (2013-02-01) 2 commits
|
||||
(merged to 'next' on 2013-02-03 at d306b83)
|
||||
+ mergetools: teach tortoisemerge to handle filenames with SP correctly
|
||||
+ mergetools: support TortoiseGitMerge
|
||||
|
||||
Update mergetools to work better with newer merge helper tortoise ships.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/extended-fake-ancestor-for-gitlink (2013-02-05) 1 commit
|
||||
- apply: verify submodule commit object name better
|
||||
* jc/fetch-raw-sha1 (2013-02-07) 4 commits
|
||||
- fetch: fetch objects by their exact SHA-1 object names
|
||||
- upload-pack: optionally allow fetching from the tips of hidden refs
|
||||
- fetch: use struct ref to represent refs to be fetched
|
||||
- parse_fetch_refspec(): clarify the codeflow a bit
|
||||
(this branch uses jc/hidden-refs.)
|
||||
|
||||
Instead of requiring the full 40-hex object names on the index
|
||||
line, we can read submodule commit object names from the textual
|
||||
diff when synthesizing a fake ancestore tree for "git am -3".
|
||||
Allows requests to fetch objects at any tip of refs (including
|
||||
hidden ones). It seems that there may be use cases even outside
|
||||
Gerrit (e.g. $gmane/215701).
|
||||
|
||||
|
||||
* jk/diff-graph-cleanup (2013-02-07) 6 commits
|
||||
- combine-diff.c: teach combined diffs about line prefix
|
||||
- diff.c: use diff_line_prefix() where applicable
|
||||
- diff: add diff_line_prefix function
|
||||
- diff.c: make constant string arguments const
|
||||
- diff: write prefix to the correct file
|
||||
- graph: output padding for merge subsequent parents
|
||||
|
||||
Refactors a lot of repetitive code sequence from the graph drawing
|
||||
code and adds it to the combined diff output.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* tz/credential-authinfo (2013-02-05) 1 commit
|
||||
- Add contrib/credentials/netrc with GPG support
|
||||
* mn/send-email-works-with-credential (2013-02-07) 5 commits
|
||||
- git-send-email: use git credential to obtain password
|
||||
- Git.pm: add interface for git credential command
|
||||
- Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe
|
||||
- Git.pm: fix example in command_close_bidi_pipe documentation
|
||||
- Git.pm: allow command_close_bidi_pipe to be called as method
|
||||
|
||||
A new read-only credential helper (in contrib/) to interact with
|
||||
the .netrc/.authinfo files. Hopefully mn/send-email-authinfo topic
|
||||
can rebuild on top of something like this.
|
||||
Hooks the credential system to send-email.
|
||||
|
||||
Waiting for further reviews.
|
||||
Expecting a reroll.
|
||||
$gmane/215752
|
||||
|
||||
|
||||
* jx/utf8-printf-width (2013-02-05) 1 commit
|
||||
- Add utf8_fprintf helper which returns correct columns
|
||||
* tz/perl-styles (2013-02-06) 1 commit
|
||||
(merged to 'next' on 2013-02-09 at c8cff17)
|
||||
+ Update CodingGuidelines for Perl
|
||||
|
||||
Use a new helper that prints a message and counts its display width
|
||||
to align the help messages parse-options produces.
|
||||
Add coding guidelines for writing Perl scripts for Git.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* al/mergetool-printf-fix (2013-02-08) 1 commit
|
||||
- git-mergetool: print filename when it contains %
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jk/error-const-return (2013-02-08) 1 commit
|
||||
- Use __VA_ARGS__ for all of error's arguments
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* mm/allow-contrib-build (2013-02-07) 2 commits
|
||||
- perl.mak: introduce $(GIT_ROOT_DIR) to allow inclusion from other directories
|
||||
- Makefile: extract perl-related rules to make them available from other dirs
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* mm/remote-mediawiki-build (2013-02-08) 2 commits
|
||||
- git-remote-mediawiki: use toplevel's Makefile
|
||||
- Makefile: make script-related rules usable from subdirectories
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* nd/branch-show-rebase-bisect-state (2013-02-08) 1 commit
|
||||
- branch: show rebase/bisect info when possible instead of "(no branch)"
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* nd/count-garbage (2013-02-08) 3 commits
|
||||
- count-objects: report how much disk space taken by garbage files
|
||||
- count-objects: report garbage files in pack directory too
|
||||
- git-count-objects.txt: describe each line in -v output
|
||||
|
||||
Expecting a reroll.
|
||||
$gmane/215843
|
||||
|
||||
|
||||
* wk/gc-auto-is-available-these-days (2013-02-08) 1 commit
|
||||
- user-manual: Rewrite git-gc section for automatic packing
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* wk/man-deny-current-branch-is-default-these-days (2013-02-08) 1 commit
|
||||
- user-manual: Update for receive.denyCurrentBranch=refuse
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* bw/get-tz-offset-perl (2013-02-09) 3 commits
|
||||
- cvsimport: format commit timestamp ourselves without using strftime
|
||||
- perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases
|
||||
- Move Git::SVN::get_tz to Git::get_tz_offset
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* mg/bisect-doc (2013-02-09) 1 commit
|
||||
- git-bisect.txt: clarify that reset finishes bisect
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* mn/send-email-authinfo (2013-01-29) 1 commit
|
||||
- git-send-email: add ~/.authinfo parsing
|
||||
|
||||
This triggered a subtopic to add a credential helper for
|
||||
authinfo/netrc files (with or without GPG encryption), but nobody
|
||||
seems to be working on connecting send-email to the credential
|
||||
framework.
|
||||
|
||||
|
||||
* mp/diff-algo-config (2013-01-16) 3 commits
|
||||
- diff: Introduce --diff-algorithm command line option
|
||||
- config: Introduce diff.algorithm variable
|
||||
@ -251,22 +416,54 @@ repositories listed at
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* jc/extended-fake-ancestor-for-gitlink (2013-02-05) 1 commit
|
||||
(merged to 'next' on 2013-02-09 at 2d3547b)
|
||||
+ apply: verify submodule commit object name better
|
||||
|
||||
Instead of requiring the full 40-hex object names on the index
|
||||
line, we can read submodule commit object names from the textual
|
||||
diff when synthesizing a fake ancestore tree for "git am -3".
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* tz/credential-authinfo (2013-02-05) 1 commit
|
||||
- Add contrib/credentials/netrc with GPG support
|
||||
|
||||
A new read-only credential helper (in contrib/) to interact with
|
||||
the .netrc/.authinfo files. Hopefully mn/send-email-authinfo topic
|
||||
can rebuild on top of something like this.
|
||||
|
||||
Expecting a reroll.
|
||||
$gmane/215556
|
||||
|
||||
|
||||
* jx/utf8-printf-width (2013-02-09) 1 commit
|
||||
- Add utf8_fprintf helper that returns correct number of columns
|
||||
|
||||
Use a new helper that prints a message and counts its display width
|
||||
to align the help messages parse-options produces.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* dg/subtree-fixes (2013-02-05) 6 commits
|
||||
- contrib/subtree: make the manual directory if needed
|
||||
- contrib/subtree: honor DESTDIR
|
||||
- contrib/subtree: fix synopsis
|
||||
- contrib/subtree: better error handling for 'subtree add'
|
||||
- contrib/subtree: use %B for split subject/body
|
||||
- contrib/subtree: remove test number comments
|
||||
(merged to 'next' on 2013-02-09 at 8f19ebe)
|
||||
+ contrib/subtree: make the manual directory if needed
|
||||
+ contrib/subtree: honor DESTDIR
|
||||
+ contrib/subtree: fix synopsis
|
||||
+ contrib/subtree: better error handling for 'subtree add'
|
||||
+ contrib/subtree: use %B for split subject/body
|
||||
+ contrib/subtree: remove test number comments
|
||||
|
||||
contrib/subtree updates, but here are only the ones that looked
|
||||
ready to be merged to 'next'. For the remainder, they will have
|
||||
another day.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jl/submodule-deinit (2013-02-04) 1 commit
|
||||
* jl/submodule-deinit (2013-02-06) 1 commit
|
||||
- submodule: add 'deinit' command
|
||||
|
||||
There was no Porcelain way to say "I no longer am interested in
|
||||
@ -276,45 +473,9 @@ repositories listed at
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* ct/autoconf-htmldir (2013-02-02) 1 commit
|
||||
(merged to 'next' on 2013-02-05 at bba4f8c)
|
||||
+ Honor configure's htmldir switch
|
||||
|
||||
The autoconf subsystem passed --mandir down to generated
|
||||
config.mak.autogen but forgot to do the same for --htmldir.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* mk/tcsh-complete-only-known-paths (2013-02-03) 1 commit
|
||||
(merged to 'next' on 2013-02-05 at 4409b08)
|
||||
+ completion: handle path completion and colon for tcsh script
|
||||
(this branch uses mp/complete-paths.)
|
||||
|
||||
Manlio's "complete with known paths only" update to completion
|
||||
scripts returns directory names without trailing slash to
|
||||
compensate the addition of '/' done by bash that reads from our
|
||||
completion result. tcsh completion code that reads from our
|
||||
internal completion result does not add '/', so let it ask our
|
||||
complletion code to keep the '/' at the end.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/combine-diff-many-parents (2013-02-05) 2 commits
|
||||
(merged to 'next' on 2013-02-05 at e382aa6)
|
||||
+ t4038: add tests for "diff --cc --raw <trees>"
|
||||
+ combine-diff: lift 32-way limit of combined diff
|
||||
|
||||
We used to have an arbitrary 32 limit for combined diff input,
|
||||
resulting in incorrect number of leading colons shown when showing
|
||||
the "--raw --cc" output.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/remove-export-from-config-mak-in (2013-02-03) 1 commit
|
||||
- config.mak.in: remove unused definitions
|
||||
(merged to 'next' on 2013-02-07 at 33f7d4f)
|
||||
+ config.mak.in: remove unused definitions
|
||||
|
||||
config.mak.in template had an "export" line to cause a few
|
||||
common makefile variables to be exported; if they need to be
|
||||
@ -323,47 +484,12 @@ repositories listed at
|
||||
the main Makefile.
|
||||
|
||||
|
||||
* jk/apply-similaritly-parsing (2013-02-03) 1 commit
|
||||
(merged to 'next' on 2013-02-05 at ccf1c97)
|
||||
+ builtin/apply: tighten (dis)similarity index parsing
|
||||
|
||||
Make sure the similarity value shown in the "apply --summary"
|
||||
output is sensible, even when the input had a bogus value.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* nd/status-show-in-progress (2013-02-05) 1 commit
|
||||
- status: show the branch name if possible in in-progress info
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* sb/gpg-i18n (2013-01-31) 1 commit
|
||||
(merged to 'next' on 2013-02-02 at 7a54574)
|
||||
+ gpg: allow translation of more error messages
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* sb/run-command-fd-error-reporting (2013-02-01) 1 commit
|
||||
(merged to 'next' on 2013-02-02 at be7e970)
|
||||
+ run-command: be more informative about what failed
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jk/remote-helpers-doc (2013-02-01) 1 commit
|
||||
(merged to 'next' on 2013-02-02 at ce1461a)
|
||||
+ Rename {git- => git}remote-helpers.txt
|
||||
|
||||
"git help remote-helpers" did not work; 'remote-helpers' is not
|
||||
a subcommand name but a concept, so its documentation should have
|
||||
been in gitremote-helpers, not git-remote-helpers.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* sp/smart-http-content-type-check (2013-02-06) 3 commits
|
||||
(merged to 'next' on 2013-02-06 at 8bc6434)
|
||||
+ http_request: reset "type" strbuf before adding
|
||||
@ -376,6 +502,8 @@ repositories listed at
|
||||
back from the server side to make sure that the request is being
|
||||
handled properly.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/mention-tracking-for-pull-default (2013-01-31) 1 commit
|
||||
- doc: mention tracking for pull.default
|
||||
@ -391,124 +519,16 @@ repositories listed at
|
||||
Waiting for couter-proposal patches.
|
||||
|
||||
|
||||
* jk/doc-makefile-cleanup (2013-02-01) 1 commit
|
||||
(merged to 'next' on 2013-02-02 at 86ff373)
|
||||
+ Documentation/Makefile: clean up MAN*_TXT lists
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ab/gitweb-use-same-scheme (2013-01-28) 1 commit
|
||||
(merged to 'next' on 2013-02-02 at 7e4a108)
|
||||
+ gitweb: refer to picon/gravatar images over the same scheme
|
||||
|
||||
Avoid mixed contents on a page coming via http and https when
|
||||
gitweb is hosted on a https server.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jk/python-styles (2013-01-30) 1 commit
|
||||
(merged to 'next' on 2013-02-02 at 293edc1)
|
||||
+ CodingGuidelines: add Python coding guidelines
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* mp/complete-paths (2013-01-11) 1 commit
|
||||
(merged to 'next' on 2013-01-30 at 70e4f1a)
|
||||
+ git-completion.bash: add support for path completion
|
||||
(this branch is used by mk/tcsh-complete-only-known-paths.)
|
||||
|
||||
The completion script used to let the default completer to suggest
|
||||
pathnames, which gave too many irrelevant choices (e.g. "git add"
|
||||
would not want to add an unmodified path). Teach it to use a more
|
||||
git-aware logic to enumerate only relevant ones.
|
||||
|
||||
This is logically the right thing to do, and we would really love
|
||||
to see people who have been involved in completion code to review
|
||||
and comment on the implementation.
|
||||
|
||||
Will cook in 'next' to see if anybody screams.
|
||||
|
||||
|
||||
* ss/mergetools-tortoise (2013-02-01) 2 commits
|
||||
(merged to 'next' on 2013-02-03 at d306b83)
|
||||
+ mergetools: teach tortoisemerge to handle filenames with SP correctly
|
||||
+ mergetools: support TortoiseGitMerge
|
||||
|
||||
Update mergetools to work better with newer merge helper tortoise ships.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* da/mergetool-docs (2013-02-02) 5 commits
|
||||
(merged to 'next' on 2013-02-03 at f822dcf)
|
||||
+ doc: generate a list of valid merge tools
|
||||
+ mergetool--lib: list user configured tools in '--tool-help'
|
||||
+ mergetool--lib: add functions for finding available tools
|
||||
+ mergetool--lib: improve the help text in guess_merge_tool()
|
||||
+ mergetool--lib: simplify command expressions
|
||||
(this branch uses jk/mergetool.)
|
||||
|
||||
Build on top of the clean-up done by jk/mergetool and automatically
|
||||
generate the list of mergetool and difftool backends the build
|
||||
supports to be included in the documentation.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* nd/branch-error-cases (2013-01-31) 6 commits
|
||||
(merged to 'next' on 2013-02-02 at cf5e745)
|
||||
+ branch: let branch filters imply --list
|
||||
+ docs: clarify git-branch --list behavior
|
||||
+ branch: mark more strings for translation
|
||||
+ Merge branch 'nd/edit-branch-desc-while-detached' into HEAD
|
||||
+ branch: give a more helpful message on redundant arguments
|
||||
+ branch: reject -D/-d without branch name
|
||||
|
||||
Fix various error messages and conditions in "git branch", e.g. we
|
||||
advertised "branch -d/-D" to remove one or more branches but actually
|
||||
implemented removal of zero or more branches---request to remove no
|
||||
branches was not rejected.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jk/mergetool (2013-01-28) 8 commits
|
||||
(merged to 'next' on 2013-02-03 at 2ff5dee)
|
||||
+ mergetools: simplify how we handle "vim" and "defaults"
|
||||
+ mergetool--lib: don't call "exit" in setup_tool
|
||||
+ mergetool--lib: improve show_tool_help() output
|
||||
+ mergetools/vim: remove redundant diff command
|
||||
+ git-difftool: use git-mergetool--lib for "--tool-help"
|
||||
+ git-mergetool: don't hardcode 'mergetool' in show_tool_help
|
||||
+ git-mergetool: remove redundant assignment
|
||||
+ git-mergetool: move show_tool_help to mergetool--lib
|
||||
(this branch is used by da/mergetool-docs.)
|
||||
|
||||
Cleans up mergetool/difftool combo.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/hidden-refs (2013-01-30) 7 commits
|
||||
- fetch: fetch objects by their exact SHA-1 object names
|
||||
- upload-pack: optionally allow fetching from the tips of hidden refs
|
||||
- fetch: use struct ref to represent refs to be fetched
|
||||
- parse_fetch_refspec(): clarify the codeflow a bit
|
||||
* jc/hidden-refs (2013-02-07) 3 commits
|
||||
- upload/receive-pack: allow hiding ref hierarchies
|
||||
- upload-pack: simplify request validation
|
||||
- upload-pack: share more code
|
||||
(this branch is used by jc/fetch-raw-sha1.)
|
||||
|
||||
Allow the server side to unclutter the refs/ namespace it shows to
|
||||
the client. Optionally allow requests for histories leading to the
|
||||
tips of hidden refs by updated clients.
|
||||
Allow the server side to redact the refs/ namespace it shows to the
|
||||
client.
|
||||
|
||||
Need to split the configuration into three (one for sending, one
|
||||
for receiving, and then another to cover both for convenience)
|
||||
before this topic can go forward. Perhaps people involved in the
|
||||
review cycle can help.
|
||||
I think this is ready for 'next'.
|
||||
|
||||
|
||||
* jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit
|
||||
@ -562,3 +582,14 @@ repositories listed at
|
||||
|
||||
Waiting for the final round of reroll before merging to 'next'.
|
||||
After that we will go incremental.
|
||||
|
||||
--------------------------------------------------
|
||||
[Discarded]
|
||||
|
||||
* mn/send-email-authinfo (2013-01-29) 1 commit
|
||||
. git-send-email: add ~/.authinfo parsing
|
||||
|
||||
Instead of making send-email directly read from .netrc/.authinfo,
|
||||
mn/send-email-works-with-credential topic hooks the program to our
|
||||
credential framework, and tz/credential-authinfo topic gives access
|
||||
to these file formats to credential consumers.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user