* [ANNOUNCE] Git v2.10.0
@ 2016-09-03 2:17 3% Junio C Hamano
0 siblings, 0 replies; 22+ results
From: Junio C Hamano @ 2016-09-03 2:17 UTC (permalink / raw
To: git; +Cc: Linux Kernel
The latest feature release Git v2.10.0 is now available at the
usual places. It is comprised of 639 non-merge commits since
v2.9.0, contributed by 76 people, 22 of which are new faces.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the 'v2.10.0'
tag and the 'master' branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.9.0 are as follows.
Welcome to the Git development community!
Alexander Hirsch, Andreas Brauchli, Andrew Oakley, Antoine Queru,
Ben Wijen, Christopher Layne, Dave Nicolson, David Glasser, Ed
Maste, Heiko Becker, Ingo Brückl, Jonathan Tan, Jordan DE GEA,
Josef Kufner, Keith McGuigan, Kevin Willford, LE Manh Cuong,
Michael Stahl, Parker Moore, Peter Colberg, Tom Russello,
and William Duclot.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Alex Henrie, Alfred Perlstein, Armin Kunaschik, brian m. carlson,
Changwoo Ryu, Charles Bailey, Chris Packham, Christian Couder,
David A. Greene, David Aguilar, David Kastrup, David Turner,
Edward Thomson, Elia Pinto, Eric Sunshine, Eric Wong, Heiko
Voigt, Jacob Keller, Jean-Noel Avila, Jeff King, Jiang Xin,
Joey Hess, Johannes Schindelin, Johannes Sixt, John Keeping,
Jonathan Nieder, Josh Triplett, Junio C Hamano, Lars Schneider,
Lars Vogel, Linus Torvalds, Lukas Fleischer, Matthieu Moy,
Mehul Jain, Michael Haggerty, Michael J Gruber, Mike Hommey,
Nguyễn Thái Ngọc Duy, Nicolas Pitre, Orgad Shaneh, Patrick
Steinhardt, Peter Krefting, Pranit Bauva, Ramsay Jones, René
Scharfe, Ronald Wampler, Stefan Beller, SZEDER Gábor, Thomas
Braun, Thomas Gummerer, Torsten Bögershausen, Trần Ngọc
Quân, Vasco Almeida, and Ville Skyttä.
----------------------------------------------------------------
Git 2.10 Release Notes
======================
Backward compatibility notes
----------------------------
Updates since v2.9
------------------
UI, Workflows & Features
* "git pull --rebase --verify-signature" learned to warn the user
that "--verify-signature" is a no-op when rebasing.
* An upstream project can make a recommendation to shallowly clone
some submodules in the .gitmodules file it ships.
* "git worktree add" learned that '-' can be used as a short-hand for
"@{-1}", the previous branch.
* Update the funcname definition to support css files.
* The completion script (in contrib/) learned to complete "git
status" options.
* Messages that are generated by auto gc during "git push" on the
receiving end are now passed back to the sending end in such a way
that they are shown with "remote: " prefix to avoid confusing the
users.
* "git add -i/-p" learned to honor diff.compactionHeuristic
experimental knob, so that the user can work on the same hunk split
as "git diff" output.
* "upload-pack" allows a custom "git pack-objects" replacement when
responding to "fetch/clone" via the uploadpack.packObjectsHook.
(merge b738396 jk/upload-pack-hook later to maint).
* Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
(merge d9925d1 ew/mboxrd-format-am later to maint).
* "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").
(merge e26a8c4 jk/repack-keep-unreachable later to maint).
* "log --graph --format=" learned that "%>|(N)" specifies the width
relative to the terminal's left edge, not relative to the area to
draw text that is to the right of the ancestry-graph section. It
also now accepts negative N that means the column limit is relative
to the right border.
* A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
(merge 531220b jc/send-email-skip-backup later to maint).
* "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.
* The output coloring scheme learned two new attributes, italic and
strike, in addition to existing bold, reverse, etc.
* "git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
(merge fce04c3 mj/log-show-signature-conf later to maint).
* More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
* "git archive" learned to handle files that are larger than 8GB and
commits far in the future than expressible by the traditional US-TAR
format.
(merge 560b0e8 jk/big-and-future-archive-tar later to maint).
* A new configuration variable core.sshCommand has been added to
specify what value for GIT_SSH_COMMAND to use per repository.
* "git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location. "git worktree"
command learned a dedicated command pair to create and remove such
a file, so that the users do not have to do this with editor.
* A handful of "git svn" updates.
* "git push" learned to accept and pass extra options to the
receiving end so that hooks can read and react to them.
* "git status" learned to suggest "merge --abort" during a conflicted
merge, just like it already suggests "rebase --abort" during a
conflicted rebase.
* "git jump" script (in contrib/) has been updated a bit.
(merge a91e692 jk/git-jump later to maint).
* "git push" and "git clone" learned to give better progress meters
to the end user who is waiting on the terminal.
* An entry "git log --decorate" for the tip of the current branch is
shown as "HEAD -> name" (where "name" is the name of the branch);
the arrow is now painted in the same color as "HEAD", not in the
color for commits.
* "git format-patch" learned format.from configuration variable to
specify the default settings for its "--from" option.
* "git am -3" calls "git merge-recursive" when it needs to fall back
to a three-way merge; this call has been turned into an internal
subroutine call instead of spawning a separate subprocess.
* The command line completion scripts (in contrib/) now knows about
"git branch --delete/--move [--remote]".
(merge 2703c22 vs/completion-branch-fully-spelled-d-m-r later to maint).
* "git rev-parse --git-path hooks/<hook>" learned to take
core.hooksPath configuration variable (introduced during 2.9 cycle)
into account.
(merge 9445b49 ab/hooks later to maint).
* "git log --show-signature" and other commands that display the
verification status of PGP signature now shows the longer key-id,
as 32-bit key-id is so last century.
Performance, Internal Implementation, Development Support etc.
* "git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
* When "git daemon" is run without --[init-]timeout specified, a
connection from a client that silently goes offline can hang around
for a long time, wasting resources. The socket-level KEEPALIVE has
been enabled to allow the OS to notice such failed connections.
* "git upload-pack" command has been updated to use the parse-options
API.
* The "git apply" standalone program is being libified; the first
step to move many state variables into a structure that can be
explicitly (re)initialized to make the machinery callable more
than once has been merged.
* HTTP transport gained an option to produce more detailed debugging
trace.
(merge 73e57aa ep/http-curl-trace later to maint).
* Instead of taking advantage of the fact that a struct string_list
that is allocated with all NULs happens to be the INIT_NODUP kind,
the users of string_list structures are taught to initialize them
explicitly as such, to document their behaviour better.
(merge 2721ce2 jk/string-list-static-init later to maint).
* HTTPd tests learned to show the server error log to help diagnosing
a failing tests.
(merge 44f243d nd/test-lib-httpd-show-error-log-in-verbose later to maint).
* The ownership rule for the piece of memory that hold references to
be fetched in "git fetch" was screwy, which has been cleaned up.
* "git bisect" makes an internal call to "git diff-tree" when
bisection finds the culprit, but this call did not initialize the
data structure to pass to the diff-tree API correctly.
* Further preparatory clean-up for "worktree" feature continues.
(merge 0409e0b nd/worktree-cleanup-post-head-protection later to maint).
* Formats of the various data (and how to validate them) where we use
GPG signature have been documented.
* A new run-command API function pipe_command() is introduced to
sanely feed data to the standard input while capturing data from
the standard output and the standard error of an external process,
which is cumbersome to hand-roll correctly without deadlocking.
* The codepath to sign data in a prepared buffer with GPG has been
updated to use this API to read from the status-fd to check for
errors (instead of relying on GPG's exit status).
(merge efee955 jk/gpg-interface-cleanup later to maint).
* Allow t/perf framework to use the features from the most recent
version of Git even when testing an older installed version.
* The commands in the "log/diff" family have had an FILE* pointer in the
data structure they pass around for a long time, but some codepaths
used to always write to the standard output. As a preparatory step
to make "git format-patch" available to the internal callers, these
codepaths have been updated to consistently write into that FILE*
instead.
* Conversion from unsigned char sha1[20] to struct object_id
continues.
* Improve the look of the way "git fetch" reports what happened to
each ref that was fetched.
* The .c/.h sources are marked as such in our .gitattributes file so
that "git diff -W" and friends would work better.
* Code clean-up to avoid using a variable string that compilers may
feel untrustable as printf-style format given to write_file()
helper function.
* "git p4" used a location outside $GIT_DIR/refs/ to place its
temporary branches, which has been moved to refs/git-p4-tmp/.
* Existing autoconf generated test for the need to link with pthread
library did not check all the functions from pthread libraries;
recent FreeBSD has some functions in libc but not others, and we
mistakenly thought linking with libc is enough when it is not.
* When "git fsck" reports a broken link (e.g. a tree object contains
a blob that does not exist), both containing object and the object
that is referred to were reported with their 40-hex object names.
The command learned the "--name-objects" option to show the path to
the containing object from existing refs (e.g. "HEAD~24^2:file.txt").
* Allow http daemon tests in Travis CI tests.
* Makefile assumed that -lrt is always available on platforms that
want to use clock_gettime() and CLOCK_MONOTONIC, which is not a
case for recent Mac OS X. The necessary symbols are often found in
libc on many modern systems and having -lrt on the command line, as
long as the library exists, had no effect, but when the platform
removes librt.a that is a different matter--having -lrt will break
the linkage.
This change could be seen as a regression for those who do need to
specify -lrt, as they now specifically ask for NEEDS_LIBRT when
building. Hopefully they are in the minority these days.
* Further preparatory work on the refs API before the pluggable
backend series can land.
* Error handling in the codepaths that updates refs has been
improved.
* The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
* The handling of the "text=auto" attribute has been corrected.
$ echo "* text=auto eol=crlf" >.gitattributes
used to have the same effect as
$ echo "* text eol=crlf" >.gitattributes
i.e. declaring all files are text (ignoring "auto"). The
combination has been fixed to be equivalent to doing
$ git config core.autocrlf true
* Documentation has been updated to show better example usage
of the updated "text=auto" attribute.
* A few tests that specifically target "git rebase -i" have been
added.
* Dumb http transport on the client side has been optimized.
(merge ecba195 ew/http-walker later to maint).
* Users of the parse_options_concat() API function need to allocate
extra slots in advance and fill them with OPT_END() when they want
to decide the set of supported options dynamically, which makes the
code error-prone and hard to read. This has been corrected by tweaking
the API to allocate and return a new copy of "struct option" array.
* "git fetch" exchanges batched have/ack messages between the sender
and the receiver, initially doubling every time and then falling
back to enlarge the window size linearly. The "smart http"
transport, being an half-duplex protocol, outgrows the preset limit
too quickly and becomes inefficient when interacting with a large
repository. The internal mechanism learned to grow the window size
more aggressively when working with the "smart http" transport.
* Tests for "git svn" have been taught to reuse the lib-httpd test
infrastructure when testing the subversion integration that
interacts with subversion repositories served over the http://
protocol.
(merge a8a5d25 ew/git-svn-http-tests later to maint).
* "git pack-objects" has a few options that tell it not to pack
objects found in certain packfiles, which require it to scan .idx
files of all available packs. The codepaths involved in these
operations have been optimized for a common case of not having any
non-local pack and/or any .kept pack.
* The t3700 test about "add --chmod=-x" have been made a bit more
robust and generally cleaned up.
(merge 766cdc4 ib/t3700-add-chmod-x-updates later to maint).
* The build procedure learned PAGER_ENV knob that lists what default
environment variable settings to export for popular pagers. This
mechanism is used to tweak the default settings to MORE on FreeBSD.
(merge 995bc22 ew/build-time-pager-tweaks later to maint).
* The http-backend (the server-side component of smart-http
transport) used to trickle the HTTP header one at a time. Now
these write(2)s are batched.
(merge b36045c ew/http-backend-batch-headers later to maint).
* When "git rebase" tries to compare set of changes on the updated
upstream and our own branch, it computes patch-id for all of these
changes and attempts to find matches. This has been optimized by
lazily computing the full patch-id (which is expensive) to be
compared only for changes that touch the same set of paths.
(merge ba67504 kw/patch-ids-optim later to maint).
* A handful of tests that were broken under gettext-poison build have
been fixed.
* The recent i18n patch we added during this cycle did a bit too much
refactoring of the messages to avoid word-legos; the repetition has
been reduced to help translators.
Also contains various documentation updates and code clean-ups.
Fixes since v2.9
----------------
Unless otherwise noted, all the fixes since v2.8 in the maintenance
track are contained in this release (see the maintenance releases'
notes for details).
* The commands in `git log` family take %C(auto) in a custom format
string. This unconditionally turned the color on, ignoring
--no-color or with --color=auto when the output is not connected to
a tty; this was corrected to make the format truly behave as
"auto".
* "git rev-list --count" whose walk-length is limited with "-n"
option did not work well with the counting optimized to look at the
bitmap index.
* "git show -W" (extend hunks to cover the entire function, delimited
by lines that match the "funcname" pattern) used to show the entire
file when a change added an entire function at the end of the file,
which has been fixed.
* The documentation set has been updated so that literal commands,
configuration variables and environment variables are consistently
typeset in fixed-width font and bold in manpages.
* "git svn propset" subcommand that was added in 2.3 days is
documented now.
* The documentation tries to consistently spell "GPG"; when
referring to the specific program name, "gpg" is used.
* "git reflog" stopped upon seeing an entry that denotes a branch
creation event (aka "unborn"), which made it appear as if the
reflog was truncated.
* The git-prompt scriptlet (in contrib/) was not friendly with those
who uses "set -u", which has been fixed.
* compat/regex code did not cleanly compile.
* A codepath that used alloca(3) to place an unbounded amount of data
on the stack has been updated to avoid doing so.
* "git update-index --add --chmod=+x file" may be usable as an escape
hatch, but not a friendly thing to force for people who do need to
use it regularly. "git add --chmod=+x file" can be used instead.
* Build improvements for gnome-keyring (in contrib/)
* "git status" used to say "working directory" when it meant "working
tree".
* Comments about misbehaving FreeBSD shells have been clarified with
the version number (9.x and before are broken, newer ones are OK).
* "git cherry-pick A" worked on an unborn branch, but "git
cherry-pick A..B" didn't.
* Fix an unintended regression in v2.9 that breaks "clone --depth"
that recurses down to submodules by forcing the submodules to also
be cloned shallowly, which many server instances that host upstream
of the submodules are not prepared for.
* Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
to set the default value, without enclosing it in double quotes.
* Some platform-specific code had non-ANSI strict declarations of C
functions that do not take any parameters, which has been
corrected.
* The internal code used to show local timezone offset is not
prepared to handle timestamps beyond year 2100, and gave a
bogus offset value to the caller. Use a more benign looking
+0000 instead and let "git log" going in such a case, instead
of aborting.
* One among four invocations of readlink(1) in our test suite has
been rewritten so that the test can run on systems without the
command (others are in valgrind test framework and t9802).
* t/perf needs /usr/bin/time with GNU extension; the invocation of it
is updated to "gtime" on Darwin.
* A bug, which caused "git p4" while running under verbose mode to
report paths that are omitted due to branch prefix incorrectly, has
been fixed; the command said "Ignoring file outside of prefix" for
paths that are _inside_.
* The top level documentation "git help git" still pointed at the
documentation set hosted at now-defunct google-code repository.
Update it to point to https://git.github.io/htmldocs/git.html
instead.
* A helper function that takes the contents of a commit object and
finds its subject line did not ignore leading blank lines, as is
commonly done by other codepaths. Make it ignore leading blank
lines to match.
* For a long time, we carried an in-code comment that said our
colored output would work only when we use fprintf/fputs on
Windows, which no longer is the case for the past few years.
* "gc.autoPackLimit" when set to 1 should not trigger a repacking
when there is only one pack, but the code counted poorly and did
so.
* Add a test to specify the desired behaviour that currently is not
available in "git rebase -Xsubtree=...".
* More mark-up updates to typeset strings that are expected to
literally typed by the end user in fixed-width font.
* "git commit --amend --allow-empty-message -S" for a commit without
any message body could have misidentified where the header of the
commit object ends.
* "git rebase -i --autostash" did not restore the auto-stashed change
when the operation was aborted.
* Git does not know what the contents in the index should be for a
path added with "git add -N" yet, so "git grep --cached" should not
show hits (or show lack of hits, with -L) in such a path, but that
logic does not apply to "git grep", i.e. searching in the working
tree files. But we did so by mistake, which has been corrected.
* "git blame -M" missed a single line that was moved within the file.
* Fix recently introduced codepaths that are involved in parallel
submodule operations, which gave up on reading too early, and
could have wasted CPU while attempting to write under a corner
case condition.
* "git grep -i" has been taught to fold case in non-ascii locales
correctly.
* A test that unconditionally used "mktemp" learned that the command
is not necessarily available everywhere.
* There are certain house-keeping tasks that need to be performed at
the very beginning of any Git program, and programs that are not
built-in commands had to do them exactly the same way as "git"
potty does. It was easy to make mistakes in one-off standalone
programs (like test helpers). A common "main()" function that
calls cmd_main() of individual program has been introduced to
make it harder to make mistakes.
(merge de61ceb jk/common-main later to maint).
* The test framework learned a new helper test_match_signal to
check an exit code from getting killed by an expected signal.
* General code clean-up around a helper function to write a
single-liner to a file.
(merge 7eb6e10 jk/write-file later to maint).
* One part of "git am" had an oddball helper function that called
stuff from outside "his" as opposed to calling what we have "ours",
which was not gender-neutral and also inconsistent with the rest of
the system where outside stuff is usuall called "theirs" in
contrast to "ours".
* "git blame file" allowed the lineage of lines in the uncommitted,
unadded contents of "file" to be inspected, but it refused when
"file" did not appear in the current commit. When "file" was
created by renaming an existing file (but the change has not been
committed), this restriction was unnecessarily tight.
* "git add -N dir/file && git write-tree" produced an incorrect tree
when there are other paths in the same directory that sorts after
"file".
* "git fetch http://user:pass@host/repo..." scrubbed the userinfo
part, but "git push" didn't.
* "git merge" with renormalization did not work well with
merge-recursive, due to "safer crlf" conversion kicking in when it
shouldn't.
(merge 1335d76 jc/renormalize-merge-kill-safer-crlf later to maint).
* The use of strbuf in "git rm" to build filename to remove was a bit
suboptimal, which has been fixed.
* An age old bug that caused "git diff --ignore-space-at-eol"
misbehave has been fixed.
* "git notes merge" had a code to see if a path exists (and fails if
it does) and then open the path for writing (when it doesn't).
Replace it with open with O_EXCL.
* "git pack-objects" and "git index-pack" mostly operate with off_t
when talking about the offset of objects in a packfile, but there
were a handful of places that used "unsigned long" to hold that
value, leading to an unintended truncation.
* Recent update to "git daemon" tries to enable the socket-level
KEEPALIVE, but when it is spawned via inetd, the standard input
file descriptor may not necessarily be connected to a socket.
Suppress an ENOTSOCK error from setsockopt().
* Recent FreeBSD stopped making perl available at /usr/bin/perl;
switch the default the built-in path to /usr/local/bin/perl on not
too ancient FreeBSD releases.
* "git commit --help" said "--no-verify" is only about skipping the
pre-commit hook, and failed to say that it also skipped the
commit-msg hook.
* "git merge" in Git v2.9 was taught to forbid merging an unrelated
lines of history by default, but that is exactly the kind of thing
the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
"git subtree" has been taught to use the "--allow-unrelated-histories"
option to override the default.
* The build procedure for "git persistent-https" helper (in contrib/)
has been updated so that it can be built with more recent versions
of Go.
* There is an optimization used in "git diff $treeA $treeB" to borrow
an already checked-out copy in the working tree when it is known to
be the same as the blob being compared, expecting that open/mmap of
such a file is faster than reading it from the object store, which
involves inflating and applying delta. This however kicked in even
when the checked-out copy needs to go through the convert-to-git
conversion (including the clean filter), which defeats the whole
point of the optimization. The optimization has been disabled when
the conversion is necessary.
* "git -c grep.patternType=extended log --basic-regexp" misbehaved
because the internal API to access the grep machinery was not
designed well.
* Windows port was failing some tests in t4130, due to the lack of
inum in the returned values by its lstat(2) emulation.
* The reflog output format is documented better, and a new format
--date=unix to report the seconds-since-epoch (without timezone)
has been added.
(merge 442f6fd jk/reflog-date later to maint).
* "git difftool <paths>..." started in a subdirectory failed to
interpret the paths relative to that directory, which has been
fixed.
* The characters in the label shown for tags/refs for commits in
"gitweb" output are now properly escaped for proper HTML output.
* FreeBSD can lie when asked mtime of a directory, which made the
untracked cache code to fall back to a slow-path, which in turn
caused tests in t7063 to fail because it wanted to verify the
behaviour of the fast-path.
* Squelch compiler warnings for nedmalloc (in compat/) library.
* A small memory leak in the command line parsing of "git blame"
has been plugged.
* The API documentation for hashmap was unclear if hashmap_entry
can be safely discarded without any other consideration. State
that it is safe to do so.
* Not-so-recent rewrite of "git am" that started making internal
calls into the commit machinery had an unintended regression, in
that no matter how many seconds it took to apply many patches, the
resulting committer timestamp for the resulting commits were all
the same.
* "git push --force-with-lease" already had enough logic to allow
ensuring that such a push results in creation of a ref (i.e. the
receiving end did not have another push from sideways that would be
discarded by our force-pushing), but didn't expose this possibility
to the users. It does so now.
(merge 9eed4f3 jk/push-force-with-lease-creation later to maint).
* The mechanism to limit the pack window memory size, when packing is
done using multiple threads (which is the default), is per-thread,
but this was not documented clearly.
(merge 954176c ms/document-pack-window-memory-is-per-thread later to maint).
* "import-tars" fast-import script (in contrib/) used to ignore a
hardlink target and replaced it with an empty file, which has been
corrected to record the same blob as the other file the hardlink is
shared with.
(merge 04e0869 js/import-tars-hardlinks later to maint).
* "git mv dir non-existing-dir/" did not work in some environments
the same way as existing mainstream platforms. The code now moves
"dir" to "non-existing-dir", without relying on rename("A", "B/")
that strips the trailing slash of '/'.
(merge 189d035 js/mv-dir-to-new-directory later to maint).
* The "t/" hierarchy is prone to get an unusual pathname; "make test"
has been taught to make sure they do not contain paths that cannot
be checked out on Windows (and the mechanism can be reusable to
catch pathnames that are not portable to other platforms as need
arises).
(merge c2cafd3 js/test-lint-pathname later to maint).
* When "git merge-recursive" works on history with many criss-cross
merges in "verbose" mode, the names the command assigns to the
virtual merge bases could have overwritten each other by unintended
reuse of the same piece of memory.
(merge 5447a76 rs/pull-signed-tag later to maint).
* "git checkout --detach <branch>" used to give the same advice
message as that is issued when "git checkout <tag>" (or anything
that is not a branch name) is given, but asking with "--detach" is
an explicit enough sign that the user knows what is going on. The
advice message has been squelched in this case.
(merge 779b88a sb/checkout-explit-detach-no-advice later to maint).
* "git difftool" by default ignores the error exit from the backend
commands it spawns, because often they signal that they found
differences by exiting with a non-zero status code just like "diff"
does; the exit status codes 126 and above however are special in
that they are used to signal that the command is not executable,
does not exist, or killed by a signal. "git difftool" has been
taught to notice these exit status codes.
(merge 45a4f5d jk/difftool-command-not-found later to maint).
* On Windows, help.browser configuration variable used to be ignored,
which has been corrected.
(merge 6db5967 js/no-html-bypass-on-windows later to maint).
* The "git -c var[=val] cmd" facility to append a configuration
variable definition at the end of the search order was described in
git(1) manual page, but not in git-config(1), which was more likely
place for people to look for when they ask "can I make a one-shot
override, and if so how?"
(merge ae1f709 dg/document-git-c-in-git-config-doc later to maint).
* The tempfile (hence its user lockfile) API lets the caller to open
a file descriptor to a temporary file, write into it and then
finalize it by first closing the filehandle and then either
removing or renaming the temporary file. When the process spawns a
subprocess after obtaining the file descriptor, and if the
subprocess has not exited when the attempt to remove or rename is
made, the last step fails on Windows, because the subprocess has
the file descriptor still open. Open tempfile with O_CLOEXEC flag
to avoid this (on Windows, this is mapped to O_NOINHERIT).
(merge 05d1ed6 bw/mingw-avoid-inheriting-fd-to-lockfile later to maint).
* Correct an age-old calco (is that a typo-like word for calc)
in the documentation.
(merge 7841c48 ls/packet-line-protocol-doc-fix later to maint).
* Other minor clean-ups and documentation updates
(merge 02a8cfa rs/merge-add-strategies-simplification later to maint).
(merge af4941d rs/merge-recursive-string-list-init later to maint).
(merge 1eb47f1 rs/use-strbuf-add-unique-abbrev later to maint).
(merge ddd0bfa jk/tighten-alloc later to maint).
(merge ecf30b2 rs/mailinfo-lib later to maint).
(merge 0eb75ce sg/reflog-past-root later to maint).
(merge 4369523 hv/doc-commit-reference-style later to maint).
----------------------------------------------------------------
Changes since v2.9.0 are as follows:
Alex Henrie (2):
unpack-trees: fix English grammar in do-this-before-that messages
l10n: ca.po: update translation
Alexander Hirsch (1):
pull: warn on --verify-signatures with --rebase
Alfred Perlstein (1):
git-svn: document the 'git svn propset' command
Andreas Brauchli (1):
gitweb: escape link body in format_ref_marker
Andrew Oakley (1):
git-p4: correct hasBranchPrefix verbose output
Antoine Queru (1):
upload-pack.c: use parse-options API
Armin Kunaschik (2):
t7800: readlink may not be available
t7610: test for mktemp before test execution
Ben Wijen (2):
t6026-merge-attr: child processes must not inherit index.lock handles
mingw: ensure temporary file handles are not inherited by child processes
Changwoo Ryu (1):
l10n: ko.po: Update Korean translation
Charles Bailey (4):
t7810: fix duplicated test title
t7810-grep.sh: fix duplicated test name
t7810-grep.sh: fix a whitespace inconsistency
grep: fix grepping for "intent to add" files
Chris Packham (1):
completion: add option '--recurse-submodules' to 'git clone'
Christian Couder (50):
builtin/apply: make gitdiff_verify_name() return void
builtin/apply: avoid parameter shadowing 'p_value' global
builtin/apply: avoid parameter shadowing 'linenr' global
builtin/apply: avoid local variable shadowing 'len' parameter
builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
builtin/apply: move 'options' variable into cmd_apply()
builtin/apply: move 'read_stdin' global into cmd_apply()
builtin/apply: introduce 'struct apply_state' to start libifying
builtin/apply: move 'state' init into init_apply_state()
builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
builtin/apply: move 'check' global into 'struct apply_state'
builtin/apply: move 'check_index' global into 'struct apply_state'
builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
builtin/apply: move 'update_index' global into 'struct apply_state'
builtin/apply: move 'allow_overlap' global into 'struct apply_state'
builtin/apply: move 'cached' global into 'struct apply_state'
builtin/apply: move 'diffstat' global into 'struct apply_state'
builtin/apply: move 'numstat' global into 'struct apply_state'
builtin/apply: move 'summary' global into 'struct apply_state'
builtin/apply: move 'threeway' global into 'struct apply_state'
builtin/apply: move 'no_add' global into 'struct apply_state'
builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
builtin/apply: move 'line_termination' global into 'struct apply_state'
builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
builtin/apply: move 'p_context' global into 'struct apply_state'
builtin/apply: move 'apply' global into 'struct apply_state'
builtin/apply: move 'patch_input_file' global into 'struct apply_state'
builtin/apply: move 'limit_by_name' global into 'struct apply_state'
builtin/apply: move 'has_include' global into 'struct apply_state'
builtin/apply: move 'p_value' global into 'struct apply_state'
builtin/apply: move 'p_value_known' global into 'struct apply_state'
builtin/apply: move 'root' global into 'struct apply_state'
builtin/apply: move 'whitespace_error' global into 'struct apply_state'
builtin/apply: move 'whitespace_option' into 'struct apply_state'
builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
builtin/apply: move 'ws_error_action' into 'struct apply_state'
builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
builtin/apply: move 'state_linenr' global into 'struct apply_state'
builtin/apply: move 'fn_table' global into 'struct apply_state'
builtin/apply: move 'symlink_changes' global into 'struct apply_state'
builtin/apply: move 'state' check into check_apply_state()
builtin/apply: move applying patches into apply_all_patches()
builtin/apply: add 'lock_file' pointer into 'struct apply_state'
builtin/apply: move 'newfd' global into 'struct apply_state'
.mailmap: use Christian Couder's Tuxfamily address
Christopher Layne (1):
git-svn: clone: Fail on missing url argument
Dave Nicolson (1):
Documentation: GPG capitalization
David A. Greene (1):
contrib/subtree: Add a test for subtree rebase that loses commits
David Aguilar (6):
t7900-subtree.sh: fix quoting and broken && chains
subtree: fix "git subtree split --rejoin"
subtree: adjust style to match CodingGuidelines
subtree: adjust function definitions to match CodingGuidelines
difftool: avoid $GIT_DIR and $GIT_WORK_TREE
difftool: use Git::* functions instead of passing around state
David Glasser (1):
doc: mention `git -c` in git-config(1)
David Kastrup (1):
blame: require 0 context lines while finding moved lines with -M
David Turner (3):
refs: allow log-only updates
refs: don't dereference on rename
mailmap: use main email address for dturner
Ed Maste (1):
rebase: update comment about FreeBSD /bin/sh
Edward Thomson (2):
format_commit_message: honor `color=auto` for `%C(auto)`
add: add --chmod=+x / --chmod=-x options
Elia Pinto (2):
http.c: implement the GIT_TRACE_CURL environment variable
imap-send.c: introduce the GIT_TRACE_CURL enviroment variable
Eric Sunshine (1):
blame: drop strdup of string literal
Eric Wong (24):
fast-import: implement unpack limit
daemon: enable SO_KEEPALIVE for all sockets
fast-import: invalidate pack_id references after loosening
pretty: support "mboxrd" output format
mailsplit: support unescaping mboxrd messages
am: support --patch-format=mboxrd
git-svn: skip mergeinfo handling with --no-follow-parent
gc: fix off-by-one error with gc.autoPackLimit
xread: retry after poll on EAGAIN/EWOULDBLOCK
xwrite: poll on non-blocking FDs
git-svn: warn instead of dying when commit data is missing
hoist out handle_nonblock function for xread and xwrite
config.mak.uname: define NEEDS_LIBRT under Linux, for now
http-walker: remove unused parameter from fetch_object
http: avoid disconnecting on 404s for loose objects
http-walker: reduce O(n) ops with doubly-linked list
list: avoid incompatibility with *BSD sys/queue.h
daemon: ignore ENOTSOCK from setsockopt
configure.ac: stronger test for pthread linkage
git-svn: document svn.authorsProg in config
git-svn: allow --version to work anywhere
git svn: migrate tests to use lib-httpd
pager: move pager-specific setup into the build
http-backend: buffer headers before sending
Heiko Becker (1):
gnome-keyring: Don't hard-code pkg-config executable
Heiko Voigt (4):
submodule-config: passing name reference for .gitmodule blobs
submodule-config: combine early return code into one goto
submodule-config: fix test binary crashing when no arguments given
SubmittingPatches: document how to reference previous commits
Ingo Brückl (3):
t3700: remove unwanted leftover files before running new tests
t3700: merge two tests into one
t3700: add a test_mode_in_index helper function
Jacob Keller (1):
completion: add completion for --submodule=* diff option
Jean-Noel Avila (4):
i18n: fix typos for translation
i18n: fix git rebase interactive commit messages
i18n: simplify numeric error reporting
l10n: fr.po v2.10.0-rc2
Jeff King (107):
git_config_with_options: drop "found" counting
git_config_parse_parameter: refactor cleanup code
config: set up config_source for command-line config
config: return configset value for current_config_ functions
config: add a notion of "scope"
upload-pack: provide a hook for running pack-objects
rev-list: "adjust" results of "--count --use-bitmap-index -n"
rev-list: disable bitmaps when "-n" is used with listing objects
tree-diff: avoid alloca for large allocations
send-pack: use buffered I/O to talk to pack-objects
parse_opt_string_list: stop allocating new strings
interpret-trailers: don't duplicate option strings
blame,shortlog: don't make local option variables static
use string_list initializer consistently
fetch: document that pruning happens before fetching
repack: document --unpack-unreachable option
repack: add --keep-unreachable option
repack: extend --keep-unreachable to loose objects
add--interactive: respect diff.compactionHeuristic
bisect: always call setup_revisions after init_revisions
gpg-interface: use child_process.args
verify_signed_buffer: drop pbuf variable
verify_signed_buffer: use tempfile object
run-command: add pipe_command helper
verify_signed_buffer: use pipe_command
sign_buffer: use pipe_command
t0006: rename test-date's "show" to "relative"
t0006: test various date formats
local_tzoffset: detect errors from tm_to_time_t
t/perf: fix regression in testing older versions of git
p4211: explicitly disable renames in no-rename test
color: fix max-size comment
doc: refactor description of color format
add skip_prefix_mem helper
color: refactor parse_attr
color: allow "no-" for negating attributes
color: support "italic" attribute
color: support strike-through attribute
t9300: factor out portable "head -c" replacement
t5000: test tar files that overflow ustar headers
archive-tar: write extended headers for file sizes >= 8GB
archive-tar: write extended headers for far-future mtime
archive-tar: drop return value
add an extra level of indirection to main()
common-main: call git_extract_argv0_path()
common-main: call sanitize_stdfds()
common-main: call restore_sigpipe_to_default()
common-main: call git_setup_gettext()
tests: factor portable signal check out of t0005
t0005: use test_match_signal as appropriate
test_must_fail: use test_match_signal
t/lib-git-daemon: use test_match_signal
parse_options: allocate a new array when concatenating
Makefile: drop extra dependencies for test helpers
Makefile: use VCSSVN_LIB to refer to svn library
config: fix bogus fd check when setting up default config
branch: use non-gentle write_file for branch description
write_file: drop "gently" form
write_file: use xopen
write_file: add pointer+len variant
write_file: add format attribute
use write_file_buf where applicable
branch: use write_file_buf instead of write_file
walker: let walker_say take arbitrary formats
avoid using sha1_to_hex output as printf format
push: anonymize URL in status output
t0006: skip "far in the future" test when unsigned long is not long enough
check_everything_connected: always pass --quiet to rev-list
rev-list: add optional progress reporting
check_everything_connected: convert to argv_array
check_everything_connected: use a struct with named options
check_connected: relay errors to alternate descriptor
check_connected: add progress flag
clone: use a real progress meter for connectivity check
index-pack: add flag for showing delta-resolution progress
receive-pack: turn on index-pack resolving progress
receive-pack: relay connectivity errors to sideband
receive-pack: turn on connectivity progress
receive-pack: send keepalives during quiet periods
t5541: fix url scrubbing test when GPG is not set
diff: do not reuse worktree files that need "clean" conversion
contrib/git-jump: fix greedy regex when matching hunks
contrib/git-jump: add whitespace-checking mode
contrib/git-jump: fix typo in README
doc/rev-list-options: clarify "commit@{Nth}" for "-g" option
doc/rev-list-options: explain "-g" output formats
doc/pretty-formats: describe index/time formats for %gd
doc/pretty-formats: explain shortening of %gd
t4205: drop top-level &&-chaining
t4205: indent here documents
date: document and test "raw-local" mode
date: add "unix" format
t/perf: add tests for many-pack scenarios
sha1_file: drop free_pack_by_name
add generic most-recently-used list
find_pack_entry: replace last_found_pack with MRU cache
pack-objects: break out of want_object loop early
pack-objects: compute local/ignore_pack_keep early
am: reset cached ident date for each patch
trace: handle NULL argument in trace_disable()
trace: stop using write_or_whine_pipe()
trace: use warning() for printing trace errors
trace: cosmetic fixes for error messages
trace: correct variable name in write() error message
trace: disable key after write error
write_or_die: drop write_or_whine_pipe()
trace: do not fall back to stderr
Jiang Xin (3):
l10n: git.pot: v2.10.0 round 1 (248 new, 56 removed)
l10n: git.pot: v2.10.0 round 2 (12 new, 44 removed)
l10n: zh_CN: for git v2.10.0 l10n round 2
Joey Hess (1):
clarify %f documentation
Johannes Schindelin (59):
mingw: let the build succeed with DEVELOPER=1
perf: accommodate for MacOSX
pretty: make the skip_blank_lines() function public
commit.c: make find_commit_subject() more robust
t2300: "git --exec-path" is not usable in $PATH on Windows as-is
log: prepare log/log-tree to reuse the diffopt.close_file attribute
log-tree: respect diffopt's configured output file stream
line-log: respect diffopt's configured output file stream
graph: respect the diffopt.file setting
shortlog: support outputting to streams other than stdout
format-patch: explicitly switch off color when writing to files
format-patch: avoid freopen()
format-patch: use stdout directly
shortlog: respect the --output=<file> setting
t4211: ensure that log respects --output=<file>
color.h: remove obsolete comment about limitations on Windows
diff: do not color output when --color=auto and --output=<file> is given
t3404: fix a grammo (commands are ran -> commands are run)
commit -C: skip blank lines at the beginning of the message
sequencer: use skip_blank_lines() to find the commit subject
reset --hard: skip blank lines when reporting the commit subject
commit -S: avoid invalid pointer with empty message
mingw: declare main()'s argv as const
t3404: add a test for the --gpg-sign option
rebase -i: demonstrate a bug with --autosquash
rebase -i: we allow extra spaces after fixup!/squash!
am: counteract gender bias
diff: demonstrate a bug with --patience and --ignore-space-at-eol
diff: fix a double off-by-one with --ignore-space-at-eol
t/test-lib.sh: fix running tests with --valgrind
mingw: fix the shortlog --output=<file> test
mingw: fix regression in t1308-config-set
fsck: refactor how to describe objects
fsck_walk(): optionally name objects on the go
fsck: give the error function a chance to see the fsck_options
fsck: optionally show more helpful info for broken links
t5520: verify that `pull --rebase` shows the helpful advice when failing
die("bug"): report bugs consistently
die(_("BUG")): avoid translating bug messages
merge-recursive: clarify code in was_tracked()
prepare the builtins for a libified merge_recursive()
merge_recursive: abort properly upon errors
merge-recursive: avoid returning a wholesale struct
merge-recursive: allow write_tree_from_memory() to error out
merge-recursive: handle return values indicating errors
merge-recursive: switch to returning errors instead of dying
am -3: use merge_recursive() directly again
merge-recursive: flush output buffer before printing error messages
merge-recursive: write the commit title in one go
merge-recursive: offer an option to retain the output in 'obuf'
merge_trees(): ensure that the callers release output buffer
merge-recursive: flush output buffer even when erroring out
import-tars: support hard links
t5533: make it pass on case-sensitive filesystems
nedmalloc: fix misleading indentation
git mv: do not keep slash in `git mv dir non-existing-dir/`
t/Makefile: ensure that paths are valid on platforms we care
rev-parse: respect core.hooksPath in --git-path
Revert "display HTML in default browser using Windows' shell API"
Johannes Sixt (7):
Windows: add missing definition of ENOTSOCK
git-submodule: forward exit code of git-submodule--helper more faithfully
submodule-helper: fix indexing in clone retry error reporting path
rebase-interactive: trim leading whitespace from progress count
t4130: work around Windows limitation
config.c: avoid duplicated global static variables
commit-slab.h: avoid duplicated global static variables
John Keeping (5):
difftool: fix argument handling in subdirs
Documentation/git-push: fix placeholder formatting
push: add shorthand for --force-with-lease branch creation
push: allow pushing new branches with --force-with-lease
difftool: always honor fatal error exit codes
Jonathan Nieder (1):
doc: git-htmldocs.googlecode.com is no more
Jonathan Tan (1):
fetch-pack: grow stateless RPC windows exponentially
Jordan DE GEA (1):
worktree: allow "-" short-hand for @{-1} in add command
Josef Kufner (1):
pretty: pass graph width to pretty formatting for use in '%>|(N)'
Josh Triplett (1):
format-patch: format.from gives the default for --from
Junio C Hamano (44):
send-email: detect and offer to skip backup files
pathspec: rename free_pathspec() to clear_pathspec()
t1308: do not get fooled by symbolic links to the source tree
builtin/apply: remove misleading comment on lock_file field
blame, line-log: do not loop around deref_tag()
Start the post-2.9 cycle
clone: do not let --depth imply --shallow-submodules
Start preparing for 2.9.1
Second batch of topics for 2.10
More fixes for 2.9.1
Third batch of topics for 2.10
commit.c: remove print_commit_list()
Fourth batch of topics for 2.10
Git 2.9.1
merge: avoid "safer crlf" during recording of merge results
Fifth batch of topics for 2.10
diff: document diff-filter exclusion
Git 2.9.2
archive-tar: huge offset and future timestamps would not work on 32-bit
Sixth batch of topics for 2.10
grep: further simplify setting the pattern type
Seventh batch of topics for 2.10
date: clarify --date=raw description
Some fixes for 2.9.3
t9100: portability fix
Eighth batch of topics for 2.10
hashmap: clarify that hashmap_entry can safely be discarded
Ninth batch of topics for 2.10
Tenth batch for 2.10
Hopefully final batch for 2.9.3
Eleventh batch for 2.10
Yet another batch for 2.9.3
Twelfth batch for 2.10
Git 2.9.3
Final batch before 2.10-rc0
Git 2.10-rc0
Relnotes: decribe the updates to the "text=auto" attribute
relnotes: redo the description of text=auto fix
RelNotes: final batch of topics before -rc1
Git 2.10-rc1
Prepare for 2.10.0-rc2
Git 2.10-rc2
A few more fixes before the final 2.10
Git 2.10
Keith McGuigan (1):
builtin/fetch.c: don't free remote->name after fetch
Kevin Willford (4):
patch-ids: stop using a hand-rolled hashmap implementation
patch-ids: replace the seen indicator with a commit pointer
patch-ids: add flag to create the diff patch id using header only data
rebase: avoid computing unnecessary patch IDs
LE Manh Cuong (1):
sh-setup: enclose setting of ${VAR=default} in double-quotes
Lars Schneider (3):
git-p4: place temporary refs used for branch import under refs/git-p4-tmp
travis-ci: enable web server tests t55xx on Linux
pack-protocol: fix maximum pkt-line size
Lars Vogel (1):
Use "working tree" instead of "working directory" for git status
Linus Torvalds (1):
gpg-interface: prefer "long" key format output when verifying pgp signatures
Lukas Fleischer (4):
receive-pack: send auto-gc output over sideband 2
sideband.c: make send_sideband() return void
upload-pack.c: make send_client_data() return void
sideband.c: refactor recv_sideband()
Matthieu Moy (9):
Documentation/git-mv.txt: fix whitespace indentation
doc: typeset short command-line options as literal
doc: typeset long command-line options as literal
doc: typeset '--' as literal
doc: typeset long options with argument as literal
CodingGuidelines: formatting HEAD in documentation
doc: typeset HEAD and variants as literal
status: suggest 'git merge --abort' when appropriate
git-multimail: update to release 1.4.0
Mehul Jain (3):
t4202: refactor test
log: add "--no-show-signature" command line option
log: add log.showSignature configuration variable
Michael Haggerty (50):
t1404: demonstrate a bug resolving references
commit_ref(): if there is an empty dir in the way, delete it
read_raw_ref(): don't get confused by an empty directory
safe_create_leading_directories(): improve docstring
remove_dir_recursively(): add docstring
refname_is_safe(): use skip_prefix()
refname_is_safe(): don't allow the empty string
refname_is_safe(): insist that the refname already be normalized
commit_ref_update(): write error message to *err, not stderr
rename_ref(): remove unneeded local variable
ref_transaction_commit(): remove local variables n and updates
read_raw_ref(): rename flags argument to type
read_raw_ref(): clear *type at start of function
read_raw_ref(): rename symref argument to referent
read_raw_ref(): improve docstring
read_raw_ref(): move docstring to header file
lock_ref_sha1_basic(): remove unneeded local variable
refs: make error messages more consistent
ref_transaction_create(): disallow recursive pruning
ref_transaction_commit(): correctly report close_ref() failure
delete_branches(): use resolve_refdup()
verify_refname_available(): adjust constness in declaration
add_update(): initialize the whole ref_update
lock_ref_for_update(): new function
unlock_ref(): move definition higher in the file
ref_transaction_update(): check refname_is_safe() at a minimum
refs: resolve symbolic refs first
lock_ref_for_update(): don't re-read non-symbolic references
lock_ref_for_update(): don't resolve symrefs
commit_ref_update(): remove the flags parameter
lock_ref_sha1_basic(): only handle REF_NODEREF mode
refs: remove unnecessary "extern" keywords
do_for_each_ref(): move docstring to the header file
refs: use name "prefix" consistently
delete_refs(): add a flags argument
remote rm: handle symbolic refs correctly
get_ref_cache(): only create an instance if there is a submodule
entry_resolves_to_object(): rename function from ref_resolves_to_object()
ref_resolves_to_object(): new function
refs: introduce an iterator interface
do_for_each_ref(): reimplement using reference iteration
for_each_reflog(): don't abort for bad references
dir_iterator: new API for iterating over a directory tree
for_each_reflog(): reimplement using iterators
t1404: rename file to t1404-update-ref-errors.sh
t1404: remove "prefix" argument to test_update_rejected
t1404: document function test_update_rejected
t1404: add more tests of update-ref error handling
lock_ref_for_update(): make error handling more uniform
lock_ref_for_update(): avoid a symref resolution
Michael J Gruber (7):
cherry-pick: allow to pick to unborn branches
Documentation/technical: describe signature formats
Documentation/technical: signed tag format
Documentation/technical: signed commit format
Documentation/technical: signed merge tag format
gpg-interface: check gpg signature creation status
t/t91*: do not say how to avoid the tests
Michael Stahl (1):
document git-repack interaction of pack.threads and pack.windowMemory
Mike Hommey (2):
blame: allow to blame paths freshly added to the index
t/t8003-blame-corner-cases.sh: Use here documents
Nguyễn Thái Ngọc Duy (47):
completion: support git-worktree
worktree.c: rewrite mark_current_worktree() to avoid strbuf
git-worktree.txt: keep subcommand listing in alphabetical order
worktree.c: use is_dot_or_dotdot()
worktree: avoid 0{40}, too many zeroes, hard to read
worktree: simplify prefixing paths
worktree.c: add find_worktree()
worktree.c: add is_main_worktree()
lib-httpd.sh: print error.log on error
worktree.c: add is_worktree_locked()
pretty.c: support <direction>|(<negative number>) forms
new-command.txt: correct the command description file
grep: break down an "if" stmt in preparation for next changes
test-regex: isolate the bug test code
test-regex: expose full regcomp() to the command line
grep/icase: avoid kwsset on literal non-ascii strings
git-fetch.txt: document fetch output
fetch: refactor ref update status formatting code
fetch: change flag code for displaying tag update and deleted ref
grep/icase: avoid kwsset when -F is specified
grep: rewrite an if/else condition to avoid duplicate expression
grep/pcre: prepare locale-dependent tables for icase matching
gettext: add is_utf8_locale()
grep/pcre: support utf-8
diffcore-pickaxe: Add regcomp_or_die()
diffcore-pickaxe: support case insensitive match on non-ascii
grep.c: reuse "icase" variable
fetch: align all "remote -> local" output
fetch: reduce duplicate in ref update status lines with placeholder
connect: read $GIT_SSH_COMMAND from config file
worktree: add "lock" command
worktree: add "unlock" command
worktree.c: find_worktree() search by path suffix
pack-objects: pass length to check_pack_crc() without truncation
log: decorate HEAD -> branch with the same color for arrow and HEAD
sha1_file.c: use type off_t* for object_info->disk_sizep
index-pack: correct "len" type in unpack_data()
index-pack: report correct bad object offsets even if they are large
index-pack: correct "offset" type in unpack_entry_data()
pack-objects: do not truncate result in-pack object size on 32-bit systems
fsck: use streaming interface for large blobs in pack
test-lib.sh: introduce and use $EMPTY_TREE
test-lib.sh: introduce and use $EMPTY_BLOB
cache-tree.c: fix i-t-a entry skipping directory updates sometimes
cache-tree: do not generate empty trees as a result of all i-t-a subentries
config.mak.uname: correct perl path on FreeBSD
t7063: work around FreeBSD's lazy mtime update feature
Nicolas Pitre (1):
sideband.c: small optimization of strbuf usage
Orgad Shaneh (1):
commit: describe that --no-verify skips the commit-msg hook in the help text
Parker Moore (2):
contrib/persistent-https: update ldflags syntax for Go 1.7+
contrib/persistent-https: use Git version for build label
Patrick Steinhardt (1):
rebase -i: restore autostash on abort
Peter Colberg (2):
refs.h: fix misspelt "occurred" in a comment
config.c: fix misspelt "occurred" in an error message
Peter Krefting (1):
l10n: sv.po: Update Swedish translation (2757t0f0u)
Pranit Bauva (2):
builtin/commit.c: memoize git-path for COMMIT_EDITMSG
strbuf: describe the return value of strbuf_read_file
Ramsay Jones (2):
regex: fix a SIZE_MAX macro redefinition warning
write_or_die: remove the unused write_or_whine() function
René Scharfe (34):
t4051: rewrite, add more tests
xdiff: factor out match_func_rec()
xdiff: handle appended chunks better with -W
xdiff: ignore empty lines before added functions with -W
xdiff: -W: don't include common trailing empty lines in context
xdiff: don't trim common tail with -W
t7810: add test for grep -W and trailing empty context lines
grep: -W: don't extend context to trailing empty lines
xdiff: fix merging of appended hunk with -W
.gitattributes: set file type for C files
notes-merge: use O_EXCL to avoid overwriting existing files
am: ignore return value of write_file()
rm: reuse strbuf for all remove_dir_recursively() calls
worktree: use strbuf_add_absolute_path() directly
use strbuf_addbuf() for appending a strbuf to another
submodule-config: use explicit empty string instead of strbuf in config_from()
strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf()
use strbuf_addstr() for adding constant strings to a strbuf
pass constants as first argument to st_mult()
use strbuf_addstr() instead of strbuf_addf() with "%s"
use CHILD_PROCESS_INIT to initialize automatic variables
merge-recursive: use STRING_LIST_INIT_NODUP
merge: use string_list_split() in add_strategies()
nedmalloc: work around overzealous GCC 6 warning
archive-tar: make write_extended_header() void
use strbuf_add_unique_abbrev() for adding short hashes
correct FLEXPTR_* example in comment
mailinfo: recycle strbuf in check_header()
commit: use xstrdup() in get_merge_parent()
commit: factor out set_merge_remote_desc()
merge-recursive: fix verbose output for multiple base trees
commit: use FLEX_ARRAY in struct merge_remote_desc
receive-pack: use FLEX_ALLOC_MEM in queue_command()
p3400: make test script executable
Ronald Wampler (1):
Makefile: add NEEDS_LIBRT to optionally link with librt
SZEDER Gábor (2):
reflog: continue walking the reflog past root commits
t1410: remove superfluous 'git reflog' from the 'walk past root' test
Stefan Beller (23):
submodule update: make use of the existing fetch_in_submodule function
submodule-config: keep shallow recommendation around
submodule update: learn `--[no-]recommend-shallow` option
submodule--helper: initial clone learns retry logic
submodule update: continue when a clone fails
t5614: don't use subshells
push options: {pre,post}-receive hook learns about push options
receive-pack: implement advertising and receiving push options
push: accept push options
add a test for push options
Documentation: pack-protocol correct NAK response
submodule deinit: remove outdated comment
t7406: future proof tests with hard coded depth
submodule update: respect depth in subsequent fetches
submodule update: narrow scope of local variable
submodule--helper: fix usage string for relative-path
submodule-config: keep configured branch around
gitmodules: document shallow recommendation
submodule--helper: add remote-branch helper
submodule update: allow '.' for branch value
submodule--helper: use parallel processor correctly
t7406: fix breakage on OSX
checkout: do not mention detach advice for explicit --detach option
Thomas Braun (3):
completion: factor out untracked file modes into a variable
completion: add __git_get_option_value helper
completion: add git status
Thomas Gummerer (1):
blame: fix segfault on untracked files
Tom Russello (4):
doc: clearer rule about formatting literals
doc: change environment variables format
doc: more consistency in environment variables format
doc: change configuration variables format
Torsten Bögershausen (4):
convert: unify the "auto" handling of CRLF
convert: Correct NNO tests and missing `LF will be replaced by CRLF`
git ls-files: text=auto eol=lf is supported in Git 2.10
gitattributes: Document the unified "auto" handling
Trần Ngọc Quân (2):
l10n: Updated Vietnamese translation for v2.10.0 (2789t)
l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)
Vasco Almeida (49):
i18n: builtin/remote.c: fix mark for translation
i18n: advice: mark string about detached head for translation
i18n: advice: internationalize message for conflicts
i18n: transport: mark strings for translation
i18n: sequencer: mark entire sentences for translation
i18n: rebase-interactive: mark here-doc strings for translation
i18n: sequencer: mark string for translation
i18n: rebase-interactive: mark comments of squash for translation
i18n: merge-octopus: mark messages for translation
i18n: setup: mark strings for translation
merge-octopus: use die shell function from git-sh-setup.sh
tests: use test_i18n* functions to suppress false positives
i18n: rebase: fix marked string to use eval_gettext variant
tests: unpack-trees: update to use test_i18n* functions
i18n: rebase: mark placeholder for translation
t9003: become resilient to GETTEXT_POISON
i18n: bisect: simplify error message for i18n
t4153: fix negated test_i18ngrep call
t6030: update to use test_i18ncmp
t5523: use test_i18ngrep for negation
i18n: git-sh-setup.sh: mark strings for translation
i18n: bisect: mark strings for translation
i18n: rebase-interactive: mark strings for translation
i18n: transport-helper.c: change N_() call to _()
i18n: notes: mark strings for translation
i18n: notes: mark options for translation
i18n: merge: mark messages for translation
i18n: merge: change command option help to lowercase
i18n: sequencer: add period to error message
i18n: standardise messages
i18n: remote: mark URL fallback text for translation
i18n: remote: allow translations to reorder message
i18n: init-db: join message pieces
i18n: submodule: join strings marked for translation
i18n: submodule: escape shell variables inside eval_gettext
i18n: unmark die messages for translation
i18n: branch: mark comment when editing branch description for translation
t5541: become resilient to GETTEXT_POISON
t5510: skip tests under GETTEXT_POISON build
i18n: notes: mark comment for translation
i18n: config: unfold error messages marked for translation
i18n: setup: mark error messages for translation
i18n: archive: mark errors for translation
i18n: git-stash: mark messages for translation
t3404: become resilient to GETTEXT_POISON
t5520: become resilient to GETTEXT_POISON
t7411: become resilient to GETTEXT_POISON
l10n: pt_PT: merge git.pot
l10n: pt_PT: update Portuguese translation
Ville Skyttä (3):
git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
completion: complete --delete, --move, and --remotes for git branch
Spelling fixes
William Duclot (1):
userdiff: add built-in pattern for CSS
brian m. carlson (11):
hex: add oid_to_hex_r()
contrib/coccinelle: add basic Coccinelle transforms
coccinelle: convert hashcpy() with null_sha1 to hashclr()
coccinelle: apply object_id Coccinelle transformations
diff: convert struct diff_filespec to struct object_id
diff: rename struct diff_filespec's sha1_valid member
merge-recursive: convert struct stage_data to use object_id
merge-recursive: convert struct merge_file_info to object_id
merge-recursive: convert leaf functions to use struct object_id
merge-recursive: convert merge_recursive_generic() to object_id
diff: convert prep_temp_blob() to struct object_id
^ permalink raw reply [relevance 3%]
* [ANNOUNCE] Git v2.10.0-rc2
@ 2016-08-26 22:31 3% Junio C Hamano
0 siblings, 0 replies; 22+ results
From: Junio C Hamano @ 2016-08-26 22:31 UTC (permalink / raw
To: git; +Cc: Linux Kernel
A release candidate Git v2.10.0-rc2 is now available for testing
at the usual places. It is comprised of 623 non-merge commits
since v2.9.0, contributed by 71 people, 22 of which are new faces.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the
'v2.10.0-rc2' tag and the 'master' branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.9.0 are as follows.
Welcome to the Git development community!
Alexander Hirsch, Andreas Brauchli, Andrew Oakley, Antoine Queru,
Ben Wijen, Christopher Layne, Dave Nicolson, David Glasser, Ed
Maste, Heiko Becker, Ingo Brückl, Jonathan Tan, Jordan DE GEA,
Josef Kufner, Keith McGuigan, Kevin Willford, LE Manh Cuong,
Michael Stahl, Parker Moore, Peter Colberg, Tom Russello,
and William Duclot.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Alex Henrie, Alfred Perlstein, Armin Kunaschik, brian m. carlson,
Charles Bailey, Chris Packham, Christian Couder, David A. Greene,
David Aguilar, David Kastrup, David Turner, Edward Thomson,
Elia Pinto, Eric Sunshine, Eric Wong, Heiko Voigt, Jacob Keller,
Jean-Noel Avila, Jeff King, Joey Hess, Johannes Schindelin,
Johannes Sixt, John Keeping, Jonathan Nieder, Josh Triplett,
Junio C Hamano, Lars Schneider, Lars Vogel, Linus Torvalds,
Lukas Fleischer, Matthieu Moy, Mehul Jain, Michael Haggerty,
Michael J Gruber, Mike Hommey, Nguyễn Thái Ngọc Duy,
Nicolas Pitre, Orgad Shaneh, Patrick Steinhardt, Pranit Bauva,
Ramsay Jones, René Scharfe, Ronald Wampler, Stefan Beller,
SZEDER Gábor, Thomas Braun, Torsten Bögershausen, Vasco
Almeida, and Ville Skyttä.
----------------------------------------------------------------
Git 2.10 Release Notes (draft)
==============================
Backward compatibility notes
----------------------------
Updates since v2.9
------------------
UI, Workflows & Features
* "git pull --rebase --verify-signature" learned to warn the user
that "--verify-signature" is a no-op when rebasing.
* An upstream project can make a recommendation to shallowly clone
some submodules in the .gitmodules file it ships.
* "git worktree add" learned that '-' can be used as a short-hand for
"@{-1}", the previous branch.
* Update the funcname definition to support css files.
* The completion script (in contrib/) learned to complete "git
status" options.
* Messages that are generated by auto gc during "git push" on the
receiving end are now passed back to the sending end in such a way
that they are shown with "remote: " prefix to avoid confusing the
users.
* "git add -i/-p" learned to honor diff.compactionHeuristic
experimental knob, so that the user can work on the same hunk split
as "git diff" output.
* "upload-pack" allows a custom "git pack-objects" replacement when
responding to "fetch/clone" via the uploadpack.packObjectsHook.
(merge b738396 jk/upload-pack-hook later to maint).
* Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
(merge d9925d1 ew/mboxrd-format-am later to maint).
* "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").
(merge e26a8c4 jk/repack-keep-unreachable later to maint).
* "log --graph --format=" learned that "%>|(N)" specifies the width
relative to the terminal's left edge, not relative to the area to
draw text that is to the right of the ancestry-graph section. It
also now accepts negative N that means the column limit is relative
to the right border.
* A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
(merge 531220b jc/send-email-skip-backup later to maint).
* "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.
* The output coloring scheme learned two new attributes, italic and
strike, in addition to existing bold, reverse, etc.
* "git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
(merge fce04c3 mj/log-show-signature-conf later to maint).
* More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
* "git archive" learned to handle files that are larger than 8GB and
commits far in the future than expressible by the traditional US-TAR
format.
(merge 5caeeb8 jk/big-and-future-archive-tar later to maint).
* A new configuration variable core.sshCommand has been added to
specify what value for GIT_SSH_COMMAND to use per repository.
* "git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location. "git worktree"
command learned a dedicated command pair to create and remove such
a file, so that the users do not have to do this with editor.
* A handful of "git svn" updates.
* "git push" learned to accept and pass extra options to the
receiving end so that hooks can read and react to them.
* "git status" learned to suggest "merge --abort" during a conflicted
merge, just like it already suggests "rebase --abort" during a
conflicted rebase.
* "git jump" script (in contrib/) has been updated a bit.
(merge a91e692 jk/git-jump later to maint).
* "git push" and "git clone" learned to give better progress meters
to the end user who is waiting on the terminal.
* An entry "git log --decorate" for the tip of the current branch is
shown as "HEAD -> name" (where "name" is the name of the branch);
the arrow is now painted in the same color as "HEAD", not in the
color for commits.
* "git format-patch" learned format.from configuration variable to
specify the default settings for its "--from" option.
* "git am -3" calls "git merge-recursive" when it needs to fall back
to a three-way merge; this call has been turned into an internal
subroutine call instead of spawning a separate subprocess.
* The command line completion scripts (in contrib/) now knows about
"git branch --delete/--move [--remote]".
(merge 2703c22 vs/completion-branch-fully-spelled-d-m-r later to maint).
* "git rev-parse --git-path hooks/<hook>" learned to take
core.hooksPath configuration variable (introduced during 2.9 cycle)
into account.
(merge 9445b49 ab/hooks later to maint).
* "git log --show-signature" and other commands that display the
verification status of PGP signature now shows the longer key-id,
as 32-bit key-id is so last century.
Performance, Internal Implementation, Development Support etc.
* "git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
* When "git daemon" is run without --[init-]timeout specified, a
connection from a client that silently goes offline can hang around
for a long time, wasting resources. The socket-level KEEPALIVE has
been enabled to allow the OS to notice such failed connections.
* "git upload-pack" command has been updated to use the parse-options
API.
* The "git apply" standalone program is being libified; the first
step to move many state variables into a structure that can be
explicitly (re)initialized to make the machinery callable more
than once has been merged.
* HTTP transport gained an option to produce more detailed debugging
trace.
(merge 73e57aa ep/http-curl-trace later to maint).
* Instead of taking advantage of the fact that a struct string_list
that is allocated with all NULs happens to be the INIT_NODUP kind,
the users of string_list structures are taught to initialize them
explicitly as such, to document their behaviour better.
(merge 2721ce2 jk/string-list-static-init later to maint).
* HTTPd tests learned to show the server error log to help diagnosing
a failing tests.
(merge 44f243d nd/test-lib-httpd-show-error-log-in-verbose later to maint).
* The ownership rule for the piece of memory that hold references to
be fetched in "git fetch" was screwy, which has been cleaned up.
* "git bisect" makes an internal call to "git diff-tree" when
bisection finds the culprit, but this call did not initialize the
data structure to pass to the diff-tree API correctly.
* Further preparatory clean-up for "worktree" feature continues.
(merge 0409e0b nd/worktree-cleanup-post-head-protection later to maint).
* Formats of the various data (and how to validate them) where we use
GPG signature have been documented.
* A new run-command API function pipe_command() is introduced to
sanely feed data to the standard input while capturing data from
the standard output and the standard error of an external process,
which is cumbersome to hand-roll correctly without deadlocking.
* The codepath to sign data in a prepared buffer with GPG has been
updated to use this API to read from the status-fd to check for
errors (instead of relying on GPG's exit status).
(merge efee955 jk/gpg-interface-cleanup later to maint).
* Allow t/perf framework to use the features from the most recent
version of Git even when testing an older installed version.
* The commands in the "log/diff" family have had an FILE* pointer in the
data structure they pass around for a long time, but some codepaths
used to always write to the standard output. As a preparatory step
to make "git format-patch" available to the internal callers, these
codepaths have been updated to consistently write into that FILE*
instead.
* Conversion from unsigned char sha1[20] to struct object_id
continues.
* Improve the look of the way "git fetch" reports what happened to
each ref that was fetched.
* The .c/.h sources are marked as such in our .gitattributes file so
that "git diff -W" and friends would work better.
* Code clean-up to avoid using a variable string that compilers may
feel untrustable as printf-style format given to write_file()
helper function.
* "git p4" used a location outside $GIT_DIR/refs/ to place its
temporary branches, which has been moved to refs/git-p4-tmp/.
* Existing autoconf generated test for the need to link with pthread
library did not check all the functions from pthread libraries;
recent FreeBSD has some functions in libc but not others, and we
mistakenly thought linking with libc is enough when it is not.
* When "git fsck" reports a broken link (e.g. a tree object contains
a blob that does not exist), both containing object and the object
that is referred to were reported with their 40-hex object names.
The command learned the "--name-objects" option to show the path to
the containing object from existing refs (e.g. "HEAD~24^2:file.txt").
* Allow http daemon tests in Travis CI tests.
* Makefile assumed that -lrt is always available on platforms that
want to use clock_gettime() and CLOCK_MONOTONIC, which is not a
case for recent Mac OS X. The necessary symbols are often found in
libc on many modern systems and having -lrt on the command line, as
long as the library exists, had no effect, but when the platform
removes librt.a that is a different matter--having -lrt will break
the linkage.
This change could be seen as a regression for those who do need to
specify -lrt, as they now specifically ask for NEEDS_LIBRT when
building. Hopefully they are in the minority these days.
* Further preparatory work on the refs API before the pluggable
backend series can land.
* Error handling in the codepaths that updates refs has been
improved.
* The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
* The handling of the "text=auto" attribute has been corrected.
$ echo "* text=auto eol=crlf" >.gitattributes
used to have the same effect as
$ echo "* text eol=crlf" >.gitattributes
i.e. declaring all files are text (ignoring "auto"). The
combination has been fixed to be equivalent to doing
$ git config core.autocrlf true
* Documentation has been updated to show better example usage
of the updated "text=auto" attribute.
* A few tests that specifically target "git rebase -i" have been
added.
* Dumb http transport on the client side has been optimized.
(merge ecba195 ew/http-walker later to maint).
* Users of the parse_options_concat() API function need to allocate
extra slots in advance and fill them with OPT_END() when they want
to decide the set of supported options dynamically, which makes the
code error-prone and hard to read. This has been corrected by tweaking
the API to allocate and return a new copy of "struct option" array.
* "git fetch" exchanges batched have/ack messages between the sender
and the receiver, initially doubling every time and then falling
back to enlarge the window size linearly. The "smart http"
transport, being an half-duplex protocol, outgrows the preset limit
too quickly and becomes inefficient when interacting with a large
repository. The internal mechanism learned to grow the window size
more aggressively when working with the "smart http" transport.
* Tests for "git svn" have been taught to reuse the lib-httpd test
infrastructure when testing the subversion integration that
interacts with subversion repositories served over the http://
protocol.
(merge a8a5d25 ew/git-svn-http-tests later to maint).
* "git pack-objects" has a few options that tell it not to pack
objects found in certain packfiles, which require it to scan .idx
files of all available packs. The codepaths involved in these
operations have been optimized for a common case of not having any
non-local pack and/or any .kept pack.
* The t3700 test about "add --chmod=-x" have been made a bit more
robust and generally cleaned up.
(merge 766cdc4 ib/t3700-add-chmod-x-updates later to maint).
* The build procedure learned PAGER_ENV knob that lists what default
environment variable settings to export for popular pagers. This
mechanism is used to tweak the default settings to MORE on FreeBSD.
(merge 995bc22 ew/build-time-pager-tweaks later to maint).
* The http-backend (the server-side component of smart-http
transport) used to trickle the HTTP header one at a time. Now
these write(2)s are batched.
(merge b36045c ew/http-backend-batch-headers later to maint).
* When "git rebase" tries to compare set of changes on the updated
upstream and our own branch, it computes patch-id for all of these
changes and attempts to find matches. This has been optimized by
lazily computing the full patch-id (which is expensive) to be
compared only for changes that touch the same set of paths.
(merge b3dfeeb kw/patch-ids-optim later to maint).
* A handful of tests that were broken under gettext-poison build have
been fixed.
* The recent i18n patch we added during this cycle did a bit too much
refactoring of the messages to avoid word-legos; the repetition has
been reduced to help translators.
Also contains various documentation updates and code clean-ups.
Fixes since v2.9
----------------
Unless otherwise noted, all the fixes since v2.8 in the maintenance
track are contained in this release (see the maintenance releases'
notes for details).
* The commands in `git log` family take %C(auto) in a custom format
string. This unconditionally turned the color on, ignoring
--no-color or with --color=auto when the output is not connected to
a tty; this was corrected to make the format truly behave as
"auto".
* "git rev-list --count" whose walk-length is limited with "-n"
option did not work well with the counting optimized to look at the
bitmap index.
* "git show -W" (extend hunks to cover the entire function, delimited
by lines that match the "funcname" pattern) used to show the entire
file when a change added an entire function at the end of the file,
which has been fixed.
* The documentation set has been updated so that literal commands,
configuration variables and environment variables are consistently
typeset in fixed-width font and bold in manpages.
* "git svn propset" subcommand that was added in 2.3 days is
documented now.
* The documentation tries to consistently spell "GPG"; when
referring to the specific program name, "gpg" is used.
* "git reflog" stopped upon seeing an entry that denotes a branch
creation event (aka "unborn"), which made it appear as if the
reflog was truncated.
* The git-prompt scriptlet (in contrib/) was not friendly with those
who uses "set -u", which has been fixed.
* compat/regex code did not cleanly compile.
* A codepath that used alloca(3) to place an unbounded amount of data
on the stack has been updated to avoid doing so.
* "git update-index --add --chmod=+x file" may be usable as an escape
hatch, but not a friendly thing to force for people who do need to
use it regularly. "git add --chmod=+x file" can be used instead.
* Build improvements for gnome-keyring (in contrib/)
* "git status" used to say "working directory" when it meant "working
tree".
* Comments about misbehaving FreeBSD shells have been clarified with
the version number (9.x and before are broken, newer ones are OK).
* "git cherry-pick A" worked on an unborn branch, but "git
cherry-pick A..B" didn't.
* Fix an unintended regression in v2.9 that breaks "clone --depth"
that recurses down to submodules by forcing the submodules to also
be cloned shallowly, which many server instances that host upstream
of the submodules are not prepared for.
* Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
to set the default value, without enclosing it in double quotes.
* Some platform-specific code had non-ANSI strict declarations of C
functions that do not take any parameters, which has been
corrected.
* The internal code used to show local timezone offset is not
prepared to handle timestamps beyond year 2100, and gave a
bogus offset value to the caller. Use a more benign looking
+0000 instead and let "git log" going in such a case, instead
of aborting.
* One among four invocations of readlink(1) in our test suite has
been rewritten so that the test can run on systems without the
command (others are in valgrind test framework and t9802).
* t/perf needs /usr/bin/time with GNU extension; the invocation of it
is updated to "gtime" on Darwin.
* A bug, which caused "git p4" while running under verbose mode to
report paths that are omitted due to branch prefix incorrectly, has
been fixed; the command said "Ignoring file outside of prefix" for
paths that are _inside_.
* The top level documentation "git help git" still pointed at the
documentation set hosted at now-defunct google-code repository.
Update it to point to https://git.github.io/htmldocs/git.html
instead.
* A helper function that takes the contents of a commit object and
finds its subject line did not ignore leading blank lines, as is
commonly done by other codepaths. Make it ignore leading blank
lines to match.
* For a long time, we carried an in-code comment that said our
colored output would work only when we use fprintf/fputs on
Windows, which no longer is the case for the past few years.
* "gc.autoPackLimit" when set to 1 should not trigger a repacking
when there is only one pack, but the code counted poorly and did
so.
* Add a test to specify the desired behaviour that currently is not
available in "git rebase -Xsubtree=...".
* More mark-up updates to typeset strings that are expected to
literally typed by the end user in fixed-width font.
* "git commit --amend --allow-empty-message -S" for a commit without
any message body could have misidentified where the header of the
commit object ends.
* "git rebase -i --autostash" did not restore the auto-stashed change
when the operation was aborted.
* Git does not know what the contents in the index should be for a
path added with "git add -N" yet, so "git grep --cached" should not
show hits (or show lack of hits, with -L) in such a path, but that
logic does not apply to "git grep", i.e. searching in the working
tree files. But we did so by mistake, which has been corrected.
* "git blame -M" missed a single line that was moved within the file.
* Fix recently introduced codepaths that are involved in parallel
submodule operations, which gave up on reading too early, and
could have wasted CPU while attempting to write under a corner
case condition.
* "git grep -i" has been taught to fold case in non-ascii locales
correctly.
* A test that unconditionally used "mktemp" learned that the command
is not necessarily available everywhere.
* There are certain house-keeping tasks that need to be performed at
the very beginning of any Git program, and programs that are not
built-in commands had to do them exactly the same way as "git"
potty does. It was easy to make mistakes in one-off standalone
programs (like test helpers). A common "main()" function that
calls cmd_main() of individual program has been introduced to
make it harder to make mistakes.
(merge de61ceb jk/common-main later to maint).
* The test framework learned a new helper test_match_signal to
check an exit code from getting killed by an expected signal.
* General code clean-up around a helper function to write a
single-liner to a file.
(merge 7eb6e10 jk/write-file later to maint).
* One part of "git am" had an oddball helper function that called
stuff from outside "his" as opposed to calling what we have "ours",
which was not gender-neutral and also inconsistent with the rest of
the system where outside stuff is usuall called "theirs" in
contrast to "ours".
* "git blame file" allowed the lineage of lines in the uncommitted,
unadded contents of "file" to be inspected, but it refused when
"file" did not appear in the current commit. When "file" was
created by renaming an existing file (but the change has not been
committed), this restriction was unnecessarily tight.
* "git add -N dir/file && git write-tree" produced an incorrect tree
when there are other paths in the same directory that sorts after
"file".
* "git fetch http://user:pass@host/repo..." scrubbed the userinfo
part, but "git push" didn't.
* "git merge" with renormalization did not work well with
merge-recursive, due to "safer crlf" conversion kicking in when it
shouldn't.
(merge 1335d76 jc/renormalize-merge-kill-safer-crlf later to maint).
* The use of strbuf in "git rm" to build filename to remove was a bit
suboptimal, which has been fixed.
* An age old bug that caused "git diff --ignore-space-at-eol"
misbehave has been fixed.
* "git notes merge" had a code to see if a path exists (and fails if
it does) and then open the path for writing (when it doesn't).
Replace it with open with O_EXCL.
* "git pack-objects" and "git index-pack" mostly operate with off_t
when talking about the offset of objects in a packfile, but there
were a handful of places that used "unsigned long" to hold that
value, leading to an unintended truncation.
* Recent update to "git daemon" tries to enable the socket-level
KEEPALIVE, but when it is spawned via inetd, the standard input
file descriptor may not necessarily be connected to a socket.
Suppress an ENOTSOCK error from setsockopt().
* Recent FreeBSD stopped making perl available at /usr/bin/perl;
switch the default the built-in path to /usr/local/bin/perl on not
too ancient FreeBSD releases.
* "git commit --help" said "--no-verify" is only about skipping the
pre-commit hook, and failed to say that it also skipped the
commit-msg hook.
* "git merge" in Git v2.9 was taught to forbid merging an unrelated
lines of history by default, but that is exactly the kind of thing
the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
"git subtree" has been taught to use the "--allow-unrelated-histories"
option to override the default.
* The build procedure for "git persistent-https" helper (in contrib/)
has been updated so that it can be built with more recent versions
of Go.
* There is an optimization used in "git diff $treeA $treeB" to borrow
an already checked-out copy in the working tree when it is known to
be the same as the blob being compared, expecting that open/mmap of
such a file is faster than reading it from the object store, which
involves inflating and applying delta. This however kicked in even
when the checked-out copy needs to go through the convert-to-git
conversion (including the clean filter), which defeats the whole
point of the optimization. The optimization has been disabled when
the conversion is necessary.
* "git -c grep.patternType=extended log --basic-regexp" misbehaved
because the internal API to access the grep machinery was not
designed well.
* Windows port was failing some tests in t4130, due to the lack of
inum in the returned values by its lstat(2) emulation.
* The reflog output format is documented better, and a new format
--date=unix to report the seconds-since-epoch (without timezone)
has been added.
(merge 442f6fd jk/reflog-date later to maint).
* "git difftool <paths>..." started in a subdirectory failed to
interpret the paths relative to that directory, which has been
fixed.
* The characters in the label shown for tags/refs for commits in
"gitweb" output are now properly escaped for proper HTML output.
* FreeBSD can lie when asked mtime of a directory, which made the
untracked cache code to fall back to a slow-path, which in turn
caused tests in t7063 to fail because it wanted to verify the
behaviour of the fast-path.
* Squelch compiler warnings for nedmalloc (in compat/) library.
* A small memory leak in the command line parsing of "git blame"
has been plugged.
* The API documentation for hashmap was unclear if hashmap_entry
can be safely discarded without any other consideration. State
that it is safe to do so.
* Not-so-recent rewrite of "git am" that started making internal
calls into the commit machinery had an unintended regression, in
that no matter how many seconds it took to apply many patches, the
resulting committer timestamp for the resulting commits were all
the same.
* "git push --force-with-lease" already had enough logic to allow
ensuring that such a push results in creation of a ref (i.e. the
receiving end did not have another push from sideways that would be
discarded by our force-pushing), but didn't expose this possibility
to the users. It does so now.
(merge 9eed4f3 jk/push-force-with-lease-creation later to maint).
* The mechanism to limit the pack window memory size, when packing is
done using multiple threads (which is the default), is per-thread,
but this was not documented clearly.
(merge 954176c ms/document-pack-window-memory-is-per-thread later to maint).
* "import-tars" fast-import script (in contrib/) used to ignore a
hardlink target and replaced it with an empty file, which has been
corrected to record the same blob as the other file the hardlink is
shared with.
(merge 04e0869 js/import-tars-hardlinks later to maint).
* "git mv dir non-existing-dir/" did not work in some environments
the same way as existing mainstream platforms. The code now moves
"dir" to "non-existing-dir", without relying on rename("A", "B/")
that strips the trailing slash of '/'.
(merge 189d035 js/mv-dir-to-new-directory later to maint).
* The "t/" hierarchy is prone to get an unusual pathname; "make test"
has been taught to make sure they do not contain paths that cannot
be checked out on Windows (and the mechanism can be reusable to
catch pathnames that are not portable to other platforms as need
arises).
(merge c2cafd3 js/test-lint-pathname later to maint).
* When "git merge-recursive" works on history with many criss-cross
merges in "verbose" mode, the names the command assigns to the
virtual merge bases could have overwritten each other by unintended
reuse of the same piece of memory.
(merge 5447a76 rs/pull-signed-tag later to maint).
* "git checkout --detach <branch>" used to give the same advice
message as that is issued when "git checkout <tag>" (or anything
that is not a branch name) is given, but asking with "--detach" is
an explicit enough sign that the user knows what is going on. The
advice message has been squelched in this case.
(merge 779b88a sb/checkout-explit-detach-no-advice later to maint).
* "git difftool" by default ignores the error exit from the backend
commands it spawns, because often they signal that they found
differences by exiting with a non-zero status code just like "diff"
does; the exit status codes 126 and above however are special in
that they are used to signal that the command is not executable,
does not exist, or killed by a signal. "git difftool" has been
taught to notice these exit status codes.
(merge 45a4f5d jk/difftool-command-not-found later to maint).
* On Windows, help.browser configuration variable used to be ignored,
which has been corrected.
(merge 6db5967 js/no-html-bypass-on-windows later to maint).
* The "git -c var[=val] cmd" facility to append a configuration
variable definition at the end of the search order was described in
git(1) manual page, but not in git-config(1), which was more likely
place for people to look for when they ask "can I make a one-shot
override, and if so how?"
(merge ae1f709 dg/document-git-c-in-git-config-doc later to maint).
* The tempfile (hence its user lockfile) API lets the caller to open
a file descriptor to a temporary file, write into it and then
finalize it by first closing the filehandle and then either
removing or renaming the temporary file. When the process spawns a
subprocess after obtaining the file descriptor, and if the
subprocess has not exited when the attempt to remove or rename is
made, the last step fails on Windows, because the subprocess has
the file descriptor still open. Open tempfile with O_CLOEXEC flag
to avoid this (on Windows, this is mapped to O_NOINHERIT).
(merge 05d1ed6 bw/mingw-avoid-inheriting-fd-to-lockfile later to maint).
* Other minor clean-ups and documentation updates
(merge 02a8cfa rs/merge-add-strategies-simplification later to maint).
(merge af4941d rs/merge-recursive-string-list-init later to maint).
(merge 1eb47f1 rs/use-strbuf-add-unique-abbrev later to maint).
(merge ddd0bfa jk/tighten-alloc later to maint).
(merge ecf30b2 rs/mailinfo-lib later to maint).
(merge 0eb75ce sg/reflog-past-root later to maint).
(merge 175d38c hv/doc-commit-reference-style later to maint).
----------------------------------------------------------------
Changes since v2.9.0 are as follows:
Alex Henrie (1):
unpack-trees: fix English grammar in do-this-before-that messages
Alexander Hirsch (1):
pull: warn on --verify-signatures with --rebase
Alfred Perlstein (1):
git-svn: document the 'git svn propset' command
Andreas Brauchli (1):
gitweb: escape link body in format_ref_marker
Andrew Oakley (1):
git-p4: correct hasBranchPrefix verbose output
Antoine Queru (1):
upload-pack.c: use parse-options API
Armin Kunaschik (2):
t7800: readlink may not be available
t7610: test for mktemp before test execution
Ben Wijen (2):
t6026-merge-attr: child processes must not inherit index.lock handles
mingw: ensure temporary file handles are not inherited by child processes
Charles Bailey (4):
t7810: fix duplicated test title
t7810-grep.sh: fix duplicated test name
t7810-grep.sh: fix a whitespace inconsistency
grep: fix grepping for "intent to add" files
Chris Packham (1):
completion: add option '--recurse-submodules' to 'git clone'
Christian Couder (50):
builtin/apply: make gitdiff_verify_name() return void
builtin/apply: avoid parameter shadowing 'p_value' global
builtin/apply: avoid parameter shadowing 'linenr' global
builtin/apply: avoid local variable shadowing 'len' parameter
builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
builtin/apply: move 'options' variable into cmd_apply()
builtin/apply: move 'read_stdin' global into cmd_apply()
builtin/apply: introduce 'struct apply_state' to start libifying
builtin/apply: move 'state' init into init_apply_state()
builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
builtin/apply: move 'check' global into 'struct apply_state'
builtin/apply: move 'check_index' global into 'struct apply_state'
builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
builtin/apply: move 'update_index' global into 'struct apply_state'
builtin/apply: move 'allow_overlap' global into 'struct apply_state'
builtin/apply: move 'cached' global into 'struct apply_state'
builtin/apply: move 'diffstat' global into 'struct apply_state'
builtin/apply: move 'numstat' global into 'struct apply_state'
builtin/apply: move 'summary' global into 'struct apply_state'
builtin/apply: move 'threeway' global into 'struct apply_state'
builtin/apply: move 'no_add' global into 'struct apply_state'
builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
builtin/apply: move 'line_termination' global into 'struct apply_state'
builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
builtin/apply: move 'p_context' global into 'struct apply_state'
builtin/apply: move 'apply' global into 'struct apply_state'
builtin/apply: move 'patch_input_file' global into 'struct apply_state'
builtin/apply: move 'limit_by_name' global into 'struct apply_state'
builtin/apply: move 'has_include' global into 'struct apply_state'
builtin/apply: move 'p_value' global into 'struct apply_state'
builtin/apply: move 'p_value_known' global into 'struct apply_state'
builtin/apply: move 'root' global into 'struct apply_state'
builtin/apply: move 'whitespace_error' global into 'struct apply_state'
builtin/apply: move 'whitespace_option' into 'struct apply_state'
builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
builtin/apply: move 'ws_error_action' into 'struct apply_state'
builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
builtin/apply: move 'state_linenr' global into 'struct apply_state'
builtin/apply: move 'fn_table' global into 'struct apply_state'
builtin/apply: move 'symlink_changes' global into 'struct apply_state'
builtin/apply: move 'state' check into check_apply_state()
builtin/apply: move applying patches into apply_all_patches()
builtin/apply: add 'lock_file' pointer into 'struct apply_state'
builtin/apply: move 'newfd' global into 'struct apply_state'
.mailmap: use Christian Couder's Tuxfamily address
Christopher Layne (1):
git-svn: clone: Fail on missing url argument
Dave Nicolson (1):
Documentation: GPG capitalization
David A. Greene (1):
contrib/subtree: Add a test for subtree rebase that loses commits
David Aguilar (6):
t7900-subtree.sh: fix quoting and broken && chains
subtree: fix "git subtree split --rejoin"
subtree: adjust style to match CodingGuidelines
subtree: adjust function definitions to match CodingGuidelines
difftool: avoid $GIT_DIR and $GIT_WORK_TREE
difftool: use Git::* functions instead of passing around state
David Glasser (1):
doc: mention `git -c` in git-config(1)
David Kastrup (1):
blame: require 0 context lines while finding moved lines with -M
David Turner (3):
refs: allow log-only updates
refs: don't dereference on rename
mailmap: use main email address for dturner
Ed Maste (1):
rebase: update comment about FreeBSD /bin/sh
Edward Thomson (2):
format_commit_message: honor `color=auto` for `%C(auto)`
add: add --chmod=+x / --chmod=-x options
Elia Pinto (2):
http.c: implement the GIT_TRACE_CURL environment variable
imap-send.c: introduce the GIT_TRACE_CURL enviroment variable
Eric Sunshine (1):
blame: drop strdup of string literal
Eric Wong (24):
fast-import: implement unpack limit
daemon: enable SO_KEEPALIVE for all sockets
fast-import: invalidate pack_id references after loosening
pretty: support "mboxrd" output format
mailsplit: support unescaping mboxrd messages
am: support --patch-format=mboxrd
git-svn: skip mergeinfo handling with --no-follow-parent
gc: fix off-by-one error with gc.autoPackLimit
xread: retry after poll on EAGAIN/EWOULDBLOCK
xwrite: poll on non-blocking FDs
git-svn: warn instead of dying when commit data is missing
hoist out handle_nonblock function for xread and xwrite
config.mak.uname: define NEEDS_LIBRT under Linux, for now
http-walker: remove unused parameter from fetch_object
http: avoid disconnecting on 404s for loose objects
http-walker: reduce O(n) ops with doubly-linked list
list: avoid incompatibility with *BSD sys/queue.h
daemon: ignore ENOTSOCK from setsockopt
configure.ac: stronger test for pthread linkage
git-svn: document svn.authorsProg in config
git-svn: allow --version to work anywhere
git svn: migrate tests to use lib-httpd
pager: move pager-specific setup into the build
http-backend: buffer headers before sending
Heiko Becker (1):
gnome-keyring: Don't hard-code pkg-config executable
Heiko Voigt (4):
submodule-config: passing name reference for .gitmodule blobs
submodule-config: combine early return code into one goto
submodule-config: fix test binary crashing when no arguments given
SubmittingPatches: document how to reference previous commits
Ingo Brückl (3):
t3700: remove unwanted leftover files before running new tests
t3700: merge two tests into one
t3700: add a test_mode_in_index helper function
Jacob Keller (1):
completion: add completion for --submodule=* diff option
Jean-Noel Avila (3):
i18n: fix typos for translation
i18n: fix git rebase interactive commit messages
i18n: simplify numeric error reporting
Jeff King (107):
git_config_with_options: drop "found" counting
git_config_parse_parameter: refactor cleanup code
config: set up config_source for command-line config
config: return configset value for current_config_ functions
config: add a notion of "scope"
upload-pack: provide a hook for running pack-objects
rev-list: "adjust" results of "--count --use-bitmap-index -n"
rev-list: disable bitmaps when "-n" is used with listing objects
tree-diff: avoid alloca for large allocations
send-pack: use buffered I/O to talk to pack-objects
parse_opt_string_list: stop allocating new strings
interpret-trailers: don't duplicate option strings
blame,shortlog: don't make local option variables static
use string_list initializer consistently
fetch: document that pruning happens before fetching
repack: document --unpack-unreachable option
repack: add --keep-unreachable option
repack: extend --keep-unreachable to loose objects
add--interactive: respect diff.compactionHeuristic
bisect: always call setup_revisions after init_revisions
gpg-interface: use child_process.args
verify_signed_buffer: drop pbuf variable
verify_signed_buffer: use tempfile object
run-command: add pipe_command helper
verify_signed_buffer: use pipe_command
sign_buffer: use pipe_command
t0006: rename test-date's "show" to "relative"
t0006: test various date formats
local_tzoffset: detect errors from tm_to_time_t
t/perf: fix regression in testing older versions of git
p4211: explicitly disable renames in no-rename test
color: fix max-size comment
doc: refactor description of color format
add skip_prefix_mem helper
color: refactor parse_attr
color: allow "no-" for negating attributes
color: support "italic" attribute
color: support strike-through attribute
t9300: factor out portable "head -c" replacement
t5000: test tar files that overflow ustar headers
archive-tar: write extended headers for file sizes >= 8GB
archive-tar: write extended headers for far-future mtime
archive-tar: drop return value
add an extra level of indirection to main()
common-main: call git_extract_argv0_path()
common-main: call sanitize_stdfds()
common-main: call restore_sigpipe_to_default()
common-main: call git_setup_gettext()
tests: factor portable signal check out of t0005
t0005: use test_match_signal as appropriate
test_must_fail: use test_match_signal
t/lib-git-daemon: use test_match_signal
parse_options: allocate a new array when concatenating
Makefile: drop extra dependencies for test helpers
Makefile: use VCSSVN_LIB to refer to svn library
config: fix bogus fd check when setting up default config
branch: use non-gentle write_file for branch description
write_file: drop "gently" form
write_file: use xopen
write_file: add pointer+len variant
write_file: add format attribute
use write_file_buf where applicable
branch: use write_file_buf instead of write_file
walker: let walker_say take arbitrary formats
avoid using sha1_to_hex output as printf format
push: anonymize URL in status output
t0006: skip "far in the future" test when unsigned long is not long enough
check_everything_connected: always pass --quiet to rev-list
rev-list: add optional progress reporting
check_everything_connected: convert to argv_array
check_everything_connected: use a struct with named options
check_connected: relay errors to alternate descriptor
check_connected: add progress flag
clone: use a real progress meter for connectivity check
index-pack: add flag for showing delta-resolution progress
receive-pack: turn on index-pack resolving progress
receive-pack: relay connectivity errors to sideband
receive-pack: turn on connectivity progress
receive-pack: send keepalives during quiet periods
t5541: fix url scrubbing test when GPG is not set
diff: do not reuse worktree files that need "clean" conversion
contrib/git-jump: fix greedy regex when matching hunks
contrib/git-jump: add whitespace-checking mode
contrib/git-jump: fix typo in README
doc/rev-list-options: clarify "commit@{Nth}" for "-g" option
doc/rev-list-options: explain "-g" output formats
doc/pretty-formats: describe index/time formats for %gd
doc/pretty-formats: explain shortening of %gd
t4205: drop top-level &&-chaining
t4205: indent here documents
date: document and test "raw-local" mode
date: add "unix" format
t/perf: add tests for many-pack scenarios
sha1_file: drop free_pack_by_name
add generic most-recently-used list
find_pack_entry: replace last_found_pack with MRU cache
pack-objects: break out of want_object loop early
pack-objects: compute local/ignore_pack_keep early
am: reset cached ident date for each patch
trace: handle NULL argument in trace_disable()
trace: stop using write_or_whine_pipe()
trace: use warning() for printing trace errors
trace: cosmetic fixes for error messages
trace: correct variable name in write() error message
trace: disable key after write error
write_or_die: drop write_or_whine_pipe()
trace: do not fall back to stderr
Joey Hess (1):
clarify %f documentation
Johannes Schindelin (59):
mingw: let the build succeed with DEVELOPER=1
perf: accommodate for MacOSX
pretty: make the skip_blank_lines() function public
commit.c: make find_commit_subject() more robust
t2300: "git --exec-path" is not usable in $PATH on Windows as-is
log: prepare log/log-tree to reuse the diffopt.close_file attribute
log-tree: respect diffopt's configured output file stream
line-log: respect diffopt's configured output file stream
graph: respect the diffopt.file setting
shortlog: support outputting to streams other than stdout
format-patch: explicitly switch off color when writing to files
format-patch: avoid freopen()
format-patch: use stdout directly
shortlog: respect the --output=<file> setting
t4211: ensure that log respects --output=<file>
color.h: remove obsolete comment about limitations on Windows
diff: do not color output when --color=auto and --output=<file> is given
t3404: fix a grammo (commands are ran -> commands are run)
commit -C: skip blank lines at the beginning of the message
sequencer: use skip_blank_lines() to find the commit subject
reset --hard: skip blank lines when reporting the commit subject
commit -S: avoid invalid pointer with empty message
mingw: declare main()'s argv as const
t3404: add a test for the --gpg-sign option
rebase -i: demonstrate a bug with --autosquash
rebase -i: we allow extra spaces after fixup!/squash!
am: counteract gender bias
diff: demonstrate a bug with --patience and --ignore-space-at-eol
diff: fix a double off-by-one with --ignore-space-at-eol
t/test-lib.sh: fix running tests with --valgrind
mingw: fix the shortlog --output=<file> test
mingw: fix regression in t1308-config-set
fsck: refactor how to describe objects
fsck_walk(): optionally name objects on the go
fsck: give the error function a chance to see the fsck_options
fsck: optionally show more helpful info for broken links
t5520: verify that `pull --rebase` shows the helpful advice when failing
die("bug"): report bugs consistently
die(_("BUG")): avoid translating bug messages
merge-recursive: clarify code in was_tracked()
prepare the builtins for a libified merge_recursive()
merge_recursive: abort properly upon errors
merge-recursive: avoid returning a wholesale struct
merge-recursive: allow write_tree_from_memory() to error out
merge-recursive: handle return values indicating errors
merge-recursive: switch to returning errors instead of dying
am -3: use merge_recursive() directly again
merge-recursive: flush output buffer before printing error messages
merge-recursive: write the commit title in one go
merge-recursive: offer an option to retain the output in 'obuf'
merge_trees(): ensure that the callers release output buffer
merge-recursive: flush output buffer even when erroring out
import-tars: support hard links
t5533: make it pass on case-sensitive filesystems
nedmalloc: fix misleading indentation
git mv: do not keep slash in `git mv dir non-existing-dir/`
t/Makefile: ensure that paths are valid on platforms we care
rev-parse: respect core.hooksPath in --git-path
Revert "display HTML in default browser using Windows' shell API"
Johannes Sixt (7):
Windows: add missing definition of ENOTSOCK
git-submodule: forward exit code of git-submodule--helper more faithfully
submodule-helper: fix indexing in clone retry error reporting path
rebase-interactive: trim leading whitespace from progress count
t4130: work around Windows limitation
config.c: avoid duplicated global static variables
commit-slab.h: avoid duplicated global static variables
John Keeping (5):
difftool: fix argument handling in subdirs
Documentation/git-push: fix placeholder formatting
push: add shorthand for --force-with-lease branch creation
push: allow pushing new branches with --force-with-lease
difftool: always honor fatal error exit codes
Jonathan Nieder (1):
doc: git-htmldocs.googlecode.com is no more
Jonathan Tan (1):
fetch-pack: grow stateless RPC windows exponentially
Jordan DE GEA (1):
worktree: allow "-" short-hand for @{-1} in add command
Josef Kufner (1):
pretty: pass graph width to pretty formatting for use in '%>|(N)'
Josh Triplett (1):
format-patch: format.from gives the default for --from
Junio C Hamano (42):
send-email: detect and offer to skip backup files
pathspec: rename free_pathspec() to clear_pathspec()
t1308: do not get fooled by symbolic links to the source tree
builtin/apply: remove misleading comment on lock_file field
blame, line-log: do not loop around deref_tag()
Start the post-2.9 cycle
clone: do not let --depth imply --shallow-submodules
Start preparing for 2.9.1
Second batch of topics for 2.10
More fixes for 2.9.1
Third batch of topics for 2.10
commit.c: remove print_commit_list()
Fourth batch of topics for 2.10
Git 2.9.1
merge: avoid "safer crlf" during recording of merge results
Fifth batch of topics for 2.10
diff: document diff-filter exclusion
Git 2.9.2
archive-tar: huge offset and future timestamps would not work on 32-bit
Sixth batch of topics for 2.10
grep: further simplify setting the pattern type
Seventh batch of topics for 2.10
date: clarify --date=raw description
Some fixes for 2.9.3
t9100: portability fix
Eighth batch of topics for 2.10
hashmap: clarify that hashmap_entry can safely be discarded
Ninth batch of topics for 2.10
Tenth batch for 2.10
Hopefully final batch for 2.9.3
Eleventh batch for 2.10
Yet another batch for 2.9.3
Twelfth batch for 2.10
Git 2.9.3
Final batch before 2.10-rc0
Git 2.10-rc0
Relnotes: decribe the updates to the "text=auto" attribute
relnotes: redo the description of text=auto fix
RelNotes: final batch of topics before -rc1
Git 2.10-rc1
Prepare for 2.10.0-rc2
Git 2.10-rc2
Keith McGuigan (1):
builtin/fetch.c: don't free remote->name after fetch
Kevin Willford (4):
patch-ids: stop using a hand-rolled hashmap implementation
patch-ids: replace the seen indicator with a commit pointer
patch-ids: add flag to create the diff patch id using header only data
rebase: avoid computing unnecessary patch IDs
LE Manh Cuong (1):
sh-setup: enclose setting of ${VAR=default} in double-quotes
Lars Schneider (2):
git-p4: place temporary refs used for branch import under refs/git-p4-tmp
travis-ci: enable web server tests t55xx on Linux
Lars Vogel (1):
Use "working tree" instead of "working directory" for git status
Linus Torvalds (1):
gpg-interface: prefer "long" key format output when verifying pgp signatures
Lukas Fleischer (4):
receive-pack: send auto-gc output over sideband 2
sideband.c: make send_sideband() return void
upload-pack.c: make send_client_data() return void
sideband.c: refactor recv_sideband()
Matthieu Moy (9):
Documentation/git-mv.txt: fix whitespace indentation
doc: typeset short command-line options as literal
doc: typeset long command-line options as literal
doc: typeset '--' as literal
doc: typeset long options with argument as literal
CodingGuidelines: formatting HEAD in documentation
doc: typeset HEAD and variants as literal
status: suggest 'git merge --abort' when appropriate
git-multimail: update to release 1.4.0
Mehul Jain (3):
t4202: refactor test
log: add "--no-show-signature" command line option
log: add log.showSignature configuration variable
Michael Haggerty (50):
t1404: demonstrate a bug resolving references
commit_ref(): if there is an empty dir in the way, delete it
read_raw_ref(): don't get confused by an empty directory
safe_create_leading_directories(): improve docstring
remove_dir_recursively(): add docstring
refname_is_safe(): use skip_prefix()
refname_is_safe(): don't allow the empty string
refname_is_safe(): insist that the refname already be normalized
commit_ref_update(): write error message to *err, not stderr
rename_ref(): remove unneeded local variable
ref_transaction_commit(): remove local variables n and updates
read_raw_ref(): rename flags argument to type
read_raw_ref(): clear *type at start of function
read_raw_ref(): rename symref argument to referent
read_raw_ref(): improve docstring
read_raw_ref(): move docstring to header file
lock_ref_sha1_basic(): remove unneeded local variable
refs: make error messages more consistent
ref_transaction_create(): disallow recursive pruning
ref_transaction_commit(): correctly report close_ref() failure
delete_branches(): use resolve_refdup()
verify_refname_available(): adjust constness in declaration
add_update(): initialize the whole ref_update
lock_ref_for_update(): new function
unlock_ref(): move definition higher in the file
ref_transaction_update(): check refname_is_safe() at a minimum
refs: resolve symbolic refs first
lock_ref_for_update(): don't re-read non-symbolic references
lock_ref_for_update(): don't resolve symrefs
commit_ref_update(): remove the flags parameter
lock_ref_sha1_basic(): only handle REF_NODEREF mode
refs: remove unnecessary "extern" keywords
do_for_each_ref(): move docstring to the header file
refs: use name "prefix" consistently
delete_refs(): add a flags argument
remote rm: handle symbolic refs correctly
get_ref_cache(): only create an instance if there is a submodule
entry_resolves_to_object(): rename function from ref_resolves_to_object()
ref_resolves_to_object(): new function
refs: introduce an iterator interface
do_for_each_ref(): reimplement using reference iteration
for_each_reflog(): don't abort for bad references
dir_iterator: new API for iterating over a directory tree
for_each_reflog(): reimplement using iterators
t1404: rename file to t1404-update-ref-errors.sh
t1404: remove "prefix" argument to test_update_rejected
t1404: document function test_update_rejected
t1404: add more tests of update-ref error handling
lock_ref_for_update(): make error handling more uniform
lock_ref_for_update(): avoid a symref resolution
Michael J Gruber (7):
cherry-pick: allow to pick to unborn branches
Documentation/technical: describe signature formats
Documentation/technical: signed tag format
Documentation/technical: signed commit format
Documentation/technical: signed merge tag format
gpg-interface: check gpg signature creation status
t/t91*: do not say how to avoid the tests
Michael Stahl (1):
document git-repack interaction of pack.threads and pack.windowMemory
Mike Hommey (2):
blame: allow to blame paths freshly added to the index
t/t8003-blame-corner-cases.sh: Use here documents
Nguyễn Thái Ngọc Duy (47):
completion: support git-worktree
worktree.c: rewrite mark_current_worktree() to avoid strbuf
git-worktree.txt: keep subcommand listing in alphabetical order
worktree.c: use is_dot_or_dotdot()
worktree: avoid 0{40}, too many zeroes, hard to read
worktree: simplify prefixing paths
worktree.c: add find_worktree()
worktree.c: add is_main_worktree()
lib-httpd.sh: print error.log on error
worktree.c: add is_worktree_locked()
pretty.c: support <direction>|(<negative number>) forms
new-command.txt: correct the command description file
grep: break down an "if" stmt in preparation for next changes
test-regex: isolate the bug test code
test-regex: expose full regcomp() to the command line
grep/icase: avoid kwsset on literal non-ascii strings
git-fetch.txt: document fetch output
fetch: refactor ref update status formatting code
fetch: change flag code for displaying tag update and deleted ref
grep/icase: avoid kwsset when -F is specified
grep: rewrite an if/else condition to avoid duplicate expression
grep/pcre: prepare locale-dependent tables for icase matching
gettext: add is_utf8_locale()
grep/pcre: support utf-8
diffcore-pickaxe: Add regcomp_or_die()
diffcore-pickaxe: support case insensitive match on non-ascii
grep.c: reuse "icase" variable
fetch: align all "remote -> local" output
fetch: reduce duplicate in ref update status lines with placeholder
connect: read $GIT_SSH_COMMAND from config file
worktree: add "lock" command
worktree: add "unlock" command
worktree.c: find_worktree() search by path suffix
pack-objects: pass length to check_pack_crc() without truncation
log: decorate HEAD -> branch with the same color for arrow and HEAD
sha1_file.c: use type off_t* for object_info->disk_sizep
index-pack: correct "len" type in unpack_data()
index-pack: report correct bad object offsets even if they are large
index-pack: correct "offset" type in unpack_entry_data()
pack-objects: do not truncate result in-pack object size on 32-bit systems
fsck: use streaming interface for large blobs in pack
test-lib.sh: introduce and use $EMPTY_TREE
test-lib.sh: introduce and use $EMPTY_BLOB
cache-tree.c: fix i-t-a entry skipping directory updates sometimes
cache-tree: do not generate empty trees as a result of all i-t-a subentries
config.mak.uname: correct perl path on FreeBSD
t7063: work around FreeBSD's lazy mtime update feature
Nicolas Pitre (1):
sideband.c: small optimization of strbuf usage
Orgad Shaneh (1):
commit: describe that --no-verify skips the commit-msg hook in the help text
Parker Moore (2):
contrib/persistent-https: update ldflags syntax for Go 1.7+
contrib/persistent-https: use Git version for build label
Patrick Steinhardt (1):
rebase -i: restore autostash on abort
Peter Colberg (2):
refs.h: fix misspelt "occurred" in a comment
config.c: fix misspelt "occurred" in an error message
Pranit Bauva (2):
builtin/commit.c: memoize git-path for COMMIT_EDITMSG
strbuf: describe the return value of strbuf_read_file
Ramsay Jones (2):
regex: fix a SIZE_MAX macro redefinition warning
write_or_die: remove the unused write_or_whine() function
René Scharfe (33):
t4051: rewrite, add more tests
xdiff: factor out match_func_rec()
xdiff: handle appended chunks better with -W
xdiff: ignore empty lines before added functions with -W
xdiff: -W: don't include common trailing empty lines in context
xdiff: don't trim common tail with -W
t7810: add test for grep -W and trailing empty context lines
grep: -W: don't extend context to trailing empty lines
xdiff: fix merging of appended hunk with -W
.gitattributes: set file type for C files
notes-merge: use O_EXCL to avoid overwriting existing files
am: ignore return value of write_file()
rm: reuse strbuf for all remove_dir_recursively() calls
worktree: use strbuf_add_absolute_path() directly
use strbuf_addbuf() for appending a strbuf to another
submodule-config: use explicit empty string instead of strbuf in config_from()
strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf()
use strbuf_addstr() for adding constant strings to a strbuf
pass constants as first argument to st_mult()
use strbuf_addstr() instead of strbuf_addf() with "%s"
use CHILD_PROCESS_INIT to initialize automatic variables
merge-recursive: use STRING_LIST_INIT_NODUP
merge: use string_list_split() in add_strategies()
nedmalloc: work around overzealous GCC 6 warning
archive-tar: make write_extended_header() void
use strbuf_add_unique_abbrev() for adding short hashes
correct FLEXPTR_* example in comment
mailinfo: recycle strbuf in check_header()
commit: use xstrdup() in get_merge_parent()
commit: factor out set_merge_remote_desc()
merge-recursive: fix verbose output for multiple base trees
commit: use FLEX_ARRAY in struct merge_remote_desc
receive-pack: use FLEX_ALLOC_MEM in queue_command()
Ronald Wampler (1):
Makefile: add NEEDS_LIBRT to optionally link with librt
SZEDER Gábor (2):
reflog: continue walking the reflog past root commits
t1410: remove superfluous 'git reflog' from the 'walk past root' test
Stefan Beller (23):
submodule update: make use of the existing fetch_in_submodule function
submodule-config: keep shallow recommendation around
submodule update: learn `--[no-]recommend-shallow` option
submodule--helper: initial clone learns retry logic
submodule update: continue when a clone fails
t5614: don't use subshells
push options: {pre,post}-receive hook learns about push options
receive-pack: implement advertising and receiving push options
push: accept push options
add a test for push options
Documentation: pack-protocol correct NAK response
submodule deinit: remove outdated comment
t7406: future proof tests with hard coded depth
submodule update: respect depth in subsequent fetches
submodule update: narrow scope of local variable
submodule--helper: fix usage string for relative-path
submodule-config: keep configured branch around
gitmodules: document shallow recommendation
submodule--helper: add remote-branch helper
submodule update: allow '.' for branch value
submodule--helper: use parallel processor correctly
t7406: fix breakage on OSX
checkout: do not mention detach advice for explicit --detach option
Thomas Braun (3):
completion: factor out untracked file modes into a variable
completion: add __git_get_option_value helper
completion: add git status
Tom Russello (4):
doc: clearer rule about formatting literals
doc: change environment variables format
doc: more consistency in environment variables format
doc: change configuration variables format
Torsten Bögershausen (4):
convert: unify the "auto" handling of CRLF
convert: Correct NNO tests and missing `LF will be replaced by CRLF`
git ls-files: text=auto eol=lf is supported in Git 2.10
gitattributes: Document the unified "auto" handling
Vasco Almeida (47):
i18n: builtin/remote.c: fix mark for translation
i18n: advice: mark string about detached head for translation
i18n: advice: internationalize message for conflicts
i18n: transport: mark strings for translation
i18n: sequencer: mark entire sentences for translation
i18n: rebase-interactive: mark here-doc strings for translation
i18n: sequencer: mark string for translation
i18n: rebase-interactive: mark comments of squash for translation
i18n: merge-octopus: mark messages for translation
i18n: setup: mark strings for translation
merge-octopus: use die shell function from git-sh-setup.sh
tests: use test_i18n* functions to suppress false positives
i18n: rebase: fix marked string to use eval_gettext variant
tests: unpack-trees: update to use test_i18n* functions
i18n: rebase: mark placeholder for translation
t9003: become resilient to GETTEXT_POISON
i18n: bisect: simplify error message for i18n
t4153: fix negated test_i18ngrep call
t6030: update to use test_i18ncmp
t5523: use test_i18ngrep for negation
i18n: git-sh-setup.sh: mark strings for translation
i18n: bisect: mark strings for translation
i18n: rebase-interactive: mark strings for translation
i18n: transport-helper.c: change N_() call to _()
i18n: notes: mark strings for translation
i18n: notes: mark options for translation
i18n: merge: mark messages for translation
i18n: merge: change command option help to lowercase
i18n: sequencer: add period to error message
i18n: standardise messages
i18n: remote: mark URL fallback text for translation
i18n: remote: allow translations to reorder message
i18n: init-db: join message pieces
i18n: submodule: join strings marked for translation
i18n: submodule: escape shell variables inside eval_gettext
i18n: unmark die messages for translation
i18n: branch: mark comment when editing branch description for translation
t5541: become resilient to GETTEXT_POISON
t5510: skip tests under GETTEXT_POISON build
i18n: notes: mark comment for translation
i18n: config: unfold error messages marked for translation
i18n: setup: mark error messages for translation
i18n: archive: mark errors for translation
i18n: git-stash: mark messages for translation
t3404: become resilient to GETTEXT_POISON
t5520: become resilient to GETTEXT_POISON
t7411: become resilient to GETTEXT_POISON
Ville Skyttä (3):
git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
completion: complete --delete, --move, and --remotes for git branch
Spelling fixes
William Duclot (1):
userdiff: add built-in pattern for CSS
brian m. carlson (11):
hex: add oid_to_hex_r()
contrib/coccinelle: add basic Coccinelle transforms
coccinelle: convert hashcpy() with null_sha1 to hashclr()
coccinelle: apply object_id Coccinelle transformations
diff: convert struct diff_filespec to struct object_id
diff: rename struct diff_filespec's sha1_valid member
merge-recursive: convert struct stage_data to use object_id
merge-recursive: convert struct merge_file_info to object_id
merge-recursive: convert leaf functions to use struct object_id
merge-recursive: convert merge_recursive_generic() to object_id
diff: convert prep_temp_blob() to struct object_id
^ permalink raw reply [relevance 3%]
* [ANNOUNCE] Git v2.10.0-rc1
@ 2016-08-19 23:10 3% Junio C Hamano
0 siblings, 0 replies; 22+ results
From: Junio C Hamano @ 2016-08-19 23:10 UTC (permalink / raw
To: git; +Cc: Linux Kernel
A release candidate Git v2.10.0-rc1 is now available for testing
at the usual places. It is comprised of 611 non-merge commits
since v2.9.0, contributed by 68 people, 20 of which are new faces.
Relative to v2.10-0-rc0 (the preview), there is a last-minute merge
of Linus's "Let's show longer fingerprint in the GPG output" patch
(which was a bit scary but I made sure push-certificate codepath
would not be negatively affected), among other small topics.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the
'v2.10.0-rc1' tag and the 'master' branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.9.0 are as follows.
Welcome to the Git development community!
Alexander Hirsch, Andreas Brauchli, Andrew Oakley, Antoine
Queru, Christopher Layne, Dave Nicolson, Ed Maste, Heiko Becker,
Ingo Brückl, Jonathan Tan, Jordan DE GEA, Josef Kufner, Keith
McGuigan, Kevin Willford, LE Manh Cuong, Michael Stahl, Parker
Moore, Peter Colberg, Tom Russello, and William Duclot.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Alex Henrie, Alfred Perlstein, Armin Kunaschik, brian m. carlson,
Charles Bailey, Chris Packham, Christian Couder, David A. Greene,
David Aguilar, David Kastrup, David Turner, Edward Thomson, Elia
Pinto, Eric Sunshine, Eric Wong, Heiko Voigt, Jacob Keller,
Jeff King, Joey Hess, Johannes Schindelin, Johannes Sixt,
John Keeping, Jonathan Nieder, Josh Triplett, Junio C Hamano,
Lars Schneider, Lars Vogel, Linus Torvalds, Lukas Fleischer,
Matthieu Moy, Mehul Jain, Michael Haggerty, Michael J Gruber,
Mike Hommey, Nguyễn Thái Ngọc Duy, Nicolas Pitre, Orgad
Shaneh, Patrick Steinhardt, Pranit Bauva, Ramsay Jones, René
Scharfe, Ronald Wampler, Stefan Beller, SZEDER Gábor, Thomas
Braun, Torsten Bögershausen, Vasco Almeida, and Ville Skyttä.
----------------------------------------------------------------
Git 2.10 Release Notes (draft)
==============================
Backward compatibility notes
----------------------------
Updates since v2.9
------------------
UI, Workflows & Features
* "git pull --rebase --verify-signature" learned to warn the user
that "--verify-signature" is a no-op when rebasing.
* An upstream project can make a recommendation to shallowly clone
some submodules in the .gitmodules file it ships.
* "git worktree add" learned that '-' can be used as a short-hand for
"@{-1}", the previous branch.
* Update the funcname definition to support css files.
* The completion script (in contrib/) learned to complete "git
status" options.
* Messages that are generated by auto gc during "git push" on the
receiving end are now passed back to the sending end in such a way
that they are shown with "remote: " prefix to avoid confusing the
users.
* "git add -i/-p" learned to honor diff.compactionHeuristic
experimental knob, so that the user can work on the same hunk split
as "git diff" output.
* "upload-pack" allows a custom "git pack-objects" replacement when
responding to "fetch/clone" via the uploadpack.packObjectsHook.
(merge b738396 jk/upload-pack-hook later to maint).
* Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
(merge d9925d1 ew/mboxrd-format-am later to maint).
* "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").
(merge e26a8c4 jk/repack-keep-unreachable later to maint).
* "log --graph --format=" learned that "%>|(N)" specifies the width
relative to the terminal's left edge, not relative to the area to
draw text that is to the right of the ancestry-graph section. It
also now accepts negative N that means the column limit is relative
to the right border.
* A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
(merge 531220b jc/send-email-skip-backup later to maint).
* "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.
* The output coloring scheme learned two new attributes, italic and
strike, in addition to existing bold, reverse, etc.
* "git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
(merge fce04c3 mj/log-show-signature-conf later to maint).
* More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
* "git archive" learned to handle files that are larger than 8GB and
commits far in the future than expressible by the traditional US-TAR
format.
(merge 5caeeb8 jk/big-and-future-archive-tar later to maint).
* A new configuration variable core.sshCommand has been added to
specify what value for GIT_SSH_COMMAND to use per repository.
* "git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location. "git worktree"
command learned a dedicated command pair to create and remove such
a file, so that the users do not have to do this with editor.
* A handful of "git svn" updates.
* "git push" learned to accept and pass extra options to the
receiving end so that hooks can read and react to them.
* "git status" learned to suggest "merge --abort" during a conflicted
merge, just like it already suggests "rebase --abort" during a
conflicted rebase.
* "git jump" script (in contrib/) has been updated a bit.
(merge a91e692 jk/git-jump later to maint).
* "git push" and "git clone" learned to give better progress meters
to the end user who is waiting on the terminal.
* An entry "git log --decorate" for the tip of the current branch is
shown as "HEAD -> name" (where "name" is the name of the branch);
the arrow is now painted in the same color as "HEAD", not in the
color for commits.
* "git format-patch" learned format.from configuration variable to
specify the default settings for its "--from" option.
* "git am -3" calls "git merge-recursive" when it needs to fall back
to a three-way merge; this call has been turned into an internal
subroutine call instead of spawning a separate subprocess.
* The command line completion scripts (in contrib/) now knows about
"git branch --delete/--move [--remote]".
(merge 2703c22 vs/completion-branch-fully-spelled-d-m-r later to maint).
* "git rev-parse --git-path hooks/<hook>" learned to take
core.hooksPath configuration variable (introduced during 2.9 cycle)
into account.
(merge 9445b49 ab/hooks later to maint).
* "git log --show-signature" and other commands that display the
verification status of PGP signature now shows the longer key-id,
as 32-bit key-id is so last century.
Performance, Internal Implementation, Development Support etc.
* "git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
* When "git daemon" is run without --[init-]timeout specified, a
connection from a client that silently goes offline can hang around
for a long time, wasting resources. The socket-level KEEPALIVE has
been enabled to allow the OS to notice such failed connections.
* "git upload-pack" command has been updated to use the parse-options
API.
* The "git apply" standalone program is being libified; the first
step to move many state variables into a structure that can be
explicitly (re)initialized to make the machinery callable more
than once has been merged.
* HTTP transport gained an option to produce more detailed debugging
trace.
(merge 73e57aa ep/http-curl-trace later to maint).
* Instead of taking advantage of the fact that a struct string_list
that is allocated with all NULs happens to be the INIT_NODUP kind,
the users of string_list structures are taught to initialize them
explicitly as such, to document their behaviour better.
(merge 2721ce2 jk/string-list-static-init later to maint).
* HTTPd tests learned to show the server error log to help diagnosing
a failing tests.
(merge 44f243d nd/test-lib-httpd-show-error-log-in-verbose later to maint).
* The ownership rule for the piece of memory that hold references to
be fetched in "git fetch" was screwy, which has been cleaned up.
* "git bisect" makes an internal call to "git diff-tree" when
bisection finds the culprit, but this call did not initialize the
data structure to pass to the diff-tree API correctly.
* Further preparatory clean-up for "worktree" feature continues.
(merge 0409e0b nd/worktree-cleanup-post-head-protection later to maint).
* Formats of the various data (and how to validate them) where we use
GPG signature have been documented.
* A new run-command API function pipe_command() is introduced to
sanely feed data to the standard input while capturing data from
the standard output and the standard error of an external process,
which is cumbersome to hand-roll correctly without deadlocking.
The codepath to sign data in a prepared buffer with GPG has been
updated to use this API to read from the status-fd to check for
errors (instead of relying on GPG's exit status).
(merge efee955 jk/gpg-interface-cleanup later to maint).
* Allow t/perf framework to use the features from the most recent
version of Git even when testing an older installed version.
* The commands in the "log/diff" family have had an FILE* pointer in the
data structure they pass around for a long time, but some codepaths
used to always write to the standard output. As a preparatory step
to make "git format-patch" available to the internal callers, these
codepaths have been updated to consistently write into that FILE*
instead.
* Conversion from unsigned char sha1[20] to struct object_id
continues.
* Improve the look of the way "git fetch" reports what happened to
each ref that was fetched.
* The .c/.h sources are marked as such in our .gitattributes file so
that "git diff -W" and friends would work better.
* Code clean-up to avoid using a variable string that compilers may
feel untrustable as printf-style format given to write_file()
helper function.
* "git p4" used a location outside $GIT_DIR/refs/ to place its
temporary branches, which has been moved to refs/git-p4-tmp/.
* Existing autoconf generated test for the need to link with pthread
library did not check all the functions from pthread libraries;
recent FreeBSD has some functions in libc but not others, and we
mistakenly thought linking with libc is enough when it is not.
* When "git fsck" reports a broken link (e.g. a tree object contains
a blob that does not exist), both containing object and the object
that is referred to were reported with their 40-hex object names.
The command learned the "--name-objects" option to show the path to
the containing object from existing refs (e.g. "HEAD~24^2:file.txt").
* Allow http daemon tests in Travis CI tests.
* Makefile assumed that -lrt is always available on platforms that
want to use clock_gettime() and CLOCK_MONOTONIC, which is not a
case for recent Mac OS X. The necessary symbols are often found in
libc on many modern systems and having -lrt on the command line, as
long as the library exists, had no effect, but when the platform
removes librt.a that is a different matter--having -lrt will break
the linkage.
This change could be seen as a regression for those who do need to
specify -lrt, as they now specifically ask for NEEDS_LIBRT when
building. Hopefully they are in the minority these days.
* Further preparatory work on the refs API before the pluggable
backend series can land.
* Error handling in the codepaths that updates refs has been
improved.
* The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
* The handling of the "text=auto" attribute has been corrected.
$ echo "* text=auto eol=crlf" >.gitattributes
used to have the same effect as
$ echo "* text eol=crlf" >.gitattributes
i.e. declaring all files are text (ignoring "auto"). The
combination has been fixed to be equivalent to doing
$ git config core.autocrlf true
* A few tests that specifically target "git rebase -i" have been
added.
* Dumb http transport on the client side has been optimized.
(merge ecba195 ew/http-walker later to maint).
* Users of the parse_options_concat() API function need to allocate
extra slots in advance and fill them with OPT_END() when they want
to decide the set of supported options dynamically, which makes the
code error-prone and hard to read. This has been corrected by tweaking
the API to allocate and return a new copy of "struct option" array.
* "git fetch" exchanges batched have/ack messages between the sender
and the receiver, initially doubling every time and then falling
back to enlarge the window size linearly. The "smart http"
transport, being an half-duplex protocol, outgrows the preset limit
too quickly and becomes inefficient when interacting with a large
repository. The internal mechanism learned to grow the window size
more aggressively when working with the "smart http" transport.
* Tests for "git svn" have been taught to reuse the lib-httpd test
infrastructure when testing the subversion integration that
interacts with subversion repositories served over the http://
protocol.
(merge a8a5d25 ew/git-svn-http-tests later to maint).
* "git pack-objects" has a few options that tell it not to pack
objects found in certain packfiles, which require it to scan .idx
files of all available packs. The codepaths involved in these
operations have been optimized for a common case of not having any
non-local pack and/or any .kept pack.
* The t3700 test about "add --chmod=-x" have been made a bit more
robust and generally cleaned up.
(merge 766cdc4 ib/t3700-add-chmod-x-updates later to maint).
* The build procedure learned PAGER_ENV knob that lists what default
environment variable settings to export for popular pagers. This
mechanism is used to tweak the default settings to MORE on FreeBSD.
(merge 995bc22 ew/build-time-pager-tweaks later to maint).
* The http-backend (the server-side component of smart-http
transport) used to trickle the HTTP header one at a time. Now
these write(2)s are batched.
(merge b36045c ew/http-backend-batch-headers later to maint).
* When "git rebase" tries to compare set of changes on the updated
upstream and our own branch, it computes patch-id for all of these
changes and attempts to find matches. This has been optimized by
lazily computing the full patch-id (which is expensive) to be
compared only for changes that touch the same set of paths.
(merge b3dfeeb kw/patch-ids-optim later to maint).
* A handful of tests that were broken under gettext-poison build have
been fixed.
Also contains various documentation updates and code clean-ups.
Fixes since v2.9
----------------
Unless otherwise noted, all the fixes since v2.8 in the maintenance
track are contained in this release (see the maintenance releases'
notes for details).
* The commands in `git log` family take %C(auto) in a custom format
string. This unconditionally turned the color on, ignoring
--no-color or with --color=auto when the output is not connected to
a tty; this was corrected to make the format truly behave as
"auto".
* "git rev-list --count" whose walk-length is limited with "-n"
option did not work well with the counting optimized to look at the
bitmap index.
* "git show -W" (extend hunks to cover the entire function, delimited
by lines that match the "funcname" pattern) used to show the entire
file when a change added an entire function at the end of the file,
which has been fixed.
* The documentation set has been updated so that literal commands,
configuration variables and environment variables are consistently
typeset in fixed-width font and bold in manpages.
* "git svn propset" subcommand that was added in 2.3 days is
documented now.
* The documentation tries to consistently spell "GPG"; when
referring to the specific program name, "gpg" is used.
* "git reflog" stopped upon seeing an entry that denotes a branch
creation event (aka "unborn"), which made it appear as if the
reflog was truncated.
* The git-prompt scriptlet (in contrib/) was not friendly with those
who uses "set -u", which has been fixed.
* compat/regex code did not cleanly compile.
* A codepath that used alloca(3) to place an unbounded amount of data
on the stack has been updated to avoid doing so.
* "git update-index --add --chmod=+x file" may be usable as an escape
hatch, but not a friendly thing to force for people who do need to
use it regularly. "git add --chmod=+x file" can be used instead.
* Build improvements for gnome-keyring (in contrib/)
* "git status" used to say "working directory" when it meant "working
tree".
* Comments about misbehaving FreeBSD shells have been clarified with
the version number (9.x and before are broken, newer ones are OK).
* "git cherry-pick A" worked on an unborn branch, but "git
cherry-pick A..B" didn't.
* Fix an unintended regression in v2.9 that breaks "clone --depth"
that recurses down to submodules by forcing the submodules to also
be cloned shallowly, which many server instances that host upstream
of the submodules are not prepared for.
* Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
to set the default value, without enclosing it in double quotes.
* Some platform-specific code had non-ANSI strict declarations of C
functions that do not take any parameters, which has been
corrected.
* The internal code used to show local timezone offset is not
prepared to handle timestamps beyond year 2100, and gave a
bogus offset value to the caller. Use a more benign looking
+0000 instead and let "git log" going in such a case, instead
of aborting.
* One among four invocations of readlink(1) in our test suite has
been rewritten so that the test can run on systems without the
command (others are in valgrind test framework and t9802).
* t/perf needs /usr/bin/time with GNU extension; the invocation of it
is updated to "gtime" on Darwin.
* A bug, which caused "git p4" while running under verbose mode to
report paths that are omitted due to branch prefix incorrectly, has
been fixed; the command said "Ignoring file outside of prefix" for
paths that are _inside_.
* The top level documentation "git help git" still pointed at the
documentation set hosted at now-defunct google-code repository.
Update it to point to https://git.github.io/htmldocs/git.html
instead.
* A helper function that takes the contents of a commit object and
finds its subject line did not ignore leading blank lines, as is
commonly done by other codepaths. Make it ignore leading blank
lines to match.
* For a long time, we carried an in-code comment that said our
colored output would work only when we use fprintf/fputs on
Windows, which no longer is the case for the past few years.
* "gc.autoPackLimit" when set to 1 should not trigger a repacking
when there is only one pack, but the code counted poorly and did
so.
* Add a test to specify the desired behaviour that currently is not
available in "git rebase -Xsubtree=...".
* More mark-up updates to typeset strings that are expected to
literally typed by the end user in fixed-width font.
* "git commit --amend --allow-empty-message -S" for a commit without
any message body could have misidentified where the header of the
commit object ends.
* "git rebase -i --autostash" did not restore the auto-stashed change
when the operation was aborted.
* Git does not know what the contents in the index should be for a
path added with "git add -N" yet, so "git grep --cached" should not
show hits (or show lack of hits, with -L) in such a path, but that
logic does not apply to "git grep", i.e. searching in the working
tree files. But we did so by mistake, which has been corrected.
* "git blame -M" missed a single line that was moved within the file.
* Fix recently introduced codepaths that are involved in parallel
submodule operations, which gave up on reading too early, and
could have wasted CPU while attempting to write under a corner
case condition.
* "git grep -i" has been taught to fold case in non-ascii locales
correctly.
* A test that unconditionally used "mktemp" learned that the command
is not necessarily available everywhere.
* There are certain house-keeping tasks that need to be performed at
the very beginning of any Git program, and programs that are not
built-in commands had to do them exactly the same way as "git"
potty does. It was easy to make mistakes in one-off standalone
programs (like test helpers). A common "main()" function that
calls cmd_main() of individual program has been introduced to
make it harder to make mistakes.
(merge de61ceb jk/common-main later to maint).
* The test framework learned a new helper test_match_signal to
check an exit code from getting killed by an expected signal.
* General code clean-up around a helper function to write a
single-liner to a file.
(merge 7eb6e10 jk/write-file later to maint).
* One part of "git am" had an oddball helper function that called
stuff from outside "his" as opposed to calling what we have "ours",
which was not gender-neutral and also inconsistent with the rest of
the system where outside stuff is usuall called "theirs" in
contrast to "ours".
* "git blame file" allowed the lineage of lines in the uncommitted,
unadded contents of "file" to be inspected, but it refused when
"file" did not appear in the current commit. When "file" was
created by renaming an existing file (but the change has not been
committed), this restriction was unnecessarily tight.
* "git add -N dir/file && git write-tree" produced an incorrect tree
when there are other paths in the same directory that sorts after
"file".
* "git fetch http://user:pass@host/repo..." scrubbed the userinfo
part, but "git push" didn't.
* "git merge" with renormalization did not work well with
merge-recursive, due to "safer crlf" conversion kicking in when it
shouldn't.
(merge 1335d76 jc/renormalize-merge-kill-safer-crlf later to maint).
* The use of strbuf in "git rm" to build filename to remove was a bit
suboptimal, which has been fixed.
* An age old bug that caused "git diff --ignore-space-at-eol"
misbehave has been fixed.
* "git notes merge" had a code to see if a path exists (and fails if
it does) and then open the path for writing (when it doesn't).
Replace it with open with O_EXCL.
* "git pack-objects" and "git index-pack" mostly operate with off_t
when talking about the offset of objects in a packfile, but there
were a handful of places that used "unsigned long" to hold that
value, leading to an unintended truncation.
* Recent update to "git daemon" tries to enable the socket-level
KEEPALIVE, but when it is spawned via inetd, the standard input
file descriptor may not necessarily be connected to a socket.
Suppress an ENOTSOCK error from setsockopt().
* Recent FreeBSD stopped making perl available at /usr/bin/perl;
switch the default the built-in path to /usr/local/bin/perl on not
too ancient FreeBSD releases.
* "git commit --help" said "--no-verify" is only about skipping the
pre-commit hook, and failed to say that it also skipped the
commit-msg hook.
* "git merge" in Git v2.9 was taught to forbid merging an unrelated
lines of history by default, but that is exactly the kind of thing
the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
"git subtree" has been taught to use the "--allow-unrelated-histories"
option to override the default.
* The build procedure for "git persistent-https" helper (in contrib/)
has been updated so that it can be built with more recent versions
of Go.
* There is an optimization used in "git diff $treeA $treeB" to borrow
an already checked-out copy in the working tree when it is known to
be the same as the blob being compared, expecting that open/mmap of
such a file is faster than reading it from the object store, which
involves inflating and applying delta. This however kicked in even
when the checked-out copy needs to go through the convert-to-git
conversion (including the clean filter), which defeats the whole
point of the optimization. The optimization has been disabled when
the conversion is necessary.
* "git -c grep.patternType=extended log --basic-regexp" misbehaved
because the internal API to access the grep machinery was not
designed well.
* Windows port was failing some tests in t4130, due to the lack of
inum in the returned values by its lstat(2) emulation.
* The reflog output format is documented better, and a new format
--date=unix to report the seconds-since-epoch (without timezone)
has been added.
(merge 442f6fd jk/reflog-date later to maint).
* "git difftool <paths>..." started in a subdirectory failed to
interpret the paths relative to that directory, which has been
fixed.
* The characters in the label shown for tags/refs for commits in
"gitweb" output are now properly escaped for proper HTML output.
* FreeBSD can lie when asked mtime of a directory, which made the
untracked cache code to fall back to a slow-path, which in turn
caused tests in t7063 to fail because it wanted to verify the
behaviour of the fast-path.
* Squelch compiler warnings for netmalloc (in compat/) library.
* A small memory leak in the command line parsing of "git blame"
has been plugged.
* The API documentation for hashmap was unclear if hashmap_entry
can be safely discarded without any other consideration. State
that it is safe to do so.
* Not-so-recent rewrite of "git am" that started making internal
calls into the commit machinery had an unintended regression, in
that no matter how many seconds it took to apply many patches, the
resulting committer timestamp for the resulting commits were all
the same.
* "git push --force-with-lease" already had enough logic to allow
ensuring that such a push results in creation of a ref (i.e. the
receiving end did not have another push from sideways that would be
discarded by our force-pushing), but didn't expose this possibility
to the users. It does so now.
(merge 9eed4f3 jk/push-force-with-lease-creation later to maint).
* The mechanism to limit the pack window memory size, when packing is
done using multiple threads (which is the default), is per-thread,
but this was not documented clearly.
(merge 954176c ms/document-pack-window-memory-is-per-thread later to maint).
* "import-tars" fast-import script (in contrib/) used to ignore a
hardlink target and replaced it with an empty file, which has been
corrected to record the same blob as the other file the hardlink is
shared with.
(merge 04e0869 js/import-tars-hardlinks later to maint).
* "git mv dir non-existing-dir/" did not work in some environments
the same way as existing mainstream platforms. The code now moves
"dir" to "non-existing-dir", without relying on rename("A", "B/")
that strips the trailing slash of '/'.
(merge 189d035 js/mv-dir-to-new-directory later to maint).
* The "t/" hierarchy is prone to get an unusual pathname; "make test"
has been taught to make sure they do not contain paths that cannot
be checked out on Windows (and the mechanism can be reusable to
catch pathnames that are not portable to other platforms as need
arises).
(merge c2cafd3 js/test-lint-pathname later to maint).
* When "git merge-recursive" works on history with many criss-cross
merges in "verbose" mode, the names the command assigns to the
virtual merge bases could have overwritten each other by unintended
reuse of the same piece of memory.
(merge 5447a76 rs/pull-signed-tag later to maint).
* "git checkout --detach <branch>" used to give the same advice
message as that is issued when "git checkout <tag>" (or anything
that is not a branch name) is given, but asking with "--detach" is
an explicit enough sign that the user knows what is going on. The
advice message has been squelched in this case.
(merge 779b88a sb/checkout-explit-detach-no-advice later to maint).
* "git difftool" by default ignores the error exit from the backend
commands it spawns, because often they signal that they found
differences by exiting with a non-zero status code just like "diff"
does; the exit status codes 126 and above however are special in
that they are used to signal that the command is not executable,
does not exist, or killed by a signal. "git difftool" has been
taught to notice these exit status codes.
(merge 45a4f5d jk/difftool-command-not-found later to maint).
* Other minor clean-ups and documentation updates
(merge 02a8cfa rs/merge-add-strategies-simplification later to maint).
(merge af4941d rs/merge-recursive-string-list-init later to maint).
(merge 1eb47f1 rs/use-strbuf-add-unique-abbrev later to maint).
(merge ddd0bfa jk/tighten-alloc later to maint).
(merge ecf30b2 rs/mailinfo-lib later to maint).
(merge 0eb75ce sg/reflog-past-root later to maint).
----------------------------------------------------------------
Changes since v2.9.0 are as follows:
Alex Henrie (1):
unpack-trees: fix English grammar in do-this-before-that messages
Alexander Hirsch (1):
pull: warn on --verify-signatures with --rebase
Alfred Perlstein (1):
git-svn: document the 'git svn propset' command
Andreas Brauchli (1):
gitweb: escape link body in format_ref_marker
Andrew Oakley (1):
git-p4: correct hasBranchPrefix verbose output
Antoine Queru (1):
upload-pack.c: use parse-options API
Armin Kunaschik (2):
t7800: readlink may not be available
t7610: test for mktemp before test execution
Charles Bailey (4):
t7810: fix duplicated test title
t7810-grep.sh: fix duplicated test name
t7810-grep.sh: fix a whitespace inconsistency
grep: fix grepping for "intent to add" files
Chris Packham (1):
completion: add option '--recurse-submodules' to 'git clone'
Christian Couder (50):
builtin/apply: make gitdiff_verify_name() return void
builtin/apply: avoid parameter shadowing 'p_value' global
builtin/apply: avoid parameter shadowing 'linenr' global
builtin/apply: avoid local variable shadowing 'len' parameter
builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
builtin/apply: move 'options' variable into cmd_apply()
builtin/apply: move 'read_stdin' global into cmd_apply()
builtin/apply: introduce 'struct apply_state' to start libifying
builtin/apply: move 'state' init into init_apply_state()
builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
builtin/apply: move 'check' global into 'struct apply_state'
builtin/apply: move 'check_index' global into 'struct apply_state'
builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
builtin/apply: move 'update_index' global into 'struct apply_state'
builtin/apply: move 'allow_overlap' global into 'struct apply_state'
builtin/apply: move 'cached' global into 'struct apply_state'
builtin/apply: move 'diffstat' global into 'struct apply_state'
builtin/apply: move 'numstat' global into 'struct apply_state'
builtin/apply: move 'summary' global into 'struct apply_state'
builtin/apply: move 'threeway' global into 'struct apply_state'
builtin/apply: move 'no_add' global into 'struct apply_state'
builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
builtin/apply: move 'line_termination' global into 'struct apply_state'
builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
builtin/apply: move 'p_context' global into 'struct apply_state'
builtin/apply: move 'apply' global into 'struct apply_state'
builtin/apply: move 'patch_input_file' global into 'struct apply_state'
builtin/apply: move 'limit_by_name' global into 'struct apply_state'
builtin/apply: move 'has_include' global into 'struct apply_state'
builtin/apply: move 'p_value' global into 'struct apply_state'
builtin/apply: move 'p_value_known' global into 'struct apply_state'
builtin/apply: move 'root' global into 'struct apply_state'
builtin/apply: move 'whitespace_error' global into 'struct apply_state'
builtin/apply: move 'whitespace_option' into 'struct apply_state'
builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
builtin/apply: move 'ws_error_action' into 'struct apply_state'
builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
builtin/apply: move 'state_linenr' global into 'struct apply_state'
builtin/apply: move 'fn_table' global into 'struct apply_state'
builtin/apply: move 'symlink_changes' global into 'struct apply_state'
builtin/apply: move 'state' check into check_apply_state()
builtin/apply: move applying patches into apply_all_patches()
builtin/apply: add 'lock_file' pointer into 'struct apply_state'
builtin/apply: move 'newfd' global into 'struct apply_state'
.mailmap: use Christian Couder's Tuxfamily address
Christopher Layne (1):
git-svn: clone: Fail on missing url argument
Dave Nicolson (1):
Documentation: GPG capitalization
David A. Greene (1):
contrib/subtree: Add a test for subtree rebase that loses commits
David Aguilar (6):
t7900-subtree.sh: fix quoting and broken && chains
subtree: fix "git subtree split --rejoin"
subtree: adjust style to match CodingGuidelines
subtree: adjust function definitions to match CodingGuidelines
difftool: avoid $GIT_DIR and $GIT_WORK_TREE
difftool: use Git::* functions instead of passing around state
David Kastrup (1):
blame: require 0 context lines while finding moved lines with -M
David Turner (3):
refs: allow log-only updates
refs: don't dereference on rename
mailmap: use main email address for dturner
Ed Maste (1):
rebase: update comment about FreeBSD /bin/sh
Edward Thomson (2):
format_commit_message: honor `color=auto` for `%C(auto)`
add: add --chmod=+x / --chmod=-x options
Elia Pinto (2):
http.c: implement the GIT_TRACE_CURL environment variable
imap-send.c: introduce the GIT_TRACE_CURL enviroment variable
Eric Sunshine (1):
blame: drop strdup of string literal
Eric Wong (24):
fast-import: implement unpack limit
daemon: enable SO_KEEPALIVE for all sockets
fast-import: invalidate pack_id references after loosening
pretty: support "mboxrd" output format
mailsplit: support unescaping mboxrd messages
am: support --patch-format=mboxrd
git-svn: skip mergeinfo handling with --no-follow-parent
gc: fix off-by-one error with gc.autoPackLimit
xread: retry after poll on EAGAIN/EWOULDBLOCK
xwrite: poll on non-blocking FDs
git-svn: warn instead of dying when commit data is missing
hoist out handle_nonblock function for xread and xwrite
config.mak.uname: define NEEDS_LIBRT under Linux, for now
http-walker: remove unused parameter from fetch_object
http: avoid disconnecting on 404s for loose objects
http-walker: reduce O(n) ops with doubly-linked list
list: avoid incompatibility with *BSD sys/queue.h
daemon: ignore ENOTSOCK from setsockopt
configure.ac: stronger test for pthread linkage
git-svn: document svn.authorsProg in config
git-svn: allow --version to work anywhere
git svn: migrate tests to use lib-httpd
pager: move pager-specific setup into the build
http-backend: buffer headers before sending
Heiko Becker (1):
gnome-keyring: Don't hard-code pkg-config executable
Heiko Voigt (3):
submodule-config: passing name reference for .gitmodule blobs
submodule-config: combine early return code into one goto
submodule-config: fix test binary crashing when no arguments given
Ingo Brückl (3):
t3700: remove unwanted leftover files before running new tests
t3700: merge two tests into one
t3700: add a test_mode_in_index helper function
Jacob Keller (1):
completion: add completion for --submodule=* diff option
Jeff King (107):
git_config_with_options: drop "found" counting
git_config_parse_parameter: refactor cleanup code
config: set up config_source for command-line config
config: return configset value for current_config_ functions
config: add a notion of "scope"
upload-pack: provide a hook for running pack-objects
rev-list: "adjust" results of "--count --use-bitmap-index -n"
rev-list: disable bitmaps when "-n" is used with listing objects
tree-diff: avoid alloca for large allocations
send-pack: use buffered I/O to talk to pack-objects
parse_opt_string_list: stop allocating new strings
interpret-trailers: don't duplicate option strings
blame,shortlog: don't make local option variables static
use string_list initializer consistently
fetch: document that pruning happens before fetching
repack: document --unpack-unreachable option
repack: add --keep-unreachable option
repack: extend --keep-unreachable to loose objects
add--interactive: respect diff.compactionHeuristic
bisect: always call setup_revisions after init_revisions
gpg-interface: use child_process.args
verify_signed_buffer: drop pbuf variable
verify_signed_buffer: use tempfile object
run-command: add pipe_command helper
verify_signed_buffer: use pipe_command
sign_buffer: use pipe_command
t0006: rename test-date's "show" to "relative"
t0006: test various date formats
local_tzoffset: detect errors from tm_to_time_t
t/perf: fix regression in testing older versions of git
p4211: explicitly disable renames in no-rename test
color: fix max-size comment
doc: refactor description of color format
add skip_prefix_mem helper
color: refactor parse_attr
color: allow "no-" for negating attributes
color: support "italic" attribute
color: support strike-through attribute
t9300: factor out portable "head -c" replacement
t5000: test tar files that overflow ustar headers
archive-tar: write extended headers for file sizes >= 8GB
archive-tar: write extended headers for far-future mtime
archive-tar: drop return value
add an extra level of indirection to main()
common-main: call git_extract_argv0_path()
common-main: call sanitize_stdfds()
common-main: call restore_sigpipe_to_default()
common-main: call git_setup_gettext()
tests: factor portable signal check out of t0005
t0005: use test_match_signal as appropriate
test_must_fail: use test_match_signal
t/lib-git-daemon: use test_match_signal
parse_options: allocate a new array when concatenating
Makefile: drop extra dependencies for test helpers
Makefile: use VCSSVN_LIB to refer to svn library
config: fix bogus fd check when setting up default config
branch: use non-gentle write_file for branch description
write_file: drop "gently" form
write_file: use xopen
write_file: add pointer+len variant
write_file: add format attribute
use write_file_buf where applicable
branch: use write_file_buf instead of write_file
walker: let walker_say take arbitrary formats
avoid using sha1_to_hex output as printf format
push: anonymize URL in status output
t0006: skip "far in the future" test when unsigned long is not long enough
check_everything_connected: always pass --quiet to rev-list
rev-list: add optional progress reporting
check_everything_connected: convert to argv_array
check_everything_connected: use a struct with named options
check_connected: relay errors to alternate descriptor
check_connected: add progress flag
clone: use a real progress meter for connectivity check
index-pack: add flag for showing delta-resolution progress
receive-pack: turn on index-pack resolving progress
receive-pack: relay connectivity errors to sideband
receive-pack: turn on connectivity progress
receive-pack: send keepalives during quiet periods
t5541: fix url scrubbing test when GPG is not set
diff: do not reuse worktree files that need "clean" conversion
contrib/git-jump: fix greedy regex when matching hunks
contrib/git-jump: add whitespace-checking mode
contrib/git-jump: fix typo in README
doc/rev-list-options: clarify "commit@{Nth}" for "-g" option
doc/rev-list-options: explain "-g" output formats
doc/pretty-formats: describe index/time formats for %gd
doc/pretty-formats: explain shortening of %gd
t4205: drop top-level &&-chaining
t4205: indent here documents
date: document and test "raw-local" mode
date: add "unix" format
t/perf: add tests for many-pack scenarios
sha1_file: drop free_pack_by_name
add generic most-recently-used list
find_pack_entry: replace last_found_pack with MRU cache
pack-objects: break out of want_object loop early
pack-objects: compute local/ignore_pack_keep early
am: reset cached ident date for each patch
trace: handle NULL argument in trace_disable()
trace: stop using write_or_whine_pipe()
trace: use warning() for printing trace errors
trace: cosmetic fixes for error messages
trace: correct variable name in write() error message
trace: disable key after write error
write_or_die: drop write_or_whine_pipe()
trace: do not fall back to stderr
Joey Hess (1):
clarify %f documentation
Johannes Schindelin (58):
mingw: let the build succeed with DEVELOPER=1
perf: accommodate for MacOSX
pretty: make the skip_blank_lines() function public
commit.c: make find_commit_subject() more robust
t2300: "git --exec-path" is not usable in $PATH on Windows as-is
log: prepare log/log-tree to reuse the diffopt.close_file attribute
log-tree: respect diffopt's configured output file stream
line-log: respect diffopt's configured output file stream
graph: respect the diffopt.file setting
shortlog: support outputting to streams other than stdout
format-patch: explicitly switch off color when writing to files
format-patch: avoid freopen()
format-patch: use stdout directly
shortlog: respect the --output=<file> setting
t4211: ensure that log respects --output=<file>
color.h: remove obsolete comment about limitations on Windows
diff: do not color output when --color=auto and --output=<file> is given
t3404: fix a grammo (commands are ran -> commands are run)
commit -C: skip blank lines at the beginning of the message
sequencer: use skip_blank_lines() to find the commit subject
reset --hard: skip blank lines when reporting the commit subject
commit -S: avoid invalid pointer with empty message
mingw: declare main()'s argv as const
t3404: add a test for the --gpg-sign option
rebase -i: demonstrate a bug with --autosquash
rebase -i: we allow extra spaces after fixup!/squash!
am: counteract gender bias
diff: demonstrate a bug with --patience and --ignore-space-at-eol
diff: fix a double off-by-one with --ignore-space-at-eol
t/test-lib.sh: fix running tests with --valgrind
mingw: fix the shortlog --output=<file> test
mingw: fix regression in t1308-config-set
fsck: refactor how to describe objects
fsck_walk(): optionally name objects on the go
fsck: give the error function a chance to see the fsck_options
fsck: optionally show more helpful info for broken links
t5520: verify that `pull --rebase` shows the helpful advice when failing
die("bug"): report bugs consistently
die(_("BUG")): avoid translating bug messages
merge-recursive: clarify code in was_tracked()
prepare the builtins for a libified merge_recursive()
merge_recursive: abort properly upon errors
merge-recursive: avoid returning a wholesale struct
merge-recursive: allow write_tree_from_memory() to error out
merge-recursive: handle return values indicating errors
merge-recursive: switch to returning errors instead of dying
am -3: use merge_recursive() directly again
merge-recursive: flush output buffer before printing error messages
merge-recursive: write the commit title in one go
merge-recursive: offer an option to retain the output in 'obuf'
merge_trees(): ensure that the callers release output buffer
merge-recursive: flush output buffer even when erroring out
import-tars: support hard links
t5533: make it pass on case-sensitive filesystems
nedmalloc: fix misleading indentation
git mv: do not keep slash in `git mv dir non-existing-dir/`
t/Makefile: ensure that paths are valid on platforms we care
rev-parse: respect core.hooksPath in --git-path
Johannes Sixt (7):
Windows: add missing definition of ENOTSOCK
git-submodule: forward exit code of git-submodule--helper more faithfully
submodule-helper: fix indexing in clone retry error reporting path
rebase-interactive: trim leading whitespace from progress count
t4130: work around Windows limitation
config.c: avoid duplicated global static variables
commit-slab.h: avoid duplicated global static variables
John Keeping (5):
difftool: fix argument handling in subdirs
Documentation/git-push: fix placeholder formatting
push: add shorthand for --force-with-lease branch creation
push: allow pushing new branches with --force-with-lease
difftool: always honor fatal error exit codes
Jonathan Nieder (1):
doc: git-htmldocs.googlecode.com is no more
Jonathan Tan (1):
fetch-pack: grow stateless RPC windows exponentially
Jordan DE GEA (1):
worktree: allow "-" short-hand for @{-1} in add command
Josef Kufner (1):
pretty: pass graph width to pretty formatting for use in '%>|(N)'
Josh Triplett (1):
format-patch: format.from gives the default for --from
Junio C Hamano (40):
send-email: detect and offer to skip backup files
pathspec: rename free_pathspec() to clear_pathspec()
t1308: do not get fooled by symbolic links to the source tree
builtin/apply: remove misleading comment on lock_file field
blame, line-log: do not loop around deref_tag()
Start the post-2.9 cycle
clone: do not let --depth imply --shallow-submodules
Start preparing for 2.9.1
Second batch of topics for 2.10
More fixes for 2.9.1
Third batch of topics for 2.10
commit.c: remove print_commit_list()
Fourth batch of topics for 2.10
Git 2.9.1
merge: avoid "safer crlf" during recording of merge results
Fifth batch of topics for 2.10
diff: document diff-filter exclusion
Git 2.9.2
archive-tar: huge offset and future timestamps would not work on 32-bit
Sixth batch of topics for 2.10
grep: further simplify setting the pattern type
Seventh batch of topics for 2.10
date: clarify --date=raw description
Some fixes for 2.9.3
t9100: portability fix
Eighth batch of topics for 2.10
hashmap: clarify that hashmap_entry can safely be discarded
Ninth batch of topics for 2.10
Tenth batch for 2.10
Hopefully final batch for 2.9.3
Eleventh batch for 2.10
Yet another batch for 2.9.3
Twelfth batch for 2.10
Git 2.9.3
Final batch before 2.10-rc0
Git 2.10-rc0
Relnotes: decribe the updates to the "text=auto" attribute
relnotes: redo the description of text=auto fix
RelNotes: final batch of topics before -rc1
Git 2.10-rc1
Keith McGuigan (1):
builtin/fetch.c: don't free remote->name after fetch
Kevin Willford (4):
patch-ids: stop using a hand-rolled hashmap implementation
patch-ids: replace the seen indicator with a commit pointer
patch-ids: add flag to create the diff patch id using header only data
rebase: avoid computing unnecessary patch IDs
LE Manh Cuong (1):
sh-setup: enclose setting of ${VAR=default} in double-quotes
Lars Schneider (2):
git-p4: place temporary refs used for branch import under refs/git-p4-tmp
travis-ci: enable web server tests t55xx on Linux
Lars Vogel (1):
Use "working tree" instead of "working directory" for git status
Linus Torvalds (1):
gpg-interface: prefer "long" key format output when verifying pgp signatures
Lukas Fleischer (4):
receive-pack: send auto-gc output over sideband 2
sideband.c: make send_sideband() return void
upload-pack.c: make send_client_data() return void
sideband.c: refactor recv_sideband()
Matthieu Moy (9):
Documentation/git-mv.txt: fix whitespace indentation
doc: typeset short command-line options as literal
doc: typeset long command-line options as literal
doc: typeset '--' as literal
doc: typeset long options with argument as literal
CodingGuidelines: formatting HEAD in documentation
doc: typeset HEAD and variants as literal
status: suggest 'git merge --abort' when appropriate
git-multimail: update to release 1.4.0
Mehul Jain (3):
t4202: refactor test
log: add "--no-show-signature" command line option
log: add log.showSignature configuration variable
Michael Haggerty (50):
t1404: demonstrate a bug resolving references
commit_ref(): if there is an empty dir in the way, delete it
read_raw_ref(): don't get confused by an empty directory
safe_create_leading_directories(): improve docstring
remove_dir_recursively(): add docstring
refname_is_safe(): use skip_prefix()
refname_is_safe(): don't allow the empty string
refname_is_safe(): insist that the refname already be normalized
commit_ref_update(): write error message to *err, not stderr
rename_ref(): remove unneeded local variable
ref_transaction_commit(): remove local variables n and updates
read_raw_ref(): rename flags argument to type
read_raw_ref(): clear *type at start of function
read_raw_ref(): rename symref argument to referent
read_raw_ref(): improve docstring
read_raw_ref(): move docstring to header file
lock_ref_sha1_basic(): remove unneeded local variable
refs: make error messages more consistent
ref_transaction_create(): disallow recursive pruning
ref_transaction_commit(): correctly report close_ref() failure
delete_branches(): use resolve_refdup()
verify_refname_available(): adjust constness in declaration
add_update(): initialize the whole ref_update
lock_ref_for_update(): new function
unlock_ref(): move definition higher in the file
ref_transaction_update(): check refname_is_safe() at a minimum
refs: resolve symbolic refs first
lock_ref_for_update(): don't re-read non-symbolic references
lock_ref_for_update(): don't resolve symrefs
commit_ref_update(): remove the flags parameter
lock_ref_sha1_basic(): only handle REF_NODEREF mode
refs: remove unnecessary "extern" keywords
do_for_each_ref(): move docstring to the header file
refs: use name "prefix" consistently
delete_refs(): add a flags argument
remote rm: handle symbolic refs correctly
get_ref_cache(): only create an instance if there is a submodule
entry_resolves_to_object(): rename function from ref_resolves_to_object()
ref_resolves_to_object(): new function
refs: introduce an iterator interface
do_for_each_ref(): reimplement using reference iteration
for_each_reflog(): don't abort for bad references
dir_iterator: new API for iterating over a directory tree
for_each_reflog(): reimplement using iterators
t1404: rename file to t1404-update-ref-errors.sh
t1404: remove "prefix" argument to test_update_rejected
t1404: document function test_update_rejected
t1404: add more tests of update-ref error handling
lock_ref_for_update(): make error handling more uniform
lock_ref_for_update(): avoid a symref resolution
Michael J Gruber (7):
cherry-pick: allow to pick to unborn branches
Documentation/technical: describe signature formats
Documentation/technical: signed tag format
Documentation/technical: signed commit format
Documentation/technical: signed merge tag format
gpg-interface: check gpg signature creation status
t/t91*: do not say how to avoid the tests
Michael Stahl (1):
document git-repack interaction of pack.threads and pack.windowMemory
Mike Hommey (2):
blame: allow to blame paths freshly added to the index
t/t8003-blame-corner-cases.sh: Use here documents
Nguyễn Thái Ngọc Duy (47):
completion: support git-worktree
worktree.c: rewrite mark_current_worktree() to avoid strbuf
git-worktree.txt: keep subcommand listing in alphabetical order
worktree.c: use is_dot_or_dotdot()
worktree: avoid 0{40}, too many zeroes, hard to read
worktree: simplify prefixing paths
worktree.c: add find_worktree()
worktree.c: add is_main_worktree()
lib-httpd.sh: print error.log on error
worktree.c: add is_worktree_locked()
pretty.c: support <direction>|(<negative number>) forms
new-command.txt: correct the command description file
grep: break down an "if" stmt in preparation for next changes
test-regex: isolate the bug test code
test-regex: expose full regcomp() to the command line
grep/icase: avoid kwsset on literal non-ascii strings
git-fetch.txt: document fetch output
fetch: refactor ref update status formatting code
fetch: change flag code for displaying tag update and deleted ref
grep/icase: avoid kwsset when -F is specified
grep: rewrite an if/else condition to avoid duplicate expression
grep/pcre: prepare locale-dependent tables for icase matching
gettext: add is_utf8_locale()
grep/pcre: support utf-8
diffcore-pickaxe: Add regcomp_or_die()
diffcore-pickaxe: support case insensitive match on non-ascii
grep.c: reuse "icase" variable
fetch: align all "remote -> local" output
fetch: reduce duplicate in ref update status lines with placeholder
connect: read $GIT_SSH_COMMAND from config file
worktree: add "lock" command
worktree: add "unlock" command
worktree.c: find_worktree() search by path suffix
pack-objects: pass length to check_pack_crc() without truncation
log: decorate HEAD -> branch with the same color for arrow and HEAD
sha1_file.c: use type off_t* for object_info->disk_sizep
index-pack: correct "len" type in unpack_data()
index-pack: report correct bad object offsets even if they are large
index-pack: correct "offset" type in unpack_entry_data()
pack-objects: do not truncate result in-pack object size on 32-bit systems
fsck: use streaming interface for large blobs in pack
test-lib.sh: introduce and use $EMPTY_TREE
test-lib.sh: introduce and use $EMPTY_BLOB
cache-tree.c: fix i-t-a entry skipping directory updates sometimes
cache-tree: do not generate empty trees as a result of all i-t-a subentries
config.mak.uname: correct perl path on FreeBSD
t7063: work around FreeBSD's lazy mtime update feature
Nicolas Pitre (1):
sideband.c: small optimization of strbuf usage
Orgad Shaneh (1):
commit: describe that --no-verify skips the commit-msg hook in the help text
Parker Moore (2):
contrib/persistent-https: update ldflags syntax for Go 1.7+
contrib/persistent-https: use Git version for build label
Patrick Steinhardt (1):
rebase -i: restore autostash on abort
Peter Colberg (2):
refs.h: fix misspelt "occurred" in a comment
config.c: fix misspelt "occurred" in an error message
Pranit Bauva (2):
builtin/commit.c: memoize git-path for COMMIT_EDITMSG
strbuf: describe the return value of strbuf_read_file
Ramsay Jones (2):
regex: fix a SIZE_MAX macro redefinition warning
write_or_die: remove the unused write_or_whine() function
René Scharfe (33):
t4051: rewrite, add more tests
xdiff: factor out match_func_rec()
xdiff: handle appended chunks better with -W
xdiff: ignore empty lines before added functions with -W
xdiff: -W: don't include common trailing empty lines in context
xdiff: don't trim common tail with -W
t7810: add test for grep -W and trailing empty context lines
grep: -W: don't extend context to trailing empty lines
xdiff: fix merging of appended hunk with -W
.gitattributes: set file type for C files
notes-merge: use O_EXCL to avoid overwriting existing files
am: ignore return value of write_file()
rm: reuse strbuf for all remove_dir_recursively() calls
worktree: use strbuf_add_absolute_path() directly
use strbuf_addbuf() for appending a strbuf to another
submodule-config: use explicit empty string instead of strbuf in config_from()
strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf()
use strbuf_addstr() for adding constant strings to a strbuf
pass constants as first argument to st_mult()
use strbuf_addstr() instead of strbuf_addf() with "%s"
use CHILD_PROCESS_INIT to initialize automatic variables
merge-recursive: use STRING_LIST_INIT_NODUP
merge: use string_list_split() in add_strategies()
nedmalloc: work around overzealous GCC 6 warning
archive-tar: make write_extended_header() void
use strbuf_add_unique_abbrev() for adding short hashes
correct FLEXPTR_* example in comment
mailinfo: recycle strbuf in check_header()
commit: use xstrdup() in get_merge_parent()
commit: factor out set_merge_remote_desc()
merge-recursive: fix verbose output for multiple base trees
commit: use FLEX_ARRAY in struct merge_remote_desc
receive-pack: use FLEX_ALLOC_MEM in queue_command()
Ronald Wampler (1):
Makefile: add NEEDS_LIBRT to optionally link with librt
SZEDER Gábor (2):
reflog: continue walking the reflog past root commits
t1410: remove superfluous 'git reflog' from the 'walk past root' test
Stefan Beller (23):
submodule update: make use of the existing fetch_in_submodule function
submodule-config: keep shallow recommendation around
submodule update: learn `--[no-]recommend-shallow` option
submodule--helper: initial clone learns retry logic
submodule update: continue when a clone fails
t5614: don't use subshells
push options: {pre,post}-receive hook learns about push options
receive-pack: implement advertising and receiving push options
push: accept push options
add a test for push options
Documentation: pack-protocol correct NAK response
submodule deinit: remove outdated comment
t7406: future proof tests with hard coded depth
submodule update: respect depth in subsequent fetches
submodule update: narrow scope of local variable
submodule--helper: fix usage string for relative-path
submodule-config: keep configured branch around
gitmodules: document shallow recommendation
submodule--helper: add remote-branch helper
submodule update: allow '.' for branch value
submodule--helper: use parallel processor correctly
t7406: fix breakage on OSX
checkout: do not mention detach advice for explicit --detach option
Thomas Braun (3):
completion: factor out untracked file modes into a variable
completion: add __git_get_option_value helper
completion: add git status
Tom Russello (4):
doc: clearer rule about formatting literals
doc: change environment variables format
doc: more consistency in environment variables format
doc: change configuration variables format
Torsten Bögershausen (2):
convert: unify the "auto" handling of CRLF
convert: Correct NNO tests and missing `LF will be replaced by CRLF`
Vasco Almeida (47):
i18n: builtin/remote.c: fix mark for translation
i18n: advice: mark string about detached head for translation
i18n: advice: internationalize message for conflicts
i18n: transport: mark strings for translation
i18n: sequencer: mark entire sentences for translation
i18n: rebase-interactive: mark here-doc strings for translation
i18n: sequencer: mark string for translation
i18n: rebase-interactive: mark comments of squash for translation
i18n: merge-octopus: mark messages for translation
i18n: setup: mark strings for translation
merge-octopus: use die shell function from git-sh-setup.sh
tests: use test_i18n* functions to suppress false positives
i18n: rebase: fix marked string to use eval_gettext variant
tests: unpack-trees: update to use test_i18n* functions
i18n: rebase: mark placeholder for translation
t9003: become resilient to GETTEXT_POISON
i18n: bisect: simplify error message for i18n
t4153: fix negated test_i18ngrep call
t6030: update to use test_i18ncmp
t5523: use test_i18ngrep for negation
i18n: git-sh-setup.sh: mark strings for translation
i18n: bisect: mark strings for translation
i18n: rebase-interactive: mark strings for translation
i18n: transport-helper.c: change N_() call to _()
i18n: notes: mark strings for translation
i18n: notes: mark options for translation
i18n: merge: mark messages for translation
i18n: merge: change command option help to lowercase
i18n: sequencer: add period to error message
i18n: standardise messages
i18n: remote: mark URL fallback text for translation
i18n: remote: allow translations to reorder message
i18n: init-db: join message pieces
i18n: submodule: join strings marked for translation
i18n: submodule: escape shell variables inside eval_gettext
i18n: unmark die messages for translation
i18n: branch: mark comment when editing branch description for translation
t5541: become resilient to GETTEXT_POISON
t5510: skip tests under GETTEXT_POISON build
i18n: notes: mark comment for translation
i18n: config: unfold error messages marked for translation
i18n: setup: mark error messages for translation
i18n: archive: mark errors for translation
i18n: git-stash: mark messages for translation
t3404: become resilient to GETTEXT_POISON
t5520: become resilient to GETTEXT_POISON
t7411: become resilient to GETTEXT_POISON
Ville Skyttä (3):
git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
completion: complete --delete, --move, and --remotes for git branch
Spelling fixes
William Duclot (1):
userdiff: add built-in pattern for CSS
brian m. carlson (11):
hex: add oid_to_hex_r()
contrib/coccinelle: add basic Coccinelle transforms
coccinelle: convert hashcpy() with null_sha1 to hashclr()
coccinelle: apply object_id Coccinelle transformations
diff: convert struct diff_filespec to struct object_id
diff: rename struct diff_filespec's sha1_valid member
merge-recursive: convert struct stage_data to use object_id
merge-recursive: convert struct merge_file_info to object_id
merge-recursive: convert leaf functions to use struct object_id
merge-recursive: convert merge_recursive_generic() to object_id
diff: convert prep_temp_blob() to struct object_id
^ permalink raw reply [relevance 3%]
* [ANNOUNCE] Git v2.10.0-rc0
@ 2016-08-14 22:47 3% Junio C Hamano
0 siblings, 0 replies; 22+ results
From: Junio C Hamano @ 2016-08-14 22:47 UTC (permalink / raw
To: git; +Cc: Linux Kernel
An early preview release Git v2.10.0-rc0 is now available for
testing at the usual places. It is comprised of 589 non-merge
commits since v2.9.0, contributed by 67 people, 20 of which are
new faces.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the
'v2.10.0-rc0' tag and the 'master' branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.9.0 are as follows.
Welcome to the Git development community!
Alexander Hirsch, Andreas Brauchli, Andrew Oakley, Antoine
Queru, Christopher Layne, Dave Nicolson, Ed Maste, Heiko Becker,
Ingo Brückl, Jonathan Tan, Jordan DE GEA, Josef Kufner, Keith
McGuigan, Kevin Willford, LE Manh Cuong, Michael Stahl, Parker
Moore, Peter Colberg, Tom Russello, and William Duclot.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Alex Henrie, Alfred Perlstein, Armin Kunaschik, brian m. carlson,
Charles Bailey, Chris Packham, Christian Couder, David A. Greene,
David Aguilar, David Kastrup, David Turner, Edward Thomson, Elia
Pinto, Eric Sunshine, Eric Wong, Heiko Voigt, Jacob Keller,
Jeff King, Joey Hess, Johannes Schindelin, Johannes Sixt,
John Keeping, Jonathan Nieder, Josh Triplett, Junio C Hamano,
Lars Schneider, Lars Vogel, Lukas Fleischer, Matthieu Moy,
Mehul Jain, Michael Haggerty, Michael J Gruber, Mike Hommey,
Nguyễn Thái Ngọc Duy, Nicolas Pitre, Orgad Shaneh, Patrick
Steinhardt, Pranit Bauva, Ramsay Jones, René Scharfe, Ronald
Wampler, Stefan Beller, SZEDER Gábor, Thomas Braun, Torsten
Bögershausen, Vasco Almeida, and Ville Skyttä.
----------------------------------------------------------------
Git 2.10 Release Notes (draft)
==============================
Backward compatibility notes
----------------------------
Updates since v2.9
------------------
UI, Workflows & Features
* "git pull --rebase --verify-signature" learned to warn the user
that "--verify-signature" is a no-op when rebasing.
* An upstream project can make a recommendation to shallowly clone
some submodules in the .gitmodules file it ships.
* "git worktree add" learned that '-' can be used as a short-hand for
"@{-1}", the previous branch.
* Update the funcname definition to support css files.
* The completion script (in contrib/) learned to complete "git
status" options.
* Messages that are generated by auto gc during "git push" on the
receiving end are now passed back to the sending end in such a way
that they are shown with "remote: " prefix to avoid confusing the
users.
* "git add -i/-p" learned to honor diff.compactionHeuristic
experimental knob, so that the user can work on the same hunk split
as "git diff" output.
* "upload-pack" allows a custom "git pack-objects" replacement when
responding to "fetch/clone" via the uploadpack.packObjectsHook.
(merge b738396 jk/upload-pack-hook later to maint).
* Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
(merge d9925d1 ew/mboxrd-format-am later to maint).
* "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").
(merge e26a8c4 jk/repack-keep-unreachable later to maint).
* "log --graph --format=" learned that "%>|(N)" specifies the width
relative to the terminal's left edge, not relative to the area to
draw text that is to the right of the ancestry-graph section. It
also now accepts negative N that means the column limit is relative
to the right border.
* A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
(merge 531220b jc/send-email-skip-backup later to maint).
* "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.
* The output coloring scheme learned two new attributes, italic and
strike, in addition to existing bold, reverse, etc.
* "git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
(merge fce04c3 mj/log-show-signature-conf later to maint).
* More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
* "git archive" learned to handle files that are larger than 8GB and
commits far in the future than expressible by the traditional US-TAR
format.
(merge 5caeeb8 jk/big-and-future-archive-tar later to maint).
* A new configuration variable core.sshCommand has been added to
specify what value for GIT_SSH_COMMAND to use per repository.
* "git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location. "git worktree"
command learned a dedicated command pair to create and remove such
a file, so that the users do not have to do this with editor.
* A handful of "git svn" updates.
* "git push" learned to accept and pass extra options to the
receiving end so that hooks can read and react to them.
* "git status" learned to suggest "merge --abort" during a conflicted
merge, just like it already suggests "rebase --abort" during a
conflicted rebase.
* "git jump" script (in contrib/) has been updated a bit.
(merge a91e692 jk/git-jump later to maint).
* "git push" and "git clone" learned to give better progress meters
to the end user who is waiting on the terminal.
* An entry "git log --decorate" for the tip of the current branch is
shown as "HEAD -> name" (where "name" is the name of the branch);
the arrow is now painted in the same color as "HEAD", not in the
color for commits.
* "git format-patch" learned format.from configuration variable to
specify the default settings for its "--from" option.
* "git am -3" calls "git merge-recursive" when it needs to fall back
to a three-way merge; this call has been turned into an internal
subroutine call instead of spawning a separate subprocess.
* The command line completion scripts (in contrib/) now knows about
"git branch --delete/--move [--remote]".
(merge 2703c22 vs/completion-branch-fully-spelled-d-m-r later to maint).
Performance, Internal Implementation, Development Support etc.
* "git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
* When "git daemon" is run without --[init-]timeout specified, a
connection from a client that silently goes offline can hang around
for a long time, wasting resources. The socket-level KEEPALIVE has
been enabled to allow the OS to notice such failed connections.
* "git upload-pack" command has been updated to use the parse-options
API.
* The "git apply" standalone program is being libified; the first
step to move many state variables into a structure that can be
explicitly (re)initialized to make the machinery callable more
than once has been merged.
* HTTP transport gained an option to produce more detailed debugging
trace.
(merge 73e57aa ep/http-curl-trace later to maint).
* Instead of taking advantage of the fact that a struct string_list
that is allocated with all NULs happens to be the INIT_NODUP kind,
the users of string_list structures are taught to initialize them
explicitly as such, to document their behaviour better.
(merge 2721ce2 jk/string-list-static-init later to maint).
* HTTPd tests learned to show the server error log to help diagnosing
a failing tests.
(merge 44f243d nd/test-lib-httpd-show-error-log-in-verbose later to maint).
* The ownership rule for the piece of memory that hold references to
be fetched in "git fetch" was screwy, which has been cleaned up.
* "git bisect" makes an internal call to "git diff-tree" when
bisection finds the culprit, but this call did not initialize the
data structure to pass to the diff-tree API correctly.
* Further preparatory clean-up for "worktree" feature continues.
(merge 0409e0b nd/worktree-cleanup-post-head-protection later to maint).
* Formats of the various data (and how to validate them) where we use
GPG signature have been documented.
* A new run-command API function pipe_command() is introduced to
sanely feed data to the standard input while capturing data from
the standard output and the standard error of an external process,
which is cumbersome to hand-roll correctly without deadlocking.
The codepath to sign data in a prepared buffer with GPG has been
updated to use this API to read from the status-fd to check for
errors (instead of relying on GPG's exit status).
(merge efee955 jk/gpg-interface-cleanup later to maint).
* Allow t/perf framework to use the features from the most recent
version of Git even when testing an older installed version.
* The commands in the "log/diff" family have had an FILE* pointer in the
data structure they pass around for a long time, but some codepaths
used to always write to the standard output. As a preparatory step
to make "git format-patch" available to the internal callers, these
codepaths have been updated to consistently write into that FILE*
instead.
* Conversion from unsigned char sha1[20] to struct object_id
continues.
* Improve the look of the way "git fetch" reports what happened to
each ref that was fetched.
* The .c/.h sources are marked as such in our .gitattributes file so
that "git diff -W" and friends would work better.
* Code clean-up to avoid using a variable string that compilers may
feel untrustable as printf-style format given to write_file()
helper function.
* "git p4" used a location outside $GIT_DIR/refs/ to place its
temporary branches, which has been moved to refs/git-p4-tmp/.
* Existing autoconf generated test for the need to link with pthread
library did not check all the functions from pthread libraries;
recent FreeBSD has some functions in libc but not others, and we
mistakenly thought linking with libc is enough when it is not.
* When "git fsck" reports a broken link (e.g. a tree object contains
a blob that does not exist), both containing object and the object
that is referred to were reported with their 40-hex object names.
The command learned the "--name-objects" option to show the path to
the containing object from existing refs (e.g. "HEAD~24^2:file.txt").
* Allow http daemon tests in Travis CI tests.
* Makefile assumed that -lrt is always available on platforms that
want to use clock_gettime() and CLOCK_MONOTONIC, which is not a
case for recent Mac OS X. The necessary symbols are often found in
libc on many modern systems and having -lrt on the command line, as
long as the library exists, had no effect, but when the platform
removes librt.a that is a different matter--having -lrt will break
the linkage.
This change could be seen as a regression for those who do need to
specify -lrt, as they now specifically ask for NEEDS_LIBRT when
building. Hopefully they are in the minority these days.
* Further preparatory work on the refs API before the pluggable
backend series can land.
* Error handling in the codepaths that updates refs has been
improved.
* The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
* A few tests that specifically target "git rebase -i" have been
added.
* Dumb http transport on the client side has been optimized.
(merge ecba195 ew/http-walker later to maint).
* Users of the parse_options_concat() API function need to allocate
extra slots in advance and fill them with OPT_END() when they want
to decide the set of supported options dynamically, which makes the
code error-prone and hard to read. This has been corrected by tweaking
the API to allocate and return a new copy of "struct option" array.
* "git fetch" exchanges batched have/ack messages between the sender
and the receiver, initially doubling every time and then falling
back to enlarge the window size linearly. The "smart http"
transport, being an half-duplex protocol, outgrows the preset limit
too quickly and becomes inefficient when interacting with a large
repository. The internal mechanism learned to grow the window size
more aggressively when working with the "smart http" transport.
* Tests for "git svn" have been taught to reuse the lib-httpd test
infrastructure when testing the subversion integration that
interacts with subversion repositories served over the http://
protocol.
(merge a8a5d25 ew/git-svn-http-tests later to maint).
* "git pack-objects" has a few options that tell it not to pack
objects found in certain packfiles, which require it to scan .idx
files of all available packs. The codepaths involved in these
operations have been optimized for a common case of not having any
non-local pack and/or any .kept pack.
* The t3700 test about "add --chmod=-x" have been made a bit more
robust and generally cleaned up.
(merge 766cdc4 ib/t3700-add-chmod-x-updates later to maint).
* The build procedure learned PAGER_ENV knob that lists what default
environment variable settings to export for popular pagers. This
mechanism is used to tweak the default settings to MORE on FreeBSD.
(merge 995bc22 ew/build-time-pager-tweaks later to maint).
* The http-backend (the server-side component of smart-http
transport) used to trickle the HTTP header one at a time. Now
these write(2)s are batched.
(merge b36045c ew/http-backend-batch-headers later to maint).
* When "git rebase" tries to compare set of changes on the updated
upstream and our own branch, it computes patch-id for all of these
changes and attempts to find matches. This has been optimized by
lazily computing the full patch-id (which is expensive) to be
compared only for changes that touch the same set of paths.
(merge b3dfeeb kw/patch-ids-optim later to maint).
Also contains various documentation updates and code clean-ups.
Fixes since v2.9
----------------
Unless otherwise noted, all the fixes since v2.8 in the maintenance
track are contained in this release (see the maintenance releases'
notes for details).
* The commands in `git log` family take %C(auto) in a custom format
string. This unconditionally turned the color on, ignoring
--no-color or with --color=auto when the output is not connected to
a tty; this was corrected to make the format truly behave as
"auto".
* "git rev-list --count" whose walk-length is limited with "-n"
option did not work well with the counting optimized to look at the
bitmap index.
* "git show -W" (extend hunks to cover the entire function, delimited
by lines that match the "funcname" pattern) used to show the entire
file when a change added an entire function at the end of the file,
which has been fixed.
* The documentation set has been updated so that literal commands,
configuration variables and environment variables are consistently
typeset in fixed-width font and bold in manpages.
* "git svn propset" subcommand that was added in 2.3 days is
documented now.
* The documentation tries to consistently spell "GPG"; when
referring to the specific program name, "gpg" is used.
* "git reflog" stopped upon seeing an entry that denotes a branch
creation event (aka "unborn"), which made it appear as if the
reflog was truncated.
* The git-prompt scriptlet (in contrib/) was not friendly with those
who uses "set -u", which has been fixed.
* compat/regex code did not cleanly compile.
* A codepath that used alloca(3) to place an unbounded amount of data
on the stack has been updated to avoid doing so.
* "git update-index --add --chmod=+x file" may be usable as an escape
hatch, but not a friendly thing to force for people who do need to
use it regularly. "git add --chmod=+x file" can be used instead.
* Build improvements for gnome-keyring (in contrib/)
* "git status" used to say "working directory" when it meant "working
tree".
* Comments about misbehaving FreeBSD shells have been clarified with
the version number (9.x and before are broken, newer ones are OK).
* "git cherry-pick A" worked on an unborn branch, but "git
cherry-pick A..B" didn't.
* Fix an unintended regression in v2.9 that breaks "clone --depth"
that recurses down to submodules by forcing the submodules to also
be cloned shallowly, which many server instances that host upstream
of the submodules are not prepared for.
* Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
to set the default value, without enclosing it in double quotes.
* Some platform-specific code had non-ANSI strict declarations of C
functions that do not take any parameters, which has been
corrected.
* The internal code used to show local timezone offset is not
prepared to handle timestamps beyond year 2100, and gave a
bogus offset value to the caller. Use a more benign looking
+0000 instead and let "git log" going in such a case, instead
of aborting.
* One among four invocations of readlink(1) in our test suite has
been rewritten so that the test can run on systems without the
command (others are in valgrind test framework and t9802).
* t/perf needs /usr/bin/time with GNU extension; the invocation of it
is updated to "gtime" on Darwin.
* A bug, which caused "git p4" while running under verbose mode to
report paths that are omitted due to branch prefix incorrectly, has
been fixed; the command said "Ignoring file outside of prefix" for
paths that are _inside_.
* The top level documentation "git help git" still pointed at the
documentation set hosted at now-defunct google-code repository.
Update it to point to https://git.github.io/htmldocs/git.html
instead.
* A helper function that takes the contents of a commit object and
finds its subject line did not ignore leading blank lines, as is
commonly done by other codepaths. Make it ignore leading blank
lines to match.
* For a long time, we carried an in-code comment that said our
colored output would work only when we use fprintf/fputs on
Windows, which no longer is the case for the past few years.
* "gc.autoPackLimit" when set to 1 should not trigger a repacking
when there is only one pack, but the code counted poorly and did
so.
* Add a test to specify the desired behaviour that currently is not
available in "git rebase -Xsubtree=...".
* More mark-up updates to typeset strings that are expected to
literally typed by the end user in fixed-width font.
* "git commit --amend --allow-empty-message -S" for a commit without
any message body could have misidentified where the header of the
commit object ends.
* "git rebase -i --autostash" did not restore the auto-stashed change
when the operation was aborted.
* Git does not know what the contents in the index should be for a
path added with "git add -N" yet, so "git grep --cached" should not
show hits (or show lack of hits, with -L) in such a path, but that
logic does not apply to "git grep", i.e. searching in the working
tree files. But we did so by mistake, which has been corrected.
* "git blame -M" missed a single line that was moved within the file.
* Fix recently introduced codepaths that are involved in parallel
submodule operations, which gave up on reading too early, and
could have wasted CPU while attempting to write under a corner
case condition.
* "git grep -i" has been taught to fold case in non-ascii locales
correctly.
* A test that unconditionally used "mktemp" learned that the command
is not necessarily available everywhere.
* There are certain house-keeping tasks that need to be performed at
the very beginning of any Git program, and programs that are not
built-in commands had to do them exactly the same way as "git"
potty does. It was easy to make mistakes in one-off standalone
programs (like test helpers). A common "main()" function that
calls cmd_main() of individual program has been introduced to
make it harder to make mistakes.
(merge de61ceb jk/common-main later to maint).
* The test framework learned a new helper test_match_signal to
check an exit code from getting killed by an expected signal.
* General code clean-up around a helper function to write a
single-liner to a file.
(merge 7eb6e10 jk/write-file later to maint).
* One part of "git am" had an oddball helper function that called
stuff from outside "his" as opposed to calling what we have "ours",
which was not gender-neutral and also inconsistent with the rest of
the system where outside stuff is usuall called "theirs" in
contrast to "ours".
* "git blame file" allowed the lineage of lines in the uncommitted,
unadded contents of "file" to be inspected, but it refused when
"file" did not appear in the current commit. When "file" was
created by renaming an existing file (but the change has not been
committed), this restriction was unnecessarily tight.
* "git add -N dir/file && git write-tree" produced an incorrect tree
when there are other paths in the same directory that sorts after
"file".
* "git fetch http://user:pass@host/repo..." scrubbed the userinfo
part, but "git push" didn't.
* "git merge" with renormalization did not work well with
merge-recursive, due to "safer crlf" conversion kicking in when it
shouldn't.
(merge 1335d76 jc/renormalize-merge-kill-safer-crlf later to maint).
* The use of strbuf in "git rm" to build filename to remove was a bit
suboptimal, which has been fixed.
* An age old bug that caused "git diff --ignore-space-at-eol"
misbehave has been fixed.
* "git notes merge" had a code to see if a path exists (and fails if
it does) and then open the path for writing (when it doesn't).
Replace it with open with O_EXCL.
* "git pack-objects" and "git index-pack" mostly operate with off_t
when talking about the offset of objects in a packfile, but there
were a handful of places that used "unsigned long" to hold that
value, leading to an unintended truncation.
* Recent update to "git daemon" tries to enable the socket-level
KEEPALIVE, but when it is spawned via inetd, the standard input
file descriptor may not necessarily be connected to a socket.
Suppress an ENOTSOCK error from setsockopt().
* Recent FreeBSD stopped making perl available at /usr/bin/perl;
switch the default the built-in path to /usr/local/bin/perl on not
too ancient FreeBSD releases.
* "git commit --help" said "--no-verify" is only about skipping the
pre-commit hook, and failed to say that it also skipped the
commit-msg hook.
* "git merge" in Git v2.9 was taught to forbid merging an unrelated
lines of history by default, but that is exactly the kind of thing
the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
"git subtree" has been taught to use the "--allow-unrelated-histories"
option to override the default.
* The build procedure for "git persistent-https" helper (in contrib/)
has been updated so that it can be built with more recent versions
of Go.
* There is an optimization used in "git diff $treeA $treeB" to borrow
an already checked-out copy in the working tree when it is known to
be the same as the blob being compared, expecting that open/mmap of
such a file is faster than reading it from the object store, which
involves inflating and applying delta. This however kicked in even
when the checked-out copy needs to go through the convert-to-git
conversion (including the clean filter), which defeats the whole
point of the optimization. The optimization has been disabled when
the conversion is necessary.
* "git -c grep.patternType=extended log --basic-regexp" misbehaved
because the internal API to access the grep machinery was not
designed well.
* Windows port was failing some tests in t4130, due to the lack of
inum in the returned values by its lstat(2) emulation.
* The reflog output format is documented better, and a new format
--date=unix to report the seconds-since-epoch (without timezone)
has been added.
(merge 442f6fd jk/reflog-date later to maint).
* "git difftool <paths>..." started in a subdirectory failed to
interpret the paths relative to that directory, which has been
fixed.
* The characters in the label shown for tags/refs for commits in
"gitweb" output are now properly escaped for proper HTML output.
* FreeBSD can lie when asked mtime of a directory, which made the
untracked cache code to fall back to a slow-path, which in turn
caused tests in t7063 to fail because it wanted to verify the
behaviour of the fast-path.
* Squelch compiler warnings for netmalloc (in compat/) library.
* A small memory leak in the command line parsing of "git blame"
has been plugged.
* The API documentation for hashmap was unclear if hashmap_entry
can be safely discarded without any other consideration. State
that it is safe to do so.
* Not-so-recent rewrite of "git am" that started making internal
calls into the commit machinery had an unintended regression, in
that no matter how many seconds it took to apply many patches, the
resulting committer timestamp for the resulting commits were all
the same.
* "git push --force-with-lease" already had enough logic to allow
ensuring that such a push results in creation of a ref (i.e. the
receiving end did not have another push from sideways that would be
discarded by our force-pushing), but didn't expose this possibility
to the users. It does so now.
(merge 9eed4f3 jk/push-force-with-lease-creation later to maint).
* The mechanism to limit the pack window memory size, when packing is
done using multiple threads (which is the default), is per-thread,
but this was not documented clearly.
(merge 954176c ms/document-pack-window-memory-is-per-thread later to maint).
* "import-tars" fast-import script (in contrib/) used to ignore a
hardlink target and replaced it with an empty file, which has been
corrected to record the same blob as the other file the hardlink is
shared with.
(merge 04e0869 js/import-tars-hardlinks later to maint).
* "git mv dir non-existing-dir/" did not work in some environments
the same way as existing mainstream platforms. The code now moves
"dir" to "non-existing-dir", without relying on rename("A", "B/")
that strips the trailing slash of '/'.
(merge 189d035 js/mv-dir-to-new-directory later to maint).
* Other minor clean-ups and documentation updates
(merge 02a8cfa rs/merge-add-strategies-simplification later to maint).
(merge af4941d rs/merge-recursive-string-list-init later to maint).
(merge 1eb47f1 rs/use-strbuf-add-unique-abbrev later to maint).
----------------------------------------------------------------
Changes since v2.9.0 are as follows:
Alex Henrie (1):
unpack-trees: fix English grammar in do-this-before-that messages
Alexander Hirsch (1):
pull: warn on --verify-signatures with --rebase
Alfred Perlstein (1):
git-svn: document the 'git svn propset' command
Andreas Brauchli (1):
gitweb: escape link body in format_ref_marker
Andrew Oakley (1):
git-p4: correct hasBranchPrefix verbose output
Antoine Queru (1):
upload-pack.c: use parse-options API
Armin Kunaschik (2):
t7800: readlink may not be available
t7610: test for mktemp before test execution
Charles Bailey (4):
t7810: fix duplicated test title
t7810-grep.sh: fix duplicated test name
t7810-grep.sh: fix a whitespace inconsistency
grep: fix grepping for "intent to add" files
Chris Packham (1):
completion: add option '--recurse-submodules' to 'git clone'
Christian Couder (50):
builtin/apply: make gitdiff_verify_name() return void
builtin/apply: avoid parameter shadowing 'p_value' global
builtin/apply: avoid parameter shadowing 'linenr' global
builtin/apply: avoid local variable shadowing 'len' parameter
builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
builtin/apply: move 'options' variable into cmd_apply()
builtin/apply: move 'read_stdin' global into cmd_apply()
builtin/apply: introduce 'struct apply_state' to start libifying
builtin/apply: move 'state' init into init_apply_state()
builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
builtin/apply: move 'check' global into 'struct apply_state'
builtin/apply: move 'check_index' global into 'struct apply_state'
builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
builtin/apply: move 'update_index' global into 'struct apply_state'
builtin/apply: move 'allow_overlap' global into 'struct apply_state'
builtin/apply: move 'cached' global into 'struct apply_state'
builtin/apply: move 'diffstat' global into 'struct apply_state'
builtin/apply: move 'numstat' global into 'struct apply_state'
builtin/apply: move 'summary' global into 'struct apply_state'
builtin/apply: move 'threeway' global into 'struct apply_state'
builtin/apply: move 'no_add' global into 'struct apply_state'
builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
builtin/apply: move 'line_termination' global into 'struct apply_state'
builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
builtin/apply: move 'p_context' global into 'struct apply_state'
builtin/apply: move 'apply' global into 'struct apply_state'
builtin/apply: move 'patch_input_file' global into 'struct apply_state'
builtin/apply: move 'limit_by_name' global into 'struct apply_state'
builtin/apply: move 'has_include' global into 'struct apply_state'
builtin/apply: move 'p_value' global into 'struct apply_state'
builtin/apply: move 'p_value_known' global into 'struct apply_state'
builtin/apply: move 'root' global into 'struct apply_state'
builtin/apply: move 'whitespace_error' global into 'struct apply_state'
builtin/apply: move 'whitespace_option' into 'struct apply_state'
builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
builtin/apply: move 'ws_error_action' into 'struct apply_state'
builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
builtin/apply: move 'state_linenr' global into 'struct apply_state'
builtin/apply: move 'fn_table' global into 'struct apply_state'
builtin/apply: move 'symlink_changes' global into 'struct apply_state'
builtin/apply: move 'state' check into check_apply_state()
builtin/apply: move applying patches into apply_all_patches()
builtin/apply: add 'lock_file' pointer into 'struct apply_state'
builtin/apply: move 'newfd' global into 'struct apply_state'
.mailmap: use Christian Couder's Tuxfamily address
Christopher Layne (1):
git-svn: clone: Fail on missing url argument
Dave Nicolson (1):
Documentation: GPG capitalization
David A. Greene (1):
contrib/subtree: Add a test for subtree rebase that loses commits
David Aguilar (6):
t7900-subtree.sh: fix quoting and broken && chains
subtree: fix "git subtree split --rejoin"
subtree: adjust style to match CodingGuidelines
subtree: adjust function definitions to match CodingGuidelines
difftool: avoid $GIT_DIR and $GIT_WORK_TREE
difftool: use Git::* functions instead of passing around state
David Kastrup (1):
blame: require 0 context lines while finding moved lines with -M
David Turner (3):
refs: allow log-only updates
refs: don't dereference on rename
mailmap: use main email address for dturner
Ed Maste (1):
rebase: update comment about FreeBSD /bin/sh
Edward Thomson (2):
format_commit_message: honor `color=auto` for `%C(auto)`
add: add --chmod=+x / --chmod=-x options
Elia Pinto (2):
http.c: implement the GIT_TRACE_CURL environment variable
imap-send.c: introduce the GIT_TRACE_CURL enviroment variable
Eric Sunshine (1):
blame: drop strdup of string literal
Eric Wong (24):
fast-import: implement unpack limit
daemon: enable SO_KEEPALIVE for all sockets
fast-import: invalidate pack_id references after loosening
pretty: support "mboxrd" output format
mailsplit: support unescaping mboxrd messages
am: support --patch-format=mboxrd
git-svn: skip mergeinfo handling with --no-follow-parent
gc: fix off-by-one error with gc.autoPackLimit
xread: retry after poll on EAGAIN/EWOULDBLOCK
xwrite: poll on non-blocking FDs
git-svn: warn instead of dying when commit data is missing
hoist out handle_nonblock function for xread and xwrite
config.mak.uname: define NEEDS_LIBRT under Linux, for now
http-walker: remove unused parameter from fetch_object
http: avoid disconnecting on 404s for loose objects
http-walker: reduce O(n) ops with doubly-linked list
list: avoid incompatibility with *BSD sys/queue.h
daemon: ignore ENOTSOCK from setsockopt
configure.ac: stronger test for pthread linkage
git-svn: document svn.authorsProg in config
git-svn: allow --version to work anywhere
git svn: migrate tests to use lib-httpd
pager: move pager-specific setup into the build
http-backend: buffer headers before sending
Heiko Becker (1):
gnome-keyring: Don't hard-code pkg-config executable
Heiko Voigt (3):
submodule-config: passing name reference for .gitmodule blobs
submodule-config: combine early return code into one goto
submodule-config: fix test binary crashing when no arguments given
Ingo Brückl (3):
t3700: remove unwanted leftover files before running new tests
t3700: merge two tests into one
t3700: add a test_mode_in_index helper function
Jacob Keller (1):
completion: add completion for --submodule=* diff option
Jeff King (107):
git_config_with_options: drop "found" counting
git_config_parse_parameter: refactor cleanup code
config: set up config_source for command-line config
config: return configset value for current_config_ functions
config: add a notion of "scope"
upload-pack: provide a hook for running pack-objects
rev-list: "adjust" results of "--count --use-bitmap-index -n"
rev-list: disable bitmaps when "-n" is used with listing objects
tree-diff: avoid alloca for large allocations
send-pack: use buffered I/O to talk to pack-objects
parse_opt_string_list: stop allocating new strings
interpret-trailers: don't duplicate option strings
blame,shortlog: don't make local option variables static
use string_list initializer consistently
fetch: document that pruning happens before fetching
repack: document --unpack-unreachable option
repack: add --keep-unreachable option
repack: extend --keep-unreachable to loose objects
add--interactive: respect diff.compactionHeuristic
bisect: always call setup_revisions after init_revisions
gpg-interface: use child_process.args
verify_signed_buffer: drop pbuf variable
verify_signed_buffer: use tempfile object
run-command: add pipe_command helper
verify_signed_buffer: use pipe_command
sign_buffer: use pipe_command
t0006: rename test-date's "show" to "relative"
t0006: test various date formats
local_tzoffset: detect errors from tm_to_time_t
t/perf: fix regression in testing older versions of git
p4211: explicitly disable renames in no-rename test
color: fix max-size comment
doc: refactor description of color format
add skip_prefix_mem helper
color: refactor parse_attr
color: allow "no-" for negating attributes
color: support "italic" attribute
color: support strike-through attribute
t9300: factor out portable "head -c" replacement
t5000: test tar files that overflow ustar headers
archive-tar: write extended headers for file sizes >= 8GB
archive-tar: write extended headers for far-future mtime
archive-tar: drop return value
add an extra level of indirection to main()
common-main: call git_extract_argv0_path()
common-main: call sanitize_stdfds()
common-main: call restore_sigpipe_to_default()
common-main: call git_setup_gettext()
tests: factor portable signal check out of t0005
t0005: use test_match_signal as appropriate
test_must_fail: use test_match_signal
t/lib-git-daemon: use test_match_signal
parse_options: allocate a new array when concatenating
Makefile: drop extra dependencies for test helpers
Makefile: use VCSSVN_LIB to refer to svn library
config: fix bogus fd check when setting up default config
branch: use non-gentle write_file for branch description
write_file: drop "gently" form
write_file: use xopen
write_file: add pointer+len variant
write_file: add format attribute
use write_file_buf where applicable
branch: use write_file_buf instead of write_file
walker: let walker_say take arbitrary formats
avoid using sha1_to_hex output as printf format
push: anonymize URL in status output
t0006: skip "far in the future" test when unsigned long is not long enough
check_everything_connected: always pass --quiet to rev-list
rev-list: add optional progress reporting
check_everything_connected: convert to argv_array
check_everything_connected: use a struct with named options
check_connected: relay errors to alternate descriptor
check_connected: add progress flag
clone: use a real progress meter for connectivity check
index-pack: add flag for showing delta-resolution progress
receive-pack: turn on index-pack resolving progress
receive-pack: relay connectivity errors to sideband
receive-pack: turn on connectivity progress
receive-pack: send keepalives during quiet periods
t5541: fix url scrubbing test when GPG is not set
diff: do not reuse worktree files that need "clean" conversion
contrib/git-jump: fix greedy regex when matching hunks
contrib/git-jump: add whitespace-checking mode
contrib/git-jump: fix typo in README
doc/rev-list-options: clarify "commit@{Nth}" for "-g" option
doc/rev-list-options: explain "-g" output formats
doc/pretty-formats: describe index/time formats for %gd
doc/pretty-formats: explain shortening of %gd
t4205: drop top-level &&-chaining
t4205: indent here documents
date: document and test "raw-local" mode
date: add "unix" format
t/perf: add tests for many-pack scenarios
sha1_file: drop free_pack_by_name
add generic most-recently-used list
find_pack_entry: replace last_found_pack with MRU cache
pack-objects: break out of want_object loop early
pack-objects: compute local/ignore_pack_keep early
am: reset cached ident date for each patch
trace: handle NULL argument in trace_disable()
trace: stop using write_or_whine_pipe()
trace: use warning() for printing trace errors
trace: cosmetic fixes for error messages
trace: correct variable name in write() error message
trace: disable key after write error
write_or_die: drop write_or_whine_pipe()
trace: do not fall back to stderr
Joey Hess (1):
clarify %f documentation
Johannes Schindelin (56):
mingw: let the build succeed with DEVELOPER=1
perf: accommodate for MacOSX
pretty: make the skip_blank_lines() function public
commit.c: make find_commit_subject() more robust
t2300: "git --exec-path" is not usable in $PATH on Windows as-is
log: prepare log/log-tree to reuse the diffopt.close_file attribute
log-tree: respect diffopt's configured output file stream
line-log: respect diffopt's configured output file stream
graph: respect the diffopt.file setting
shortlog: support outputting to streams other than stdout
format-patch: explicitly switch off color when writing to files
format-patch: avoid freopen()
format-patch: use stdout directly
shortlog: respect the --output=<file> setting
t4211: ensure that log respects --output=<file>
color.h: remove obsolete comment about limitations on Windows
diff: do not color output when --color=auto and --output=<file> is given
t3404: fix a grammo (commands are ran -> commands are run)
commit -C: skip blank lines at the beginning of the message
sequencer: use skip_blank_lines() to find the commit subject
reset --hard: skip blank lines when reporting the commit subject
commit -S: avoid invalid pointer with empty message
mingw: declare main()'s argv as const
t3404: add a test for the --gpg-sign option
rebase -i: demonstrate a bug with --autosquash
rebase -i: we allow extra spaces after fixup!/squash!
am: counteract gender bias
diff: demonstrate a bug with --patience and --ignore-space-at-eol
diff: fix a double off-by-one with --ignore-space-at-eol
t/test-lib.sh: fix running tests with --valgrind
mingw: fix the shortlog --output=<file> test
mingw: fix regression in t1308-config-set
fsck: refactor how to describe objects
fsck_walk(): optionally name objects on the go
fsck: give the error function a chance to see the fsck_options
fsck: optionally show more helpful info for broken links
t5520: verify that `pull --rebase` shows the helpful advice when failing
die("bug"): report bugs consistently
die(_("BUG")): avoid translating bug messages
merge-recursive: clarify code in was_tracked()
prepare the builtins for a libified merge_recursive()
merge_recursive: abort properly upon errors
merge-recursive: avoid returning a wholesale struct
merge-recursive: allow write_tree_from_memory() to error out
merge-recursive: handle return values indicating errors
merge-recursive: switch to returning errors instead of dying
am -3: use merge_recursive() directly again
merge-recursive: flush output buffer before printing error messages
merge-recursive: write the commit title in one go
merge-recursive: offer an option to retain the output in 'obuf'
merge_trees(): ensure that the callers release output buffer
merge-recursive: flush output buffer even when erroring out
import-tars: support hard links
t5533: make it pass on case-sensitive filesystems
nedmalloc: fix misleading indentation
git mv: do not keep slash in `git mv dir non-existing-dir/`
Johannes Sixt (7):
Windows: add missing definition of ENOTSOCK
git-submodule: forward exit code of git-submodule--helper more faithfully
submodule-helper: fix indexing in clone retry error reporting path
rebase-interactive: trim leading whitespace from progress count
t4130: work around Windows limitation
config.c: avoid duplicated global static variables
commit-slab.h: avoid duplicated global static variables
John Keeping (4):
difftool: fix argument handling in subdirs
Documentation/git-push: fix placeholder formatting
push: add shorthand for --force-with-lease branch creation
push: allow pushing new branches with --force-with-lease
Jonathan Nieder (1):
doc: git-htmldocs.googlecode.com is no more
Jonathan Tan (1):
fetch-pack: grow stateless RPC windows exponentially
Jordan DE GEA (1):
worktree: allow "-" short-hand for @{-1} in add command
Josef Kufner (1):
pretty: pass graph width to pretty formatting for use in '%>|(N)'
Josh Triplett (1):
format-patch: format.from gives the default for --from
Junio C Hamano (36):
send-email: detect and offer to skip backup files
pathspec: rename free_pathspec() to clear_pathspec()
t1308: do not get fooled by symbolic links to the source tree
builtin/apply: remove misleading comment on lock_file field
blame, line-log: do not loop around deref_tag()
Start the post-2.9 cycle
clone: do not let --depth imply --shallow-submodules
Start preparing for 2.9.1
Second batch of topics for 2.10
More fixes for 2.9.1
Third batch of topics for 2.10
commit.c: remove print_commit_list()
Fourth batch of topics for 2.10
Git 2.9.1
merge: avoid "safer crlf" during recording of merge results
Fifth batch of topics for 2.10
diff: document diff-filter exclusion
Git 2.9.2
archive-tar: huge offset and future timestamps would not work on 32-bit
Sixth batch of topics for 2.10
grep: further simplify setting the pattern type
Seventh batch of topics for 2.10
date: clarify --date=raw description
Some fixes for 2.9.3
t9100: portability fix
Eighth batch of topics for 2.10
hashmap: clarify that hashmap_entry can safely be discarded
Ninth batch of topics for 2.10
Tenth batch for 2.10
Hopefully final batch for 2.9.3
Eleventh batch for 2.10
Yet another batch for 2.9.3
Twelfth batch for 2.10
Git 2.9.3
Final batch before 2.10-rc0
Git 2.10-rc0
Keith McGuigan (1):
builtin/fetch.c: don't free remote->name after fetch
Kevin Willford (4):
patch-ids: stop using a hand-rolled hashmap implementation
patch-ids: replace the seen indicator with a commit pointer
patch-ids: add flag to create the diff patch id using header only data
rebase: avoid computing unnecessary patch IDs
LE Manh Cuong (1):
sh-setup: enclose setting of ${VAR=default} in double-quotes
Lars Schneider (2):
git-p4: place temporary refs used for branch import under refs/git-p4-tmp
travis-ci: enable web server tests t55xx on Linux
Lars Vogel (1):
Use "working tree" instead of "working directory" for git status
Lukas Fleischer (4):
receive-pack: send auto-gc output over sideband 2
sideband.c: make send_sideband() return void
upload-pack.c: make send_client_data() return void
sideband.c: refactor recv_sideband()
Matthieu Moy (8):
Documentation/git-mv.txt: fix whitespace indentation
doc: typeset short command-line options as literal
doc: typeset long command-line options as literal
doc: typeset '--' as literal
doc: typeset long options with argument as literal
CodingGuidelines: formatting HEAD in documentation
doc: typeset HEAD and variants as literal
status: suggest 'git merge --abort' when appropriate
Mehul Jain (3):
t4202: refactor test
log: add "--no-show-signature" command line option
log: add log.showSignature configuration variable
Michael Haggerty (50):
t1404: demonstrate a bug resolving references
commit_ref(): if there is an empty dir in the way, delete it
read_raw_ref(): don't get confused by an empty directory
safe_create_leading_directories(): improve docstring
remove_dir_recursively(): add docstring
refname_is_safe(): use skip_prefix()
refname_is_safe(): don't allow the empty string
refname_is_safe(): insist that the refname already be normalized
commit_ref_update(): write error message to *err, not stderr
rename_ref(): remove unneeded local variable
ref_transaction_commit(): remove local variables n and updates
read_raw_ref(): rename flags argument to type
read_raw_ref(): clear *type at start of function
read_raw_ref(): rename symref argument to referent
read_raw_ref(): improve docstring
read_raw_ref(): move docstring to header file
lock_ref_sha1_basic(): remove unneeded local variable
refs: make error messages more consistent
ref_transaction_create(): disallow recursive pruning
ref_transaction_commit(): correctly report close_ref() failure
delete_branches(): use resolve_refdup()
verify_refname_available(): adjust constness in declaration
add_update(): initialize the whole ref_update
lock_ref_for_update(): new function
unlock_ref(): move definition higher in the file
ref_transaction_update(): check refname_is_safe() at a minimum
refs: resolve symbolic refs first
lock_ref_for_update(): don't re-read non-symbolic references
lock_ref_for_update(): don't resolve symrefs
commit_ref_update(): remove the flags parameter
lock_ref_sha1_basic(): only handle REF_NODEREF mode
refs: remove unnecessary "extern" keywords
do_for_each_ref(): move docstring to the header file
refs: use name "prefix" consistently
delete_refs(): add a flags argument
remote rm: handle symbolic refs correctly
get_ref_cache(): only create an instance if there is a submodule
entry_resolves_to_object(): rename function from ref_resolves_to_object()
ref_resolves_to_object(): new function
refs: introduce an iterator interface
do_for_each_ref(): reimplement using reference iteration
for_each_reflog(): don't abort for bad references
dir_iterator: new API for iterating over a directory tree
for_each_reflog(): reimplement using iterators
t1404: rename file to t1404-update-ref-errors.sh
t1404: remove "prefix" argument to test_update_rejected
t1404: document function test_update_rejected
t1404: add more tests of update-ref error handling
lock_ref_for_update(): make error handling more uniform
lock_ref_for_update(): avoid a symref resolution
Michael J Gruber (7):
cherry-pick: allow to pick to unborn branches
Documentation/technical: describe signature formats
Documentation/technical: signed tag format
Documentation/technical: signed commit format
Documentation/technical: signed merge tag format
gpg-interface: check gpg signature creation status
t/t91*: do not say how to avoid the tests
Michael Stahl (1):
document git-repack interaction of pack.threads and pack.windowMemory
Mike Hommey (2):
blame: allow to blame paths freshly added to the index
t/t8003-blame-corner-cases.sh: Use here documents
Nguyễn Thái Ngọc Duy (47):
completion: support git-worktree
worktree.c: rewrite mark_current_worktree() to avoid strbuf
git-worktree.txt: keep subcommand listing in alphabetical order
worktree.c: use is_dot_or_dotdot()
worktree: avoid 0{40}, too many zeroes, hard to read
worktree: simplify prefixing paths
worktree.c: add find_worktree()
worktree.c: add is_main_worktree()
lib-httpd.sh: print error.log on error
worktree.c: add is_worktree_locked()
pretty.c: support <direction>|(<negative number>) forms
new-command.txt: correct the command description file
grep: break down an "if" stmt in preparation for next changes
test-regex: isolate the bug test code
test-regex: expose full regcomp() to the command line
grep/icase: avoid kwsset on literal non-ascii strings
git-fetch.txt: document fetch output
fetch: refactor ref update status formatting code
fetch: change flag code for displaying tag update and deleted ref
grep/icase: avoid kwsset when -F is specified
grep: rewrite an if/else condition to avoid duplicate expression
grep/pcre: prepare locale-dependent tables for icase matching
gettext: add is_utf8_locale()
grep/pcre: support utf-8
diffcore-pickaxe: Add regcomp_or_die()
diffcore-pickaxe: support case insensitive match on non-ascii
grep.c: reuse "icase" variable
fetch: align all "remote -> local" output
fetch: reduce duplicate in ref update status lines with placeholder
connect: read $GIT_SSH_COMMAND from config file
worktree: add "lock" command
worktree: add "unlock" command
worktree.c: find_worktree() search by path suffix
pack-objects: pass length to check_pack_crc() without truncation
log: decorate HEAD -> branch with the same color for arrow and HEAD
sha1_file.c: use type off_t* for object_info->disk_sizep
index-pack: correct "len" type in unpack_data()
index-pack: report correct bad object offsets even if they are large
index-pack: correct "offset" type in unpack_entry_data()
pack-objects: do not truncate result in-pack object size on 32-bit systems
fsck: use streaming interface for large blobs in pack
test-lib.sh: introduce and use $EMPTY_TREE
test-lib.sh: introduce and use $EMPTY_BLOB
cache-tree.c: fix i-t-a entry skipping directory updates sometimes
cache-tree: do not generate empty trees as a result of all i-t-a subentries
config.mak.uname: correct perl path on FreeBSD
t7063: work around FreeBSD's lazy mtime update feature
Nicolas Pitre (1):
sideband.c: small optimization of strbuf usage
Orgad Shaneh (1):
commit: describe that --no-verify skips the commit-msg hook in the help text
Parker Moore (2):
contrib/persistent-https: update ldflags syntax for Go 1.7+
contrib/persistent-https: use Git version for build label
Patrick Steinhardt (1):
rebase -i: restore autostash on abort
Peter Colberg (2):
refs.h: fix misspelt "occurred" in a comment
config.c: fix misspelt "occurred" in an error message
Pranit Bauva (2):
builtin/commit.c: memoize git-path for COMMIT_EDITMSG
strbuf: describe the return value of strbuf_read_file
Ramsay Jones (2):
regex: fix a SIZE_MAX macro redefinition warning
write_or_die: remove the unused write_or_whine() function
René Scharfe (26):
t4051: rewrite, add more tests
xdiff: factor out match_func_rec()
xdiff: handle appended chunks better with -W
xdiff: ignore empty lines before added functions with -W
xdiff: -W: don't include common trailing empty lines in context
xdiff: don't trim common tail with -W
t7810: add test for grep -W and trailing empty context lines
grep: -W: don't extend context to trailing empty lines
xdiff: fix merging of appended hunk with -W
.gitattributes: set file type for C files
notes-merge: use O_EXCL to avoid overwriting existing files
am: ignore return value of write_file()
rm: reuse strbuf for all remove_dir_recursively() calls
worktree: use strbuf_add_absolute_path() directly
use strbuf_addbuf() for appending a strbuf to another
submodule-config: use explicit empty string instead of strbuf in config_from()
strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf()
use strbuf_addstr() for adding constant strings to a strbuf
pass constants as first argument to st_mult()
use strbuf_addstr() instead of strbuf_addf() with "%s"
use CHILD_PROCESS_INIT to initialize automatic variables
merge-recursive: use STRING_LIST_INIT_NODUP
merge: use string_list_split() in add_strategies()
nedmalloc: work around overzealous GCC 6 warning
archive-tar: make write_extended_header() void
use strbuf_add_unique_abbrev() for adding short hashes
Ronald Wampler (1):
Makefile: add NEEDS_LIBRT to optionally link with librt
SZEDER Gábor (1):
reflog: continue walking the reflog past root commits
Stefan Beller (22):
submodule update: make use of the existing fetch_in_submodule function
submodule-config: keep shallow recommendation around
submodule update: learn `--[no-]recommend-shallow` option
submodule--helper: initial clone learns retry logic
submodule update: continue when a clone fails
t5614: don't use subshells
push options: {pre,post}-receive hook learns about push options
receive-pack: implement advertising and receiving push options
push: accept push options
add a test for push options
Documentation: pack-protocol correct NAK response
submodule deinit: remove outdated comment
t7406: future proof tests with hard coded depth
submodule update: respect depth in subsequent fetches
submodule update: narrow scope of local variable
submodule--helper: fix usage string for relative-path
submodule-config: keep configured branch around
gitmodules: document shallow recommendation
submodule--helper: add remote-branch helper
submodule update: allow '.' for branch value
submodule--helper: use parallel processor correctly
t7406: fix breakage on OSX
Thomas Braun (3):
completion: factor out untracked file modes into a variable
completion: add __git_get_option_value helper
completion: add git status
Tom Russello (4):
doc: clearer rule about formatting literals
doc: change environment variables format
doc: more consistency in environment variables format
doc: change configuration variables format
Torsten Bögershausen (1):
convert: unify the "auto" handling of CRLF
Vasco Almeida (44):
i18n: builtin/remote.c: fix mark for translation
i18n: advice: mark string about detached head for translation
i18n: advice: internationalize message for conflicts
i18n: transport: mark strings for translation
i18n: sequencer: mark entire sentences for translation
i18n: rebase-interactive: mark here-doc strings for translation
i18n: sequencer: mark string for translation
i18n: rebase-interactive: mark comments of squash for translation
i18n: merge-octopus: mark messages for translation
i18n: setup: mark strings for translation
merge-octopus: use die shell function from git-sh-setup.sh
tests: use test_i18n* functions to suppress false positives
i18n: rebase: fix marked string to use eval_gettext variant
tests: unpack-trees: update to use test_i18n* functions
i18n: rebase: mark placeholder for translation
t9003: become resilient to GETTEXT_POISON
i18n: bisect: simplify error message for i18n
t4153: fix negated test_i18ngrep call
t6030: update to use test_i18ncmp
t5523: use test_i18ngrep for negation
i18n: git-sh-setup.sh: mark strings for translation
i18n: bisect: mark strings for translation
i18n: rebase-interactive: mark strings for translation
i18n: transport-helper.c: change N_() call to _()
i18n: notes: mark strings for translation
i18n: notes: mark options for translation
i18n: merge: mark messages for translation
i18n: merge: change command option help to lowercase
i18n: sequencer: add period to error message
i18n: standardise messages
i18n: remote: mark URL fallback text for translation
i18n: remote: allow translations to reorder message
i18n: init-db: join message pieces
i18n: submodule: join strings marked for translation
i18n: submodule: escape shell variables inside eval_gettext
i18n: unmark die messages for translation
i18n: branch: mark comment when editing branch description for translation
t5541: become resilient to GETTEXT_POISON
t5510: skip tests under GETTEXT_POISON build
i18n: notes: mark comment for translation
i18n: config: unfold error messages marked for translation
i18n: setup: mark error messages for translation
i18n: archive: mark errors for translation
i18n: git-stash: mark messages for translation
Ville Skyttä (3):
git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
completion: complete --delete, --move, and --remotes for git branch
Spelling fixes
William Duclot (1):
userdiff: add built-in pattern for CSS
brian m. carlson (11):
hex: add oid_to_hex_r()
contrib/coccinelle: add basic Coccinelle transforms
coccinelle: convert hashcpy() with null_sha1 to hashclr()
coccinelle: apply object_id Coccinelle transformations
diff: convert struct diff_filespec to struct object_id
diff: rename struct diff_filespec's sha1_valid member
merge-recursive: convert struct stage_data to use object_id
merge-recursive: convert struct merge_file_info to object_id
merge-recursive: convert leaf functions to use struct object_id
merge-recursive: convert merge_recursive_generic() to object_id
diff: convert prep_temp_blob() to struct object_id
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Jul 2016, #02; Wed, 6)
@ 2016-07-06 21:39 3% Junio C Hamano
0 siblings, 0 replies; 22+ results
From: Junio C Hamano @ 2016-07-06 21:39 UTC (permalink / raw
To: git
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.
The first few batches for this cycle has been merged to 'master',
and new topics are trickling into 'next'.
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"]
* ak/t7800-wo-readlink (2016-06-21) 1 commit
(merged to 'next' on 2016-06-28 at 403bbbb)
+ t7800: readlink may not be available
One among four invocations of readlink(1) in our test suite has
been rewritten so that the test can run on systems without the
command (others are in valgrind test framework and t9802).
* ao/p4-has-branch-prefix-fix (2016-06-22) 1 commit
(merged to 'next' on 2016-06-28 at 333f90d)
+ git-p4: correct hasBranchPrefix verbose output
A bug, which caused "git p4" while running under verbose mode to
report paths that are omitted due to branch prefix incorrectly, has
been fixed; the command said "Ignoring file outside of prefix" for
paths that are _inside_.
* cb/t7810-test-label-fix (2016-06-21) 1 commit
(merged to 'next' on 2016-06-28 at 4d85a00)
+ t7810: fix duplicated test title
Test clean-up.
* ep/http-curl-trace (2016-05-24) 2 commits
(merged to 'next' on 2016-06-27 at c290515)
+ 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.
* ew/mboxrd-format-am (2016-06-06) 3 commits
(merged to 'next' on 2016-06-28 at ee0a088)
+ am: support --patch-format=mboxrd
+ mailsplit: support unescaping mboxrd messages
+ pretty: support "mboxrd" output format
Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
* jc/t2300-setup (2016-06-22) 1 commit
(merged to 'next' on 2016-06-28 at 62b902a)
+ t2300: "git --exec-path" is not usable in $PATH on Windows as-is
Portability fix for Windows.
* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit
(merged to 'next' on 2016-06-27 at 568f892)
+ add--interactive: respect diff.compactionHeuristic
"git add -i/-p" learned to honor diff.compactionHeuristic
experimental knob, so that the user can work on the same hunk split
as "git diff" output.
* jk/bisect-show-tree (2016-06-16) 1 commit
(merged to 'next' on 2016-06-27 at 6970f87e)
+ bisect: always call setup_revisions after init_revisions
"git bisect" makes an internal call to "git diff-tree" when
bisection finds the culprit, but this call did not initialize the
data structure to pass to the diff-tree API correctly.
* jk/gpg-interface-cleanup (2016-06-17) 7 commits
(merged to 'next' on 2016-06-28 at eed3498)
+ gpg-interface: check gpg signature creation status
+ sign_buffer: use pipe_command
+ verify_signed_buffer: use pipe_command
+ run-command: add pipe_command helper
+ verify_signed_buffer: use tempfile object
+ verify_signed_buffer: drop pbuf variable
+ gpg-interface: use child_process.args
A new run-command API function pipe_command() is introduced to
sanely feed data to the standard input while capturing data from
the standard output and the standard error of an external process,
which is cumbersome to hand-roll correctly without deadlocking.
The codepath to sign data in a prepared buffer with GPG has been
updated to use this API to read from the status-fd to check for
errors (instead of relying on GPG's exit status).
* jk/parseopt-string-list (2016-06-13) 3 commits
(merged to 'next' on 2016-06-27 at 27462e6)
+ 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.
* jk/repack-keep-unreachable (2016-06-14) 3 commits
(merged to 'next' on 2016-06-28 at 802b849)
+ 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").
* jk/send-pack-stdio (2016-06-10) 2 commits
(merged to 'next' on 2016-06-27 at 2cfb0ff)
+ write_or_die: remove the unused write_or_whine() function
+ send-pack: use buffered I/O to talk to pack-objects
Code clean-up.
* jk/string-list-static-init (2016-06-13) 2 commits
(merged to 'next' on 2016-06-27 at 3d4b2fa)
+ use string_list initializer consistently
+ Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init
(this branch uses jk/parseopt-string-list.)
Instead of taking advantage of a struct string_list that is
allocated with all NULs happens to be STRING_LIST_INIT_NODUP kind,
initialize them explicitly as such, to document their behaviour
better.
* jk/tzoffset-fix (2016-06-20) 3 commits
(merged to 'next' on 2016-06-28 at 08ec8c5)
+ local_tzoffset: detect errors from tm_to_time_t
+ t0006: test various date formats
+ t0006: rename test-date's "show" to "relative"
The internal code used to show local timezone offset is not
prepared to handle timestamps beyond year 2100, and gave a
bogus offset value to the caller. Use a more benign looking
+0000 instead and let "git log" going in such a case, instead
of aborting.
* jk/upload-pack-hook (2016-06-02) 7 commits
(merged to 'next' on 2016-06-28 at e5e5bb6)
+ upload-pack: provide a hook for running pack-objects
+ t1308: do not get fooled by symbolic links to the source tree
+ config: add a notion of "scope"
+ config: return configset value for current_config_ functions
+ config: set up config_source for command-line config
+ git_config_parse_parameter: refactor cleanup code
+ git_config_with_options: drop "found" counting
"upload-pack" allows a custom "git pack-objects" replacement when
responding to "fetch/clone" via the uploadpack.packObjectsHook.
* js/mingw-parameter-less-c-functions (2016-06-20) 1 commit
(merged to 'next' on 2016-06-28 at e673c65)
+ mingw: let the build succeed with DEVELOPER=1
Some platform-specific code had non-ANSI strict declarations of C
functions that do not take any parameters, which has been
corrected.
* js/perf-on-apple (2016-06-21) 1 commit
(merged to 'next' on 2016-06-28 at 83529b9)
+ perf: accommodate for MacOSX
t/perf needs /usr/bin/time with GNU extension; the invocation of it
is updated to "gtime" on Darwin.
* km/fetch-do-not-free-remote-name (2016-06-14) 1 commit
(merged to 'next' on 2016-06-27 at 4bc34c4)
+ builtin/fetch.c: don't free remote->name after fetch
The ownership rule for the piece of memory that hold references to
be fetched in "git fetch" was screwy, which has been cleaned up.
* lc/shell-default-value-noexpand (2016-06-19) 1 commit
(merged to 'next' on 2016-06-28 at 2dc7727)
+ sh-setup: enclose setting of ${VAR=default} in double-quotes
Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
to set the default value, without enclosing it in double quotes.
* lf/sideband-returns-void (2016-06-16) 2 commits
(merged to 'next' on 2016-06-27 at 558c781)
+ upload-pack.c: make send_client_data() return void
+ sideband.c: make send_sideband() return void
A small internal API cleanup.
* mg/signature-doc (2016-06-17) 4 commits
(merged to 'next' on 2016-06-28 at 2732a37)
+ Documentation/technical: signed merge tag format
+ Documentation/technical: signed commit format
+ Documentation/technical: signed tag format
+ Documentation/technical: describe signature formats
Formats of the various data (and how to validate them) where we use
GPG signature have been documented.
* nd/graph-width-padded (2016-06-16) 2 commits
(merged to 'next' on 2016-06-28 at 0f733ef)
+ pretty.c: support <direction>|(<negative number>) forms
+ pretty: pass graph width to pretty formatting for use in '%>|(N)'
"log --graph --format=" learned that "%>|(N)" specifies the width
relative to the terminal's left edge, not relative to the area to
draw text that is to the right of the ancestry-graph section. It
also now accepts negative N that means the column limit is relative
to the right border.
* nd/test-lib-httpd-show-error-log-in-verbose (2016-06-13) 1 commit
(merged to 'next' on 2016-06-27 at 9793d81)
+ lib-httpd.sh: print error.log on error
HTTPd tests learned to show the server error log to help diagnosing
a failing tests.
* nd/worktree-cleanup-post-head-protection (2016-05-24) 6 commits
(merged to 'next' on 2016-06-28 at 55414fa)
+ 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 continues.
* pb/commit-editmsg-path (2016-06-09) 1 commit
(merged to 'next' on 2016-06-27 at 0f01ce1)
+ builtin/commit.c: memoize git-path for COMMIT_EDITMSG
Code clean-up.
* sb/clone-shallow-passthru (2016-06-20) 1 commit
(merged to 'next' on 2016-06-28 at d515d7d)
+ clone: do not let --depth imply --shallow-submodules
(this branch is used by sb/t5614-modernize.)
Fix an unintended regression in v2.9 that breaks "clone --depth"
that recurses down to submodules by forcing the submodules to also
be cloned shallowly, which many server instances that host upstream
of the submodules are not prepared for.
* sb/t5614-modernize (2016-06-21) 1 commit
(merged to 'next' on 2016-06-28 at ee05326)
+ t5614: don't use subshells
(this branch uses sb/clone-shallow-passthru.)
Test clean-up.
--------------------------------------------------
[New Topics]
* ak/lazy-prereq-mktemp (2016-07-06) 1 commit
- t7610: test for mktemp before test execution
A test that unconditionally used "mktemp" learned that the command
is not necessarily available everywhere.
Will merge to 'next'.
* ew/svn-bad-ref (2016-07-06) 1 commit
- git-svn: warn instead of dying when commit data is missing
An earlier update to "git svn" tightened the parsing of refs given
as the command line arguments too much. This has been fixed by
loosening the check a bit.
I'm likely to discard this, favouring a direct pull request from
the subsystem maintainer directly going to 'master'.
* jk/difftool-in-subdir (2016-07-06) 1 commit
- difftool: fix argument handling in subdirs
"git difftool <paths>..." started in a subdirectory failed to
interpret the paths relative to that directory, which has been
fixed.
Waiting for an ack.
* nd/test-helpers (2016-07-06) 2 commits
- Makefile: use VCSSVN_LIB to refer to svn library
- Makefile: drop extra dependencies for test helpers
Build clean-up.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* jh/clean-smudge-annex (2016-07-06) 10 commits
- SQUASH???
- use smudgeToFile filter in recursive merge
- use smudgeToFile filter in git am
- better recovery from failure of smudgeToFile filter
- warn on unusable smudgeToFile/cleanFromFile config
- use smudgeToFile in git checkout etc
- use cleanFromFile in git add
- add smudgeToFile and cleanFromFile filter configs
- clarify %f documentation
- Merge branch 'tb/convert-peek-in-index' into jh/clean-smudge-annex
(this branch uses tb/convert-peek-in-index.)
The interface to "clean/smudge" filters require Git to feed the
whole contents via pipe, which is suboptimal for some
applications. "cleanFromFile/smudgeToFile" commands are the moral
equilvalents for these filters but they interact with the files on
the filesystem directly.
* tb/convert-peek-in-index (2016-07-06) 3 commits
- read-cache: factor out get_sha1_from_index() helper
- correct ce_compare_data() in a middle of a merge
- convert: unify the "auto" handling of CRLF
(this branch is used by jh/clean-smudge-annex.)
Needs review.
* 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 arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* sg/completion-updates (2016-02-28) 21 commits
. completion: cache the path to the repository
. completion: extract repository discovery from __gitdir()
. completion: don't guard git executions with __gitdir()
. completion: consolidate silencing errors from git commands
. completion: don't use __gitdir() for git commands
. completion: respect 'git -C <path>'
. completion: fix completion after 'git -C <path>'
. completion: don't offer commands when 'git --opt' needs an argument
. rev-parse: add '--absolute-git-dir' option
. completion: list short refs from a remote given as a URL
. completion: don't list 'HEAD' when trying refs completion outside of a repo
. completion: list refs from remote when remote's name matches a directory
. completion: respect 'git --git-dir=<path>' when listing remote refs
. completion: fix most spots not respecting 'git --git-dir=<path>'
. completion: ensure that the repository path given on the command line exists
. completion tests: add tests for the __git_refs() helper function
. completion tests: check __gitdir()'s output in the error cases
. completion tests: consolidate getting path of current working directory
. completion tests: make the $cur variable local to the test helper functions
. completion tests: don't add test cruft to the test repository
. completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
(merged to 'next' on 2016-07-06 at 087490c)
+ blame: require 0 context lines while finding moved lines with -M
"git blame -M" missed a single line that was moved within the file.
We may want to squash a test or two to this commit. Volunteers?
* jk/common-main (2016-07-06) 1 commit
- Merge branch 'jk/common-main-2.8' into jk/common-main
(this branch uses jk/common-main-2.8.)
Prepare jk/commin-main-2.8 topic to be mergeable to 2.9 and later.
Will merge to 'master'.
* jk/common-main-2.8 (2016-07-06) 6 commits
- mingw: declare main()'s argv as const
- common-main: call git_setup_gettext()
- common-main: call restore_sigpipe_to_default()
- common-main: call sanitize_stdfds()
- common-main: call git_extract_argv0_path()
- add an extra level of indirection to main()
(this branch is used by jk/common-main.)
There are certain house-keeping tasks that need to be performed at
the very beginning of any Git program, and programs that are not
built-in commands had to do them exactly the same way as "git"
potty does. It was easy to make mistakes in one-off standalone
programs (like test helpers). A common "main()" function that
calls cmd_main() of individual program has been introduced to
make it harder to make mistakes.
* nd/ita-cleanup (2016-07-01) 3 commits
(merged to 'next' on 2016-07-06 at f15aeba)
+ grep: fix grepping for "intent to add" files
+ t7810-grep.sh: fix a whitespace inconsistency
+ t7810-grep.sh: fix duplicated test name
Git does not know what the contents in the index should be for a
path added with "git add -N" yet, so "git grep --cached" should not
show hits (or show lack of hits, with -L) in such a path. But we
did by mistake, which has been corrected.
Will merge to 'master'.
* cc/apply-am (2016-06-28) 41 commits
- apply: use error_errno() where possible
- builtin/am: use apply api in run_apply()
- apply: change error_routine when be_silent is set
- usage: add get_error_routine() and get_warn_routine()
- usage: add set_warn_routine()
- apply: don't print on stdout when be_silent is set
- apply: make 'be_silent' incompatible with 'apply_verbosely'
- apply: add 'be_silent' variable to 'struct apply_state'
- write_or_die: use warning() instead of fprintf(stderr, ...)
- environment: add set_index_file()
- apply: make some parsing functions static again
- apply: move libified code from builtin/apply.c to apply.{c,h}
- apply: rename and move opt constants to apply.h
- builtin/apply: rename option parsing functions
- builtin/apply: make create_one_file() return -1 on error
- builtin/apply: make try_create_file() return -1 on error
- builtin/apply: make write_out_results() return -1 on error
- builtin/apply: make write_out_one_result() return -1 on error
- builtin/apply: make create_file() return -1 on error
- builtin/apply: make add_index_file() return -1 on error
- builtin/apply: make add_conflicted_stages_file() return -1 on error
- builtin/apply: make remove_file() return -1 on error
- builtin/apply: make build_fake_ancestor() return -1 on error
- builtin/apply: change die_on_unsafe_path() to check_unsafe_path()
- builtin/apply: make gitdiff_*() return -1 on error
- builtin/apply: make gitdiff_*() return 1 at end of header
- builtin/apply: make parse_traditional_patch() return -1 on error
- builtin/apply: make apply_all_patches() return 128 or 1 on error
- builtin/apply: move check_apply_state() to apply.c
- builtin/apply: make check_apply_state() return -1 instead of die()ing
- apply: make init_apply_state() return -1 instead of exit()ing
- builtin/apply: move init_apply_state() to apply.c
- builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ing
- builtin/apply: make parse_whitespace_option() return -1 instead of die()ing
- builtin/apply: make parse_single_patch() return -1 on error
- builtin/apply: make parse_chunk() return a negative integer on error
- builtin/apply: make find_header() return -128 instead of die()ing
- builtin/apply: read_patch_file() return -1 instead of die()ing
- builtin/apply: make apply_patch() return -1 or -128 instead of die()ing
- apply: move 'struct apply_state' to apply.h
- apply: make some names more specific
"git am" has been taught to make an internal call to "git apply"'s
innards without spawning the latter as a separate process.
Needs review.
* dp/autoconf-curl-ssl (2016-06-28) 1 commit
- ./configure.ac: detect SSL in libcurl using curl-config
The ./configure script generated from configure.ac was taught how
to detect support of SSL by libcurl better.
Needs review.
* js/color-on-windows-comment (2016-06-28) 1 commit
(merged to 'next' on 2016-06-28 at 38a2ea1)
+ color.h: remove obsolete comment about limitations on Windows
For a long time, we carried an in-code comment that said our
colored output would work only when we use fprintf/fputs on
Windows, which no longer is the case for the past few years.
Will merge to 'master'.
* js/sign-empty-commit-fix (2016-06-29) 1 commit
(merged to 'next' on 2016-07-06 at 448da1b)
+ commit -S: avoid invalid pointer with empty message
"git commit --amend --allow-empty-message -S" for a commit without
any message body could have misidentified where the header of the
commit object ends.
Will merge to 'master'.
* js/t3404-grammo-fix (2016-06-29) 1 commit
(merged to 'next' on 2016-07-06 at 4378654)
+ t3404: fix a grammo (commands are ran -> commands are run)
Grammofix.
Will merge to 'master'.
* ls/p4-tmp-refs (2016-06-29) 1 commit
- git-p4: place temporary refs used for branch import under refs/git-p4-tmp
"git p4" used a location outside $GIT_DIR/refs/ to place its
temporary branches, which has been moved to refs/git-p4-tmp/.
Needs an ack from "git p4" experts.
* jc/pull-rebase-ff (2016-06-29) 1 commit
- pull: fast-forward "pull --rebase=true"
"git pull --rebase", when there is no new commits on our side since
we forked from the upstream, should be able to fast-forward without
invoking "git rebase", but it didn't.
Needs a real log message and a few tests.
* ps/rebase-i-auto-unstash-upon-abort (2016-06-29) 1 commit
(merged to 'next' on 2016-07-06 at 0fdcedb)
+ rebase -i: restore autostash on abort
"git rebase -i --autostash" did not restore the auto-stashed change
when the operation was aborted.
Will merge to 'master'.
* dg/subtree-rebase-test (2016-06-28) 1 commit
(merged to 'next' on 2016-07-06 at 4dec1ad)
+ contrib/subtree: Add a test for subtree rebase that loses commits
This is just a test to specify the desired behaviour that currently
is not available.
Will merge to 'master'.
* jk/test-match-signal (2016-07-06) 4 commits
- t/lib-git-daemon: use test_match_signal
- test_must_fail: use test_match_signal
- t0005: use test_match_signal as appropriate
- tests: factor portable signal check out of t0005
The test framework learned a new helper test_match_signal to check
an exit code from getting killed by an expected signal.
Is this what everybody can agree on?
* ah/unpack-trees-advice-messages (2016-06-27) 1 commit
(merged to 'next' on 2016-07-06 at 4254fc2)
+ unpack-trees: fix English grammar in do-this-before-that messages
Grammofix.
Will merge to 'master'.
* ew/gc-auto-pack-limit-fix (2016-06-27) 1 commit
(merged to 'next' on 2016-07-06 at aa023d3)
+ gc: fix off-by-one error with gc.autoPackLimit
"gc.autoPackLimit" when set to 1 should not trigger a repacking
when there is only one pack, but the code counted poorly and did
so.
Will merge to 'master'.
* nd/connect-ssh-command-config (2016-07-06) 1 commit
(merged to 'next' on 2016-07-06 at 6eac316)
+ connect: read $GIT_SSH_COMMAND from config file
A new configuration variable core.sshCommand to specify what value
for GIT_SSH_COMMAND to use per repository.
Will merge to 'master'.
* nd/doc-new-command (2016-06-27) 1 commit
(merged to 'next' on 2016-07-06 at 1404b64)
+ new-command.txt: correct the command description file
Typofix in a doc.
Will merge to 'master'.
* po/range-doc (2016-07-01) 3 commits
- doc: give headings for the two and three dot notations
- doc: show the actual left, right, and boundary marks
- doc: use 'symmetric difference' consistently
Clarify various ways to specify the "revision ranges" in the
documentation.
Will hold.
There is another one that tries to clarify r1..r2 excludes r1
itself, which is not queued here waiting for the conclusion of a
review discussion. Otherwise looked good.
* sb/submodule-parallel-fetch (2016-06-27) 2 commits
(merged to 'next' on 2016-07-06 at de5fd35)
+ xwrite: poll on non-blocking FDs
+ xread: retry after poll on EAGAIN/EWOULDBLOCK
Fix a recently introduced codepaths that are involved in parallel
submodule operations, which gave up on reading too early, and
could have wasted CPU while attempting to write under a corner case
condition.
Will merge to 'master'.
* mm/doc-tt (2016-06-28) 7 commits
(merged to 'next' on 2016-07-06 at a8c74bd)
+ doc: typeset HEAD and variants as literal
+ CodingGuidelines: formatting HEAD in documentation
+ doc: typeset long options with argument as literal
+ doc: typeset '--' as literal
+ doc: typeset long command-line options as literal
+ doc: typeset short command-line options as literal
+ Documentation/git-mv.txt: fix whitespace indentation
More mark-up updates to typeset strings that are expected to
literally typed by the end user in fixed-width font.
Will merge to 'master'.
* nd/fetch-ref-summary (2016-07-06) 5 commits
- fetch: reduce duplicate in ref update status lines with placeholder
- fetch: align all "remote -> local" output
- fetch: change flag code for displaying tag update and deleted ref
- fetch: refactor ref update status formatting code
- git-fetch.txt: document fetch output
Improve the look of the way "git fetch" reports what happened to
each ref that was fetched.
Will merge to 'next'.
* jk/perf-any-version (2016-06-22) 2 commits
(merged to 'next' on 2016-06-28 at 6a41c30)
+ p4211: explicitly disable renames in no-rename test
+ t/perf: fix regression in testing older versions of git
Allow t/perf framework to use the features from the most recent
version of Git even when testing an older installed version.
Will merge to 'master'.
* jn/preformatted-doc-url (2016-06-22) 1 commit
(merged to 'next' on 2016-06-28 at 60a99eb)
+ doc: git-htmldocs.googlecode.com is no more
Will merge to 'master'.
* ex/deprecate-empty-pathspec-as-match-all (2016-06-22) 1 commit
- pathspec: warn on empty strings as pathspec
An empty string used as a pathspec element has always meant
'everything matches', but it is too easy to write a script that
finds a path to remove in $path and run 'git rm "$paht"', which
ends up removing everything. Start warning about this use of an
empty string used for 'everything matches' and ask users to use a
more explicit '.' for that instead.
The hope is that existing users will not mind this change, and
eventually the warning can be turned into a hard error, upgrading
the deprecation into removal of this (mis)feature.
Will wait for further comments for a bit before merging to 'next'.
* jk/ansi-color (2016-06-23) 7 commits
(merged to 'next' on 2016-06-28 at 354989c)
+ color: support strike-through attribute
+ color: support "italic" attribute
+ color: allow "no-" for negating attributes
+ color: refactor parse_attr
+ add skip_prefix_mem helper
+ doc: refactor description of color format
+ color: fix max-size comment
The output coloring scheme learned two new attributes, italic and
strike, in addition to existing bold, reverse, etc.
Will merge to 'master'.
* nd/icase (2016-07-01) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: Add regcomp_or_die()
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep: rewrite an if/else condition to avoid duplicate expression
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
"git grep -i" has been taught to fold case in non-ascii locales
correctly.
Will merge to 'next'.
* mj/log-show-signature-conf (2016-06-24) 3 commits
(merged to 'next' on 2016-06-28 at c8b3347)
+ log: add log.showSignature configuration variable
+ log: add "--no-show-signature" command line option
+ t4202: refactor test
"git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
Will merge to 'master'.
* mh/ref-store (2016-06-20) 38 commits
- refs: implement iteration over only per-worktree refs
- refs: make lock generic
- refs: add method to rename refs
- refs: add methods to init refs db
- refs: make delete_refs() virtual
- refs: add method for initial ref transaction commit
- refs: add methods for reflog
- refs: add method iterator_begin
- files_ref_iterator_begin(): take a ref_store argument
- split_symref_update(): add a files_ref_store argument
- lock_ref_sha1_basic(): add a files_ref_store argument
- lock_ref_for_update(): add a files_ref_store argument
- commit_ref_update(): add a files_ref_store argument
- lock_raw_ref(): add a files_ref_store argument
- repack_without_refs(): add a files_ref_store argument
- refs: make peel_ref() virtual
- refs: make create_symref() virtual
- refs: make pack_refs() virtual
- refs: make verify_refname_available() virtual
- refs: make read_raw_ref() virtual
- resolve_gitlink_ref(): rename path parameter to submodule
- resolve_gitlink_ref(): avoid memory allocation in many cases
- resolve_gitlink_ref(): implement using resolve_ref_recursively()
- resolve_ref_recursively(): new function
- read_raw_ref(): take a (struct ref_store *) argument
- resolve_gitlink_packed_ref(): remove function
- resolve_packed_ref(): rename function from resolve_missing_loose_ref()
- refs: reorder definitions
- refs: add a transaction_commit() method
- {lock,commit,rollback}_packed_refs(): add files_ref_store arguments
- resolve_missing_loose_ref(): add a files_ref_store argument
- get_packed_ref(): add a files_ref_store argument
- add_packed_ref(): add a files_ref_store argument
- refs: create a base class "ref_store" for files_ref_store
- refs: add a backend method structure
- refs: rename struct ref_cache to files_ref_store
- rename_ref_available(): add docstring
- resolve_gitlink_ref(): eliminate temporary variable
(this branch uses mh/ref-iterators and mh/split-under-lock; is tangled with mh/update-ref-errors.)
The ref-store abstraction was introduced to the refs API so that we
can plug in different backends to store references.
Needs a fixup.
($gmane/298137)
* mh/update-ref-errors (2016-06-20) 6 commits
- lock_ref_for_update(): avoid a symref resolution
- lock_ref_for_update(): make error handling more uniform
- t1404: add more tests of update-ref error handling
- t1404: document function test_update_rejected
- t1404: remove "prefix" argument to test_update_rejected
- t1404: rename file to t1404-update-ref-errors.sh
(this branch uses mh/split-under-lock; is tangled with mh/ref-iterators and mh/ref-store.)
Error handling in the codepaths that updates refs has been
improved.
Is everybody happy with this version?
If so, will merge to 'next'.
* js/find-commit-subject-ignore-leading-blanks (2016-06-29) 5 commits
(merged to 'next' on 2016-06-29 at 9717e00)
+ reset --hard: skip blank lines when reporting the commit subject
+ sequencer: use skip_blank_lines() to find the commit subject
+ commit -C: skip blank lines at the beginning of the message
(merged to 'next' on 2016-06-28 at 32bbd94)
+ commit.c: make find_commit_subject() more robust
+ pretty: make the skip_blank_lines() function public
A helper function that takes the contents of a commit object and
finds its subject line did not ignore leading blank lines, as is
commonly done by other codepaths. Make it ignore leading blank
lines to match.
Will merge to 'master'.
* js/log-to-diffopt-file (2016-06-28) 11 commits
(merged to 'next' on 2016-07-06 at 39e7a5f)
+ diff: do not color output when --color=auto and --output=<file> is given
+ t4211: ensure that log respects --output=<file>
+ shortlog: respect the --output=<file> setting
+ format-patch: use stdout directly
+ format-patch: avoid freopen()
+ format-patch: explicitly switch off color when writing to files
+ shortlog: support outputting to streams other than stdout
+ graph: respect the diffopt.file setting
+ line-log: respect diffopt's configured output file stream
+ log-tree: respect diffopt's configured output file stream
+ log: prepare log/log-tree to reuse the diffopt.close_file attribute
The commands in the "log/diff" family had an FILE* pointer in the
data structure they pass around for a long time, but some codepaths
used to always write to the standard output. As a preparatory step
to make "git format-patch" available to the internal callers, these
codepaths have been updated to consistently write into that FILE*
instead.
Will merge to 'master'.
* bc/cocci (2016-06-28) 11 commits
(merged to 'next' on 2016-07-06 at f2e8e2a)
+ diff: convert prep_temp_blob() to struct object_id
+ merge-recursive: convert merge_recursive_generic() to object_id
+ merge-recursive: convert leaf functions to use struct object_id
+ merge-recursive: convert struct merge_file_info to object_id
+ merge-recursive: convert struct stage_data to use object_id
+ diff: rename struct diff_filespec's sha1_valid member
+ diff: convert struct diff_filespec to struct object_id
+ coccinelle: apply object_id Coccinelle transformations
+ coccinelle: convert hashcpy() with null_sha1 to hashclr()
+ contrib/coccinelle: add basic Coccinelle transforms
+ hex: add oid_to_hex_r()
Conversion from unsigned char sha1[20] to struct object_id
continues.
Will cook a bit in 'next' and then merge to 'master'.
* jk/big-and-future-archive-tar (2016-07-01) 5 commits
(merged to 'next' on 2016-07-06 at 89f3835)
+ archive-tar: drop return value
+ archive-tar: write extended headers for far-future mtime
+ archive-tar: write extended headers for file sizes >= 8GB
+ t5000: test tar files that overflow ustar headers
+ t9300: factor out portable "head -c" replacement
"git archive" learned to handle files that are larger than 8GB and
commits far in the future than expressible by the traditional US-TAR
format.
Will merge to 'master'.
* lf/recv-sideband-cleanup (2016-07-06) 2 commits
(merged to 'next' on 2016-07-06 at d527bcb)
+ sideband.c: small optimization of strbuf usage
+ sideband.c: refactor recv_sideband()
Code simplification.
Will merge to 'master'.
* sb/submodule-clone-retry (2016-06-13) 2 commits
(merged to 'next' on 2016-06-28 at 8a86d54)
+ submodule update: continue when a clone fails
+ submodule--helper: initial clone learns retry logic
"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.
Will merge to 'master'.
* jc/blame-reverse (2016-06-14) 2 commits
- blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."
- blame: improve diagnosis for "--reverse NEW"
It is a common mistake to say "git blame --reverse OLD path",
expecting that the command line is dwimmed as if asking how lines
in path in an old revision OLD have survived up to the current
commit.
Any supporters? Otherwise will drop.
* nd/shallow-deepen (2016-06-13) 27 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: make check_non_tip() clean things up on error
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
Rerolled. What this topic attempts to achieve is worthwhile, I
would think.
* jc/attr-more (2016-06-09) 8 commits
- attr.c: outline the future plans by heavily commenting
- attr.c: always pass check[] to collect_some_attrs()
- attr.c: introduce empty_attr_check_elems()
- attr.c: correct ugly hack for git_all_attrs()
- attr.c: rename a local variable check
- fixup! d5ad6c13
- attr.c: pass struct git_attr_check down the callchain
- attr.c: add push_stack() helper
(this branch uses jc/attr; is tangled with sb/pathspec-label and sb/submodule-default-paths.)
The beginning of long and tortuous journey to clean-up attribute
subsystem implementation.
Needs to be redone.
* mh/ref-iterators (2016-06-20) 13 commits
- for_each_reflog(): reimplement using iterators
- dir_iterator: new API for iterating over a directory tree
- for_each_reflog(): don't abort for bad references
- do_for_each_ref(): reimplement using reference iteration
- refs: introduce an iterator interface
- ref_resolves_to_object(): new function
- entry_resolves_to_object(): rename function from ref_resolves_to_object()
- get_ref_cache(): only create an instance if there is a submodule
- remote rm: handle symbolic refs correctly
- delete_refs(): add a flags argument
- refs: use name "prefix" consistently
- do_for_each_ref(): move docstring to the header file
- refs: remove unnecessary "extern" keywords
(this branch is used by mh/ref-store; uses mh/split-under-lock; is tangled with mh/update-ref-errors.)
The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
Is everybody happy with this version?
If so, will merge to 'next'.
* mh/connect (2016-06-06) 10 commits
- connect: [host:port] is legacy for ssh
- connect: move ssh command line preparation to a separate function
- connect: actively reject git:// urls with a user part
- connect: change the --diag-url output to separate user and host
- connect: make parse_connect_url() return the user part of the url as a separate value
- connect: group CONNECT_DIAG_URL handling code
- connect: make parse_connect_url() return separated host and port
- connect: re-derive a host:port string from the separate host and port variables
- connect: call get_host_and_port() earlier
- connect: document why we sometimes call get_port after get_host_and_port
Rewrite Git-URL parsing routine (hopefully) without changing any
behaviour.
Comments?
* va/i18n-even-more (2016-07-01) 39 commits
(merged to 'next' on 2016-07-01 at fa5e50e3)
+ t5541: become resilient to GETTEXT_POISON
(merged to 'next' on 2016-06-28 at 5919dfa)
+ i18n: branch: mark comment when editing branch description for translation
+ i18n: unmark die messages for translation
+ i18n: submodule: escape shell variables inside eval_gettext
+ i18n: submodule: join strings marked for translation
+ i18n: init-db: join message pieces
+ i18n: remote: allow translations to reorder message
+ i18n: remote: mark URL fallback text for translation
+ i18n: standardise messages
+ i18n: sequencer: add period to error message
+ i18n: merge: change command option help to lowercase
+ i18n: merge: mark messages for translation
+ i18n: notes: mark options for translation
+ i18n: notes: mark strings for translation
+ i18n: transport-helper.c: change N_() call to _()
+ i18n: bisect: mark strings for translation
+ t5523: use test_i18ngrep for negation
+ t4153: fix negated test_i18ngrep call
+ t9003: become resilient to GETTEXT_POISON
+ tests: unpack-trees: update to use test_i18n* functions
+ tests: use test_i18n* functions to suppress false positives
+ i18n: setup: mark strings for translation
+ i18n: rebase-interactive: mark comments of squash for translation
+ i18n: rebase-interactive: mark here-doc strings for translation
+ i18n: rebase-interactive: mark strings for translation
+ i18n: git-sh-setup.sh: mark strings for translation
+ t6030: update to use test_i18ncmp
+ i18n: bisect: simplify error message for i18n
+ i18n: rebase: mark placeholder for translation
+ i18n: rebase: fix marked string to use eval_gettext variant
+ merge-octopus: use die shell function from git-sh-setup.sh
+ i18n: merge-octopus: mark messages for translation
+ i18n: sequencer: mark string for translation
+ i18n: sequencer: mark entire sentences for translation
+ i18n: transport: mark strings for translation
+ i18n: advice: internationalize message for conflicts
+ i18n: advice: mark string about detached head for translation
+ i18n: builtin/remote.c: fix mark for translation
+ Merge branch 'jc/t2300-setup' into HEAD
More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
One patch from the original submission dropped due to conflicts
with jk/upload-pack-hook, which is still in flux.
Will merge to 'master'.
* nd/worktree-lock (2016-07-01) 7 commits
- worktree.c: find_worktree() search by path suffix
- worktree: add "unlock" command
- fixup! worktree: add "lock" command
- worktree: add "lock" command
- worktree.c: add is_worktree_locked()
- worktree.c: add is_main_worktree()
- worktree.c: add find_worktree()
"git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location. "git worktree"
command learned a dedicated command pair to create and remoev such
a file, so that the users do not have to do this with editor.
Need to squash one fixup before merging to 'next'.
* sb/submodule-default-paths (2016-06-20) 5 commits
- completion: clone can recurse into submodules
- clone: add --init-submodule=<pathspec> switch
- submodule update: add `--init-default-path` switch
- Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
- Merge branch 'jc/attr' into sb/submodule-default-paths
(this branch uses jc/attr and sb/pathspec-label; is tangled with jc/attr-more.)
Allow specifying the set of submodules the user is interested in on
the command line of "git clone" that clones the superproject.
* jc/attr (2016-05-25) 18 commits
- attr: support quoting pathname patterns in C style
- attr: expose validity check for attribute names
- attr: add counted string version of git_attr()
- attr: add counted string version of git_check_attr()
- attr: retire git_check_attrs() API
- attr: convert git_check_attrs() callers to use the new API
- attr: convert git_all_attrs() to use "struct git_attr_check"
- attr: (re)introduce git_check_attr() and struct git_attr_check
- attr: rename function and struct related to checking attributes
- attr.c: plug small leak in parse_attr_line()
- attr.c: tighten constness around "git_attr" structure
- attr.c: simplify macroexpand_one()
- attr.c: mark where #if DEBUG ends more clearly
- attr.c: complete a sentence in a comment
- attr.c: explain the lack of attr-name syntax check in parse_attr()
- attr.c: update a stale comment on "struct match_attr"
- attr.c: use strchrnul() to scan for one line
- commit.c: use strchrnul() to scan for one line
(this branch is used by jc/attr-more, sb/pathspec-label and sb/submodule-default-paths.)
The attributes API has been updated so that it can later be
optimized using the knowledge of which attributes are queried.
I wanted to polish this topic further to make the attribute
subsystem thread-ready, but because other topics depend on this
topic and they do not (yet) need it to be thread-ready, let's merge
this early part together with the dependent topics to 'next', and
back-burner the threading enhancement to another day.
* pb/bisect (2016-06-27) 9 commits
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
- bisect--helper: `bisect_reset` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- t6030: explicitly test for bisection cleanup
- bisect--helper: `bisect_clean_state` shell function in C
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
GSoC "bisect" topic.
* sb/pathspec-label (2016-06-03) 6 commits
- pathspec: disable preload-index when attribute pathspec magic is in use
- pathspec: allow escaped query values
- pathspec: allow querying for attributes
- pathspec: move prefix check out of the inner loop
- pathspec: move long magic parsing out of prefix_pathspec
- Documentation: fix a typo
(this branch is used by sb/submodule-default-paths; uses jc/attr; is tangled with jc/attr-more.)
The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
to limit paths that match $pattern further by attribute settings.
The preload-index mechanism is disabled when the new pathspec magic
is in use (at least for now), because the attribute subsystem is
not thread-ready.
* mh/split-under-lock (2016-06-13) 33 commits
- lock_ref_sha1_basic(): only handle REF_NODEREF mode
- commit_ref_update(): remove the flags parameter
- lock_ref_for_update(): don't resolve symrefs
- lock_ref_for_update(): don't re-read non-symbolic references
- refs: resolve symbolic refs first
- ref_transaction_update(): check refname_is_safe() at a minimum
- unlock_ref(): move definition higher in the file
- lock_ref_for_update(): new function
- add_update(): initialize the whole ref_update
- verify_refname_available(): adjust constness in declaration
- refs: don't dereference on rename
- refs: allow log-only updates
- delete_branches(): use resolve_refdup()
- ref_transaction_commit(): correctly report close_ref() failure
- ref_transaction_create(): disallow recursive pruning
- refs: make error messages more consistent
- lock_ref_sha1_basic(): remove unneeded local variable
- read_raw_ref(): move docstring to header file
- read_raw_ref(): improve docstring
- read_raw_ref(): rename symref argument to referent
- read_raw_ref(): clear *type at start of function
- read_raw_ref(): rename flags argument to type
- ref_transaction_commit(): remove local variables n and updates
- rename_ref(): remove unneeded local variable
- commit_ref_update(): write error message to *err, not stderr
- refname_is_safe(): insist that the refname already be normalized
- refname_is_safe(): don't allow the empty string
- refname_is_safe(): use skip_prefix()
- remove_dir_recursively(): add docstring
- safe_create_leading_directories(): improve docstring
- read_raw_ref(): don't get confused by an empty directory
- commit_ref(): if there is an empty dir in the way, delete it
- t1404: demonstrate a bug resolving references
(this branch is used by mh/ref-iterators, mh/ref-store and mh/update-ref-errors.)
Further preparatory work on the refs API before the pluggable
backend series can land.
Is everybody happy with this version?
If so, will merge to 'next'.
* jc/send-email-skip-backup (2016-04-12) 1 commit
(merged to 'next' on 2016-06-28 at 67dac59)
+ send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Will merge to 'master'.
Perhaps people will enhance it more once it gains more visibility.
* kn/ref-filter-branch-list (2016-05-17) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Rerolled.
This also really needs review.
* dt/index-helper (2016-07-06) 21 commits
- index-helper: indexhelper.exitAfter config
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: support watchman to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: log warnings
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- unix-socket.c: add stub implementation when unix sockets are not supported
- pkt-line: add gentle version of packet_write
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
A new "index-helper" daemon has been introduced to give newly
spawned Git process a quicker access to the data in the index, and
optionally interface with the watchman daemon to further reduce the
refresh cost.
Is everybody happy with this version?
At v14.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
While I think it would make it easier for people to experiment and
build on if the topic is merged to 'next', I am at the same time a
bit reluctant to merge an unproven new topic that introduces a new
file format, which we may end up having to support til the end of
time. Comments?
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Jul 2016, #01; Fri, 1)
@ 2016-07-01 23:50 3% Junio C Hamano
0 siblings, 0 replies; 22+ results
From: Junio C Hamano @ 2016-07-01 23:50 UTC (permalink / raw
To: git
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.
The first few batches for this cycle has been merged to 'master',
and new topics are trickling into 'next'.
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
--------------------------------------------------
[New Topics]
* jk/common-main (2016-07-01) 1 commit
- Merge branch 'jk/common-main-2.8' into jk/common-main
(this branch uses jk/common-main-2.8.)
* jk/common-main-2.8 (2016-07-01) 5 commits
- common-main: call git_setup_gettext()
- common-main: call restore_sigpipe_to_default()
- common-main: call sanitize_stdfds()
- common-main: call git_extract_argv0_path()
- add an extra level of indirection to main()
(this branch is used by jk/common-main.)
There are certain house-keeping tasks that need to be performed at
the very beginning of any Git program, and programs that are not
built-in commands had to do them exactly the same way as "git"
potty does. It was easy to make mistakes in one-off standalone
programs (like test helpers). A common "main()" function that
calls cmd_main() of individual program has been introduced to
make it harder to make mistakes.
* nd/ita-cleanup (2016-07-01) 3 commits
- grep: fix grepping for "intent to add" files
- t7810-grep.sh: fix a whitespace inconsistency
- t7810-grep.sh: fix duplicated test name
Git does not know what the contents in the index should be for a
path added with "git add -N" yet, so "git grep --cached" should not
show hits (or show lack of hits, with -L) in such a path. But we
did by mistake, which has been corrected.
--------------------------------------------------
[Stalled]
* jh/clean-smudge-annex (2016-06-22) 10 commits
- SQUASH???
- use smudgeToFile filter in recursive merge
- use smudgeToFile filter in git am
- better recovery from failure of smudgeToFile filter
- warn on unusable smudgeToFile/cleanFromFile config
- use smudgeToFile in git checkout etc
- use cleanFromFile in git add
- add smudgeToFile and cleanFromFile filter configs
- clarify %f documentation
- Merge branch 'tb/convert-peek-in-index' into jh/clean-smudge-annex
(this branch uses tb/convert-peek-in-index.)
The interface to "clean/smudge" filters require Git to feed the
whole contents via pipe, which is suboptimal for some
applications. "cleanFromFile/smudgeToFile" commands are the moral
equilvalents for these filters but they interact with the files on
the filesystem directly.
* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
- blame: require 0 context lines while finding moved lines with -M
"git blame -M" missed a single line that was moved within the file.
We may want to squash a test or two to this commit. Volunteers?
* tb/convert-peek-in-index (2016-06-07) 3 commits
- correct ce_compare_data() in a middle of a merge
- read-cache: factor out get_sha1_from_index() helper
- convert: unify the "auto" handling of CRLF
(this branch is used by jh/clean-smudge-annex.)
Needs review.
* 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 arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* sg/completion-updates (2016-02-28) 21 commits
. completion: cache the path to the repository
. completion: extract repository discovery from __gitdir()
. completion: don't guard git executions with __gitdir()
. completion: consolidate silencing errors from git commands
. completion: don't use __gitdir() for git commands
. completion: respect 'git -C <path>'
. completion: fix completion after 'git -C <path>'
. completion: don't offer commands when 'git --opt' needs an argument
. rev-parse: add '--absolute-git-dir' option
. completion: list short refs from a remote given as a URL
. completion: don't list 'HEAD' when trying refs completion outside of a repo
. completion: list refs from remote when remote's name matches a directory
. completion: respect 'git --git-dir=<path>' when listing remote refs
. completion: fix most spots not respecting 'git --git-dir=<path>'
. completion: ensure that the repository path given on the command line exists
. completion tests: add tests for the __git_refs() helper function
. completion tests: check __gitdir()'s output in the error cases
. completion tests: consolidate getting path of current working directory
. completion tests: make the $cur variable local to the test helper functions
. completion tests: don't add test cruft to the test repository
. completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* cc/apply-am (2016-06-28) 41 commits
- apply: use error_errno() where possible
- builtin/am: use apply api in run_apply()
- apply: change error_routine when be_silent is set
- usage: add get_error_routine() and get_warn_routine()
- usage: add set_warn_routine()
- apply: don't print on stdout when be_silent is set
- apply: make 'be_silent' incompatible with 'apply_verbosely'
- apply: add 'be_silent' variable to 'struct apply_state'
- write_or_die: use warning() instead of fprintf(stderr, ...)
- environment: add set_index_file()
- apply: make some parsing functions static again
- apply: move libified code from builtin/apply.c to apply.{c,h}
- apply: rename and move opt constants to apply.h
- builtin/apply: rename option parsing functions
- builtin/apply: make create_one_file() return -1 on error
- builtin/apply: make try_create_file() return -1 on error
- builtin/apply: make write_out_results() return -1 on error
- builtin/apply: make write_out_one_result() return -1 on error
- builtin/apply: make create_file() return -1 on error
- builtin/apply: make add_index_file() return -1 on error
- builtin/apply: make add_conflicted_stages_file() return -1 on error
- builtin/apply: make remove_file() return -1 on error
- builtin/apply: make build_fake_ancestor() return -1 on error
- builtin/apply: change die_on_unsafe_path() to check_unsafe_path()
- builtin/apply: make gitdiff_*() return -1 on error
- builtin/apply: make gitdiff_*() return 1 at end of header
- builtin/apply: make parse_traditional_patch() return -1 on error
- builtin/apply: make apply_all_patches() return 128 or 1 on error
- builtin/apply: move check_apply_state() to apply.c
- builtin/apply: make check_apply_state() return -1 instead of die()ing
- apply: make init_apply_state() return -1 instead of exit()ing
- builtin/apply: move init_apply_state() to apply.c
- builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ing
- builtin/apply: make parse_whitespace_option() return -1 instead of die()ing
- builtin/apply: make parse_single_patch() return -1 on error
- builtin/apply: make parse_chunk() return a negative integer on error
- builtin/apply: make find_header() return -128 instead of die()ing
- builtin/apply: read_patch_file() return -1 instead of die()ing
- builtin/apply: make apply_patch() return -1 or -128 instead of die()ing
- apply: move 'struct apply_state' to apply.h
- apply: make some names more specific
"git am" has been taught to make an internal call to "git apply"'s
innards without spawning the latter as a separate process.
Needs review.
* dp/autoconf-curl-ssl (2016-06-28) 1 commit
- ./configure.ac: detect SSL in libcurl using curl-config
The ./configure script generated from configure.ac was taught how
to detect support of SSL by libcurl better.
Needs review.
* js/color-on-windows-comment (2016-06-28) 1 commit
(merged to 'next' on 2016-06-28 at 38a2ea1)
+ color.h: remove obsolete comment about limitations on Windows
For a long time, we carried an in-code comment that said our
colored output would work only when we use fprintf/fputs on
Windows, which no longer is the case for the past few years.
Will merge to 'master'.
* js/sign-empty-commit-fix (2016-06-29) 1 commit
- commit -S: avoid invalid pointer with empty message
"git commit --amend --allow-empty-message -S" for a commit without
any message body could have misidentified where the header of the
commit object ends.
Will merge to 'next'.
* js/t3404-grammo-fix (2016-06-29) 1 commit
- t3404: fix a grammo (commands are ran -> commands are run)
Will merge to 'next'.
* ls/p4-tmp-refs (2016-06-29) 1 commit
- git-p4: place temporary refs used for branch import under refs/git-p4-tmp
"git p4" used a location outside $GIT_DIR/refs/ to place its
temporary branches, which has been moved to refs/git-p4-tmp/.
Needs an ack from "git p4" experts.
* jc/pull-rebase-ff (2016-06-29) 1 commit
- pull: fast-forward "pull --rebase=true"
"git pull --rebase", when there is no new commits on our side since
we forked from the upstream, should be able to fast-forward without
invoking "git rebase", but it didn't.
Needs a real log message and a few tests.
* ps/rebase-i-auto-unstash-upon-abort (2016-06-29) 1 commit
- rebase -i: restore autostash on abort
"git rebase -i --autostash" did not restore the auto-stashed change
when the operation was aborted.
Will merge to 'next'.
* dg/subtree-rebase-test (2016-06-28) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
This is just a test to specify the desired behaviour that currently
is not available.
Will merge to 'next'.
* jk/test-match-signal (2016-06-24) 4 commits
- t/lib-git-daemon: use test_match_signal
- test_must_fail: use test_match_signal
- t0005: use test_match_signal as appropriate
- tests: factor portable signal check out of t0005
The test framework learned a new helper test_match_signal to check
an exit code from getting killed by an expected signal.
HOLD
($gmane/298523)
* ah/unpack-trees-advice-messages (2016-06-27) 1 commit
- unpack-trees: fix English grammar in do-this-before-that messages
Will merge to 'next'.
* ew/gc-auto-pack-limit-fix (2016-06-27) 1 commit
- gc: fix off-by-one error with gc.autoPackLimit
"gc.autoPackLimit" when set to 1 should not trigger a repacking
when there is only one pack, but the code counted poorly and did
so.
Will merge to 'next'.
* nd/connect-ssh-command-config (2016-06-28) 2 commits
- SQUASH???
- connect: read $GIT_SSH_COMMAND from config file
A new configuration variable core.sshCommand to specify what value
for GIT_SSH_COMMAND to use per repository.
Is everybody happy with the SQUASH???
If so will merge to 'next'.
* nd/doc-new-command (2016-06-27) 1 commit
- new-command.txt: correct the command description file
Will merge to 'next'.
* po/range-doc (2016-07-01) 3 commits
- doc: give headings for the two and three dot notations
- doc: show the actual left, right, and boundary marks
- doc: use 'symmetric difference' consistently
Clarify various ways to specify the "revision ranges" in the
documentation.
Will hold.
There is another one that tries to clarify r1..r2 excludes r1
itself, which is not queued here waiting for the conclusion of a
review discussion. Otherwise looked good.
* sb/submodule-parallel-fetch (2016-06-27) 2 commits
- xwrite: poll on non-blocking FDs
- xread: retry after poll on EAGAIN/EWOULDBLOCK
Fix a recently introduced codepaths that are involved in parallel
submodule operations, which gave up on reading too early, and
could have wasted CPU while attempting to write under a corner case
condition.
Will merge to 'next'.
* mm/doc-tt (2016-06-28) 7 commits
- doc: typeset HEAD and variants as literal
- CodingGuidelines: formatting HEAD in documentation
- doc: typeset long options with argument as literal
- doc: typeset '--' as literal
- doc: typeset long command-line options as literal
- doc: typeset short command-line options as literal
- Documentation/git-mv.txt: fix whitespace indentation
More mark-up updates to typeset strings that are expected to
literally typed by the end user in fixed-width font.
Will merge to 'next'.
* nd/fetch-ref-summary (2016-06-27) 5 commits
- fetch: reduce duplicate in ref update status lines with placeholder
- fetch: align all "remote -> local" output
- fetch: change flag code for displaying tag update and deleted ref
- fetch: refactor ref update status formatting code
- git-fetch.txt: document fetch output
Improve the look of the way "git fetch" reports what happened to
each ref that was fetched.
Still being discussed.
* ak/t7800-wo-readlink (2016-06-21) 1 commit
(merged to 'next' on 2016-06-28 at 403bbbb)
+ t7800: readlink may not be available
One among four invocations of readlink(1) in our test suite has
been rewritten so that the test can run on systems without the
command (others are in valgrind test framework and t9802).
Will merge to 'master'.
* js/perf-on-apple (2016-06-21) 1 commit
(merged to 'next' on 2016-06-28 at 83529b9)
+ perf: accommodate for MacOSX
t/perf needs /usr/bin/time with GNU extension; the invocation of it
is updated to "gtime" on Darwin.
Will merge to 'master'.
* sb/t5614-modernize (2016-06-21) 1 commit
(merged to 'next' on 2016-06-28 at ee05326)
+ t5614: don't use subshells
(this branch uses sb/clone-shallow-passthru.)
Test clean-up.
Will merge to 'master'.
* ao/p4-has-branch-prefix-fix (2016-06-22) 1 commit
(merged to 'next' on 2016-06-28 at 333f90d)
+ git-p4: correct hasBranchPrefix verbose output
A bug, which caused "git p4" while running under verbose mode to
report paths that are omitted due to branch prefix incorrectly, has
been fixed; the command said "Ignoring file outside of prefix" for
paths that are _inside_.
Will merge to 'master'.
* cb/t7810-test-label-fix (2016-06-21) 1 commit
(merged to 'next' on 2016-06-28 at 4d85a00)
+ t7810: fix duplicated test title
Test clean-up.
Will merge to 'master'.
* jc/t2300-setup (2016-06-22) 1 commit
(merged to 'next' on 2016-06-28 at 62b902a)
+ t2300: "git --exec-path" is not usable in $PATH on Windows as-is
Portability fix for Windows.
Will merge to 'master'.
* jk/perf-any-version (2016-06-22) 2 commits
(merged to 'next' on 2016-06-28 at 6a41c30)
+ p4211: explicitly disable renames in no-rename test
+ t/perf: fix regression in testing older versions of git
Allow t/perf framework to use the features from the most recent
version of Git even when testing an older installed version.
Will merge to 'master'.
* jn/preformatted-doc-url (2016-06-22) 1 commit
(merged to 'next' on 2016-06-28 at 60a99eb)
+ doc: git-htmldocs.googlecode.com is no more
Will merge to 'master'.
* ex/deprecate-empty-pathspec-as-match-all (2016-06-22) 1 commit
- pathspec: warn on empty strings as pathspec
An empty string used as a pathspec element has always meant
'everything matches', but it is too easy to write a script that
finds a path to remove in $path and run 'git rm "$paht"', which
ends up removing everything. Start warning about this use of an
empty string used for 'everything matches' and ask users to use a
more explicit '.' for that instead.
The hope is that existing users will not mind this change, and
eventually the warning can be turned into a hard error, upgrading
the deprecation into removal of this (mis)feature.
Will wait for further comments for a bit before merging to 'next'.
* jk/ansi-color (2016-06-23) 7 commits
(merged to 'next' on 2016-06-28 at 354989c)
+ color: support strike-through attribute
+ color: support "italic" attribute
+ color: allow "no-" for negating attributes
+ color: refactor parse_attr
+ add skip_prefix_mem helper
+ doc: refactor description of color format
+ color: fix max-size comment
The output coloring scheme learned two new attributes, italic and
strike, in addition to existing bold, reverse, etc.
Will merge to 'master'.
* nd/icase (2016-07-01) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: Add regcomp_or_die()
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep: rewrite an if/else condition to avoid duplicate expression
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
"git grep -i" has been taught to fold case in non-ascii locales
correctly.
Will merge to 'next'.
* mj/log-show-signature-conf (2016-06-24) 3 commits
(merged to 'next' on 2016-06-28 at c8b3347)
+ log: add log.showSignature configuration variable
+ log: add "--no-show-signature" command line option
+ t4202: refactor test
"git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
Will merge to 'master'.
* mg/signature-doc (2016-06-17) 4 commits
(merged to 'next' on 2016-06-28 at 2732a37)
+ Documentation/technical: signed merge tag format
+ Documentation/technical: signed commit format
+ Documentation/technical: signed tag format
+ Documentation/technical: describe signature formats
Formats of the various data (and how to validate them) where we use
GPG signature have been documented.
Will merge to 'master'.
* jk/string-list-static-init (2016-06-13) 2 commits
(merged to 'next' on 2016-06-27 at 3d4b2fa)
+ use string_list initializer consistently
+ Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init
(this branch uses jk/parseopt-string-list.)
Instead of taking advantage of a struct string_list that is
allocated with all NULs happens to be STRING_LIST_INIT_NODUP kind,
initialize them explicitly as such, to document their behaviour
better.
Will merge to 'master'.
* mh/ref-store (2016-06-20) 38 commits
- refs: implement iteration over only per-worktree refs
- refs: make lock generic
- refs: add method to rename refs
- refs: add methods to init refs db
- refs: make delete_refs() virtual
- refs: add method for initial ref transaction commit
- refs: add methods for reflog
- refs: add method iterator_begin
- files_ref_iterator_begin(): take a ref_store argument
- split_symref_update(): add a files_ref_store argument
- lock_ref_sha1_basic(): add a files_ref_store argument
- lock_ref_for_update(): add a files_ref_store argument
- commit_ref_update(): add a files_ref_store argument
- lock_raw_ref(): add a files_ref_store argument
- repack_without_refs(): add a files_ref_store argument
- refs: make peel_ref() virtual
- refs: make create_symref() virtual
- refs: make pack_refs() virtual
- refs: make verify_refname_available() virtual
- refs: make read_raw_ref() virtual
- resolve_gitlink_ref(): rename path parameter to submodule
- resolve_gitlink_ref(): avoid memory allocation in many cases
- resolve_gitlink_ref(): implement using resolve_ref_recursively()
- resolve_ref_recursively(): new function
- read_raw_ref(): take a (struct ref_store *) argument
- resolve_gitlink_packed_ref(): remove function
- resolve_packed_ref(): rename function from resolve_missing_loose_ref()
- refs: reorder definitions
- refs: add a transaction_commit() method
- {lock,commit,rollback}_packed_refs(): add files_ref_store arguments
- resolve_missing_loose_ref(): add a files_ref_store argument
- get_packed_ref(): add a files_ref_store argument
- add_packed_ref(): add a files_ref_store argument
- refs: create a base class "ref_store" for files_ref_store
- refs: add a backend method structure
- refs: rename struct ref_cache to files_ref_store
- rename_ref_available(): add docstring
- resolve_gitlink_ref(): eliminate temporary variable
(this branch uses mh/ref-iterators and mh/split-under-lock; is tangled with mh/update-ref-errors.)
The ref-store abstraction was introduced to the refs API so that we
can plug in different backends to store references.
Needs a fixup.
($gmane/298137)
* mh/update-ref-errors (2016-06-20) 6 commits
- lock_ref_for_update(): avoid a symref resolution
- lock_ref_for_update(): make error handling more uniform
- t1404: add more tests of update-ref error handling
- t1404: document function test_update_rejected
- t1404: remove "prefix" argument to test_update_rejected
- t1404: rename file to t1404-update-ref-errors.sh
(this branch uses mh/split-under-lock; is tangled with mh/ref-iterators and mh/ref-store.)
Error handling in the codepaths that updates refs has been
improved.
Is everybody happy with this version?
If so, will merge to 'next'.
* lc/shell-default-value-noexpand (2016-06-19) 1 commit
(merged to 'next' on 2016-06-28 at 2dc7727)
+ sh-setup: enclose setting of ${VAR=default} in double-quotes
Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
to set the default value, without enclosing it in double quotes.
Will merge to 'master'.
* sb/clone-shallow-passthru (2016-06-20) 1 commit
(merged to 'next' on 2016-06-28 at d515d7d)
+ clone: do not let --depth imply --shallow-submodules
(this branch is used by sb/t5614-modernize.)
Fix an unintended regression in v2.9 that breaks "clone --depth"
that recurses down to submodules by forcing the submodules to also
be cloned shallowly, which many server instances that host upstream
of the submodules are not prepared for.
Will merge to 'master'.
* js/find-commit-subject-ignore-leading-blanks (2016-06-29) 5 commits
(merged to 'next' on 2016-06-29 at 9717e00)
+ reset --hard: skip blank lines when reporting the commit subject
+ sequencer: use skip_blank_lines() to find the commit subject
+ commit -C: skip blank lines at the beginning of the message
(merged to 'next' on 2016-06-28 at 32bbd94)
+ commit.c: make find_commit_subject() more robust
+ pretty: make the skip_blank_lines() function public
A helper function that takes the contents of a commit object and
finds its subject line did not ignore leading blank lines, as is
commonly done by other codepaths. Make it ignore leading blank
lines to match.
Will merge to 'master'.
* js/log-to-diffopt-file (2016-06-28) 11 commits
- diff: do not color output when --color=auto and --output=<file> is given
- t4211: ensure that log respects --output=<file>
- shortlog: respect the --output=<file> setting
- format-patch: use stdout directly
- format-patch: avoid freopen()
- format-patch: explicitly switch off color when writing to files
- shortlog: support outputting to streams other than stdout
- graph: respect the diffopt.file setting
- line-log: respect diffopt's configured output file stream
- log-tree: respect diffopt's configured output file stream
- log: prepare log/log-tree to reuse the diffopt.close_file attribute
The commands in the "log/diff" family had an FILE* pointer in the
data structure they pass around for a long time, but some codepaths
used to always write to the standard output. As a preparatory step
to make "git format-patch" available to the internal callers, these
codepaths have been updated to consistently write into that FILE*
instead.
Will merge to 'next'.
* js/mingw-parameter-less-c-functions (2016-06-20) 1 commit
(merged to 'next' on 2016-06-28 at e673c65)
+ mingw: let the build succeed with DEVELOPER=1
Some platform-specific code had non-ANSI strict declarations of C
functions that do not take any parameters, which has been
corrected.
Will merge to 'master'.
* bc/cocci (2016-06-28) 11 commits
- diff: convert prep_temp_blob() to struct object_id
- merge-recursive: convert merge_recursive_generic() to object_id
- merge-recursive: convert leaf functions to use struct object_id
- merge-recursive: convert struct merge_file_info to object_id
- merge-recursive: convert struct stage_data to use object_id
- diff: rename struct diff_filespec's sha1_valid member
- diff: convert struct diff_filespec to struct object_id
- coccinelle: apply object_id Coccinelle transformations
- coccinelle: convert hashcpy() with null_sha1 to hashclr()
- contrib/coccinelle: add basic Coccinelle transforms
- hex: add oid_to_hex_r()
Conversion from unsigned char sha1[20] to struct object_id
continues.
Needs review.
* jk/tzoffset-fix (2016-06-20) 3 commits
(merged to 'next' on 2016-06-28 at 08ec8c5)
+ local_tzoffset: detect errors from tm_to_time_t
+ t0006: test various date formats
+ t0006: rename test-date's "show" to "relative"
The internal code used to show local timezone offset is not
prepared to handle timestamps beyond year 2100, and gave a
bogus offset value to the caller. Use a more benign looking
+0000 instead and let "git log" going in such a case, instead
of aborting.
Will merge to 'master'.
* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit
(merged to 'next' on 2016-06-27 at 568f892)
+ add--interactive: respect diff.compactionHeuristic
"git add -i/-p" learned to honor diff.compactionHeuristic
experimental knob, so that the user can work on the same hunk split
as "git diff" output.
Will merge to 'master'.
* jk/big-and-future-archive-tar (2016-07-01) 5 commits
- archive-tar: drop return value
- archive-tar: write extended headers for far-future mtime
- archive-tar: write extended headers for file sizes >= 8GB
- t5000: test tar files that overflow ustar headers
- t9300: factor out portable "head -c" replacement
"git archive" learned to handle files that are larger than 8GB and
commits far in the future than expressible by the traditional US-TAR
format.
Will merge to 'next'.
* jk/gpg-interface-cleanup (2016-06-17) 7 commits
(merged to 'next' on 2016-06-28 at eed3498)
+ gpg-interface: check gpg signature creation status
+ sign_buffer: use pipe_command
+ verify_signed_buffer: use pipe_command
+ run-command: add pipe_command helper
+ verify_signed_buffer: use tempfile object
+ verify_signed_buffer: drop pbuf variable
+ gpg-interface: use child_process.args
A new run-command API function pipe_command() is introduced to
sanely feed data to the standard input while capturing data from
the standard output and the standard error of an external process,
which is cumbersome to hand-roll correctly without deadlocking.
The codepath to sign data in a prepared buffer with GPG has been
updated to use this API to read from the status-fd to check for
errors (instead of relying on GPG's exit status).
Will merge to 'master'.
* lf/sideband-returns-void (2016-06-16) 2 commits
(merged to 'next' on 2016-06-27 at 558c781)
+ upload-pack.c: make send_client_data() return void
+ sideband.c: make send_sideband() return void
A small internal API cleanup.
Will merge to 'master'.
* nd/graph-width-padded (2016-06-16) 2 commits
(merged to 'next' on 2016-06-28 at 0f733ef)
+ pretty.c: support <direction>|(<negative number>) forms
+ pretty: pass graph width to pretty formatting for use in '%>|(N)'
"log --graph --format=" learned that "%>|(N)" specifies the width
relative to the terminal's left edge, not relative to the area to
draw text that is to the right of the ancestry-graph section. It
also now accepts negative N that means the column limit is relative
to the right border.
Will merge to 'master'.
* jk/bisect-show-tree (2016-06-16) 1 commit
(merged to 'next' on 2016-06-27 at 6970f87e)
+ bisect: always call setup_revisions after init_revisions
"git bisect" makes an internal call to "git diff-tree" when
bisection finds the culprit, but this call did not initialize the
data structure to pass to the diff-tree API correctly.
Will merge to 'master'.
* jk/parseopt-string-list (2016-06-13) 3 commits
(merged to 'next' on 2016-06-27 at 27462e6)
+ 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 'master'.
* jk/repack-keep-unreachable (2016-06-14) 3 commits
(merged to 'next' on 2016-06-28 at 802b849)
+ 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 'master'.
* lf/recv-sideband-cleanup (2016-07-01) 1 commit
- sideband.c: refactor recv_sideband()
Code simplification. It however seems to add unnecessary trailing
output in some cases.
Will merge to 'next'.
* nd/test-lib-httpd-show-error-log-in-verbose (2016-06-13) 1 commit
(merged to 'next' on 2016-06-27 at 9793d81)
+ lib-httpd.sh: print error.log on error
Debugging aid.
Will merge to 'master'.
* sb/submodule-clone-retry (2016-06-13) 2 commits
(merged to 'next' on 2016-06-28 at 8a86d54)
+ submodule update: continue when a clone fails
+ submodule--helper: initial clone learns retry logic
"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.
Will merge to 'master'.
* jc/blame-reverse (2016-06-14) 2 commits
- blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."
- blame: improve diagnosis for "--reverse NEW"
It is a common mistake to say "git blame --reverse OLD path",
expecting that the command line is dwimmed as if asking how lines
in path in an old revision OLD have survived up to the current
commit.
Any supporters? Otherwise will drop.
* km/fetch-do-not-free-remote-name (2016-06-14) 1 commit
(merged to 'next' on 2016-06-27 at 4bc34c4)
+ builtin/fetch.c: don't free remote->name after fetch
The ownership rule for the piece of memory that hold references to
be fetched in "git fetch" was screwy, which has been cleaned up.
Will merge to 'master'.
* nd/shallow-deepen (2016-06-13) 27 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: make check_non_tip() clean things up on error
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
Rerolled. What this topic attempts to achieve is worthwhile, I
would think.
* jk/send-pack-stdio (2016-06-10) 2 commits
(merged to 'next' on 2016-06-27 at 2cfb0ff)
+ write_or_die: remove the unused write_or_whine() function
+ send-pack: use buffered I/O to talk to pack-objects
Code clean-up.
Will merge to 'master'.
* pb/commit-editmsg-path (2016-06-09) 1 commit
(merged to 'next' on 2016-06-27 at 0f01ce1)
+ builtin/commit.c: memoize git-path for COMMIT_EDITMSG
Code clean-up.
Will merge to 'master'.
* jc/attr-more (2016-06-09) 8 commits
- attr.c: outline the future plans by heavily commenting
- attr.c: always pass check[] to collect_some_attrs()
- attr.c: introduce empty_attr_check_elems()
- attr.c: correct ugly hack for git_all_attrs()
- attr.c: rename a local variable check
- fixup! d5ad6c13
- attr.c: pass struct git_attr_check down the callchain
- attr.c: add push_stack() helper
(this branch uses jc/attr; is tangled with sb/pathspec-label and sb/submodule-default-paths.)
The beginning of long and tortuous journey to clean-up attribute
subsystem implementation.
Needs to be redone.
* mh/ref-iterators (2016-06-20) 13 commits
- for_each_reflog(): reimplement using iterators
- dir_iterator: new API for iterating over a directory tree
- for_each_reflog(): don't abort for bad references
- do_for_each_ref(): reimplement using reference iteration
- refs: introduce an iterator interface
- ref_resolves_to_object(): new function
- entry_resolves_to_object(): rename function from ref_resolves_to_object()
- get_ref_cache(): only create an instance if there is a submodule
- remote rm: handle symbolic refs correctly
- delete_refs(): add a flags argument
- refs: use name "prefix" consistently
- do_for_each_ref(): move docstring to the header file
- refs: remove unnecessary "extern" keywords
(this branch is used by mh/ref-store; uses mh/split-under-lock; is tangled with mh/update-ref-errors.)
The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
Is everybody happy with this version?
If so, will merge to 'next'.
* ew/mboxrd-format-am (2016-06-06) 3 commits
(merged to 'next' on 2016-06-28 at ee0a088)
+ am: support --patch-format=mboxrd
+ mailsplit: support unescaping mboxrd messages
+ pretty: support "mboxrd" output format
Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
Will merge to 'master'.
* mh/connect (2016-06-06) 10 commits
- connect: [host:port] is legacy for ssh
- connect: move ssh command line preparation to a separate function
- connect: actively reject git:// urls with a user part
- connect: change the --diag-url output to separate user and host
- connect: make parse_connect_url() return the user part of the url as a separate value
- connect: group CONNECT_DIAG_URL handling code
- connect: make parse_connect_url() return separated host and port
- connect: re-derive a host:port string from the separate host and port variables
- connect: call get_host_and_port() earlier
- connect: document why we sometimes call get_port after get_host_and_port
Rewrite Git-URL parsing routine (hopefully) without changing any
behaviour.
Comments?
* va/i18n-even-more (2016-07-01) 39 commits
(merged to 'next' on 2016-07-01 at fa5e50e3)
+ t5541: become resilient to GETTEXT_POISON
(merged to 'next' on 2016-06-28 at 5919dfa)
+ i18n: branch: mark comment when editing branch description for translation
+ i18n: unmark die messages for translation
+ i18n: submodule: escape shell variables inside eval_gettext
+ i18n: submodule: join strings marked for translation
+ i18n: init-db: join message pieces
+ i18n: remote: allow translations to reorder message
+ i18n: remote: mark URL fallback text for translation
+ i18n: standardise messages
+ i18n: sequencer: add period to error message
+ i18n: merge: change command option help to lowercase
+ i18n: merge: mark messages for translation
+ i18n: notes: mark options for translation
+ i18n: notes: mark strings for translation
+ i18n: transport-helper.c: change N_() call to _()
+ i18n: bisect: mark strings for translation
+ t5523: use test_i18ngrep for negation
+ t4153: fix negated test_i18ngrep call
+ t9003: become resilient to GETTEXT_POISON
+ tests: unpack-trees: update to use test_i18n* functions
+ tests: use test_i18n* functions to suppress false positives
+ i18n: setup: mark strings for translation
+ i18n: rebase-interactive: mark comments of squash for translation
+ i18n: rebase-interactive: mark here-doc strings for translation
+ i18n: rebase-interactive: mark strings for translation
+ i18n: git-sh-setup.sh: mark strings for translation
+ t6030: update to use test_i18ncmp
+ i18n: bisect: simplify error message for i18n
+ i18n: rebase: mark placeholder for translation
+ i18n: rebase: fix marked string to use eval_gettext variant
+ merge-octopus: use die shell function from git-sh-setup.sh
+ i18n: merge-octopus: mark messages for translation
+ i18n: sequencer: mark string for translation
+ i18n: sequencer: mark entire sentences for translation
+ i18n: transport: mark strings for translation
+ i18n: advice: internationalize message for conflicts
+ i18n: advice: mark string about detached head for translation
+ i18n: builtin/remote.c: fix mark for translation
+ Merge branch 'jc/t2300-setup' into HEAD
More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
One patch from the original submission dropped due to conflicts
with jk/upload-pack-hook, which is still in flux.
Will merge to 'master'.
* nd/worktree-lock (2016-07-01) 7 commits
- worktree.c: find_worktree() search by path suffix
- worktree: add "unlock" command
- fixup! worktree: add "lock" command
- worktree: add "lock" command
- worktree.c: add is_worktree_locked()
- worktree.c: add is_main_worktree()
- worktree.c: add find_worktree()
(this branch uses nd/worktree-cleanup-post-head-protection.)
"git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location. "git worktree"
command learned a dedicated command pair to create and remoev such
a file, so that the users do not have to do this with editor.
Need to squash one fixup before merging to 'next'.
* jk/upload-pack-hook (2016-06-02) 7 commits
(merged to 'next' on 2016-06-28 at e5e5bb6)
+ upload-pack: provide a hook for running pack-objects
+ t1308: do not get fooled by symbolic links to the source tree
+ config: add a notion of "scope"
+ config: return configset value for current_config_ functions
+ config: set up config_source for command-line config
+ git_config_parse_parameter: refactor cleanup code
+ git_config_with_options: drop "found" counting
Allow a custom "git upload-pack" replacement to respond to
"fetch/clone" request.
Will merge to 'master'.
* sb/submodule-default-paths (2016-06-20) 5 commits
- completion: clone can recurse into submodules
- clone: add --init-submodule=<pathspec> switch
- submodule update: add `--init-default-path` switch
- Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
- Merge branch 'jc/attr' into sb/submodule-default-paths
(this branch uses jc/attr and sb/pathspec-label; is tangled with jc/attr-more.)
Allow specifying the set of submodules the user is interested in on
the command line of "git clone" that clones the superproject.
* ep/http-curl-trace (2016-05-24) 2 commits
(merged to 'next' on 2016-06-27 at c290515)
+ 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.
Will merge to 'master'.
* jc/attr (2016-05-25) 18 commits
- attr: support quoting pathname patterns in C style
- attr: expose validity check for attribute names
- attr: add counted string version of git_attr()
- attr: add counted string version of git_check_attr()
- attr: retire git_check_attrs() API
- attr: convert git_check_attrs() callers to use the new API
- attr: convert git_all_attrs() to use "struct git_attr_check"
- attr: (re)introduce git_check_attr() and struct git_attr_check
- attr: rename function and struct related to checking attributes
- attr.c: plug small leak in parse_attr_line()
- attr.c: tighten constness around "git_attr" structure
- attr.c: simplify macroexpand_one()
- attr.c: mark where #if DEBUG ends more clearly
- attr.c: complete a sentence in a comment
- attr.c: explain the lack of attr-name syntax check in parse_attr()
- attr.c: update a stale comment on "struct match_attr"
- attr.c: use strchrnul() to scan for one line
- commit.c: use strchrnul() to scan for one line
(this branch is used by jc/attr-more, sb/pathspec-label and sb/submodule-default-paths.)
The attributes API has been updated so that it can later be
optimized using the knowledge of which attributes are queried.
I wanted to polish this topic further to make the attribute
subsystem thread-ready, but because other topics depend on this
topic and they do not (yet) need it to be thread-ready, let's merge
this early part together with the dependent topics to 'next', and
back-burner the threading enhancement to another day.
* pb/bisect (2016-06-27) 9 commits
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
- bisect--helper: `bisect_reset` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- t6030: explicitly test for bisection cleanup
- bisect--helper: `bisect_clean_state` shell function in C
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
GSoC "bisect" topic.
* sb/pathspec-label (2016-06-03) 6 commits
- pathspec: disable preload-index when attribute pathspec magic is in use
- pathspec: allow escaped query values
- pathspec: allow querying for attributes
- pathspec: move prefix check out of the inner loop
- pathspec: move long magic parsing out of prefix_pathspec
- Documentation: fix a typo
(this branch is used by sb/submodule-default-paths; uses jc/attr; is tangled with jc/attr-more.)
The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
to limit paths that match $pattern further by attribute settings.
The preload-index mechanism is disabled when the new pathspec magic
is in use (at least for now), because the attribute subsystem is
not thread-ready.
* nd/worktree-cleanup-post-head-protection (2016-05-24) 6 commits
(merged to 'next' on 2016-06-28 at 55414fa)
+ 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.
Will merge to 'master'.
* mh/split-under-lock (2016-06-13) 33 commits
- lock_ref_sha1_basic(): only handle REF_NODEREF mode
- commit_ref_update(): remove the flags parameter
- lock_ref_for_update(): don't resolve symrefs
- lock_ref_for_update(): don't re-read non-symbolic references
- refs: resolve symbolic refs first
- ref_transaction_update(): check refname_is_safe() at a minimum
- unlock_ref(): move definition higher in the file
- lock_ref_for_update(): new function
- add_update(): initialize the whole ref_update
- verify_refname_available(): adjust constness in declaration
- refs: don't dereference on rename
- refs: allow log-only updates
- delete_branches(): use resolve_refdup()
- ref_transaction_commit(): correctly report close_ref() failure
- ref_transaction_create(): disallow recursive pruning
- refs: make error messages more consistent
- lock_ref_sha1_basic(): remove unneeded local variable
- read_raw_ref(): move docstring to header file
- read_raw_ref(): improve docstring
- read_raw_ref(): rename symref argument to referent
- read_raw_ref(): clear *type at start of function
- read_raw_ref(): rename flags argument to type
- ref_transaction_commit(): remove local variables n and updates
- rename_ref(): remove unneeded local variable
- commit_ref_update(): write error message to *err, not stderr
- refname_is_safe(): insist that the refname already be normalized
- refname_is_safe(): don't allow the empty string
- refname_is_safe(): use skip_prefix()
- remove_dir_recursively(): add docstring
- safe_create_leading_directories(): improve docstring
- read_raw_ref(): don't get confused by an empty directory
- commit_ref(): if there is an empty dir in the way, delete it
- t1404: demonstrate a bug resolving references
(this branch is used by mh/ref-iterators, mh/ref-store and mh/update-ref-errors.)
Further preparatory work on the refs API before the pluggable
backend series can land.
Is everybody happy with this version?
If so, will merge to 'next'.
* jc/send-email-skip-backup (2016-04-12) 1 commit
(merged to 'next' on 2016-06-28 at 67dac59)
+ send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Will merge to 'master'.
Perhaps people will enhance it more once it gains more visibility.
* kn/ref-filter-branch-list (2016-05-17) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Rerolled.
This also really needs review.
* dt/index-helper (2016-06-27) 21 commits
- unix-socket.c: add stub implementation when unix sockets are not supported
- index-helper: indexhelper.exitafter config
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: support watchman to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: log warnings
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- pkt-line: add gentle version of packet_write
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
A new "index-helper" daemon has been introduced to give newly
spawned Git process a quicker access to the data in the index, and
optionally interface with the watchman daemon to further reduce the
refresh cost.
Expecting a reroll.
($gmane/298331, $gmane/298319).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
While I think it would make it easier for people to experiment and
build on if the topic is merged to 'next', I am at the same time a
bit reluctant to merge an unproven new topic that introduces a new
file format, which we may end up having to support til the end of
time. Comments?
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Jun 2016, #10; Wed, 29)
@ 2016-06-29 23:22 3% Junio C Hamano
0 siblings, 0 replies; 22+ results
From: Junio C Hamano @ 2016-06-29 23:22 UTC (permalink / raw
To: git
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.
The first few batches for this cycle has been merged to 'master',
and new topics are trickling into 'next'.
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
--------------------------------------------------
[New Topics]
* cc/apply-am (2016-06-28) 41 commits
- apply: use error_errno() where possible
- builtin/am: use apply api in run_apply()
- apply: change error_routine when be_silent is set
- usage: add get_error_routine() and get_warn_routine()
- usage: add set_warn_routine()
- apply: don't print on stdout when be_silent is set
- apply: make 'be_silent' incompatible with 'apply_verbosely'
- apply: add 'be_silent' variable to 'struct apply_state'
- write_or_die: use warning() instead of fprintf(stderr, ...)
- environment: add set_index_file()
- apply: make some parsing functions static again
- apply: move libified code from builtin/apply.c to apply.{c,h}
- apply: rename and move opt constants to apply.h
- builtin/apply: rename option parsing functions
- builtin/apply: make create_one_file() return -1 on error
- builtin/apply: make try_create_file() return -1 on error
- builtin/apply: make write_out_results() return -1 on error
- builtin/apply: make write_out_one_result() return -1 on error
- builtin/apply: make create_file() return -1 on error
- builtin/apply: make add_index_file() return -1 on error
- builtin/apply: make add_conflicted_stages_file() return -1 on error
- builtin/apply: make remove_file() return -1 on error
- builtin/apply: make build_fake_ancestor() return -1 on error
- builtin/apply: change die_on_unsafe_path() to check_unsafe_path()
- builtin/apply: make gitdiff_*() return -1 on error
- builtin/apply: make gitdiff_*() return 1 at end of header
- builtin/apply: make parse_traditional_patch() return -1 on error
- builtin/apply: make apply_all_patches() return 128 or 1 on error
- builtin/apply: move check_apply_state() to apply.c
- builtin/apply: make check_apply_state() return -1 instead of die()ing
- apply: make init_apply_state() return -1 instead of exit()ing
- builtin/apply: move init_apply_state() to apply.c
- builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ing
- builtin/apply: make parse_whitespace_option() return -1 instead of die()ing
- builtin/apply: make parse_single_patch() return -1 on error
- builtin/apply: make parse_chunk() return a negative integer on error
- builtin/apply: make find_header() return -128 instead of die()ing
- builtin/apply: read_patch_file() return -1 instead of die()ing
- builtin/apply: make apply_patch() return -1 or -128 instead of die()ing
- apply: move 'struct apply_state' to apply.h
- apply: make some names more specific
"git am" has been taught to make an internal call to "git apply"'s
innards without spawning the latter as a separate process.
Needs review.
* dp/autoconf-curl-ssl (2016-06-28) 1 commit
- ./configure.ac: detect SSL in libcurl using curl-config
The ./configure script generated from configure.ac was taught how
to detect support of SSL by libcurl better.
Needs review.
* js/color-on-windows-comment (2016-06-28) 1 commit
(merged to 'next' on 2016-06-28 at 38a2ea1)
+ color.h: remove obsolete comment about limitations on Windows
For a long time, we carried an in-code comment that said our
colored output would work only when we use fprintf/fputs on
Windows, which no longer is the case for the past few years.
Will merge to 'master'.
* js/sign-empty-commit-fix (2016-06-29) 1 commit
- commit -S: avoid invalid pointer with empty message
"git commit --amend --allow-empty-message -S" for a commit without
any message body could have misidentified where the header of the
commit object ends.
Will merge to 'next'.
* js/t3404-grammo-fix (2016-06-29) 1 commit
- t3404: fix a grammo (commands are ran -> commands are run)
Will merge to 'next'.
* ls/p4-tmp-refs (2016-06-29) 1 commit
- git-p4: place temporary refs used for branch import under refs/git-p4-tmp
"git p4" used a location outside $GIT_DIR/refs/ to place its
temporary branches, which has been moved to refs/git-p4-tmp/.
Needs an ack from "git p4" experts.
* jc/pull-rebase-ff (2016-06-29) 1 commit
- pull: fast-forward "pull --rebase=true"
"git pull --rebase", when there is no new commits on our side since
we forked from the upstream, should be able to fast-forward without
invoking "git rebase", but it didn't.
Needs a real log message and a few tests.
* ps/rebase-i-auto-unstash-upon-abort (2016-06-29) 1 commit
- rebase -i: restore autostash on abort
"git rebase -i --autostash" did not restore the auto-stashed change
when the operation was aborted.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* jh/clean-smudge-annex (2016-06-22) 10 commits
- SQUASH???
- use smudgeToFile filter in recursive merge
- use smudgeToFile filter in git am
- better recovery from failure of smudgeToFile filter
- warn on unusable smudgeToFile/cleanFromFile config
- use smudgeToFile in git checkout etc
- use cleanFromFile in git add
- add smudgeToFile and cleanFromFile filter configs
- clarify %f documentation
- Merge branch 'tb/convert-peek-in-index' into jh/clean-smudge-annex
(this branch uses tb/convert-peek-in-index.)
The interface to "clean/smudge" filters require Git to feed the
whole contents via pipe, which is suboptimal for some
applications. "cleanFromFile/smudgeToFile" commands are the moral
equilvalents for these filters but they interact with the files on
the filesystem directly.
* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
- blame: require 0 context lines while finding moved lines with -M
"git blame -M" missed a single line that was moved within the file.
We may want to squash a test or two to this commit. Volunteers?
* tb/convert-peek-in-index (2016-06-07) 3 commits
- correct ce_compare_data() in a middle of a merge
- read-cache: factor out get_sha1_from_index() helper
- convert: unify the "auto" handling of CRLF
(this branch is used by jh/clean-smudge-annex.)
Needs review.
* 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 arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* sg/completion-updates (2016-02-28) 21 commits
. completion: cache the path to the repository
. completion: extract repository discovery from __gitdir()
. completion: don't guard git executions with __gitdir()
. completion: consolidate silencing errors from git commands
. completion: don't use __gitdir() for git commands
. completion: respect 'git -C <path>'
. completion: fix completion after 'git -C <path>'
. completion: don't offer commands when 'git --opt' needs an argument
. rev-parse: add '--absolute-git-dir' option
. completion: list short refs from a remote given as a URL
. completion: don't list 'HEAD' when trying refs completion outside of a repo
. completion: list refs from remote when remote's name matches a directory
. completion: respect 'git --git-dir=<path>' when listing remote refs
. completion: fix most spots not respecting 'git --git-dir=<path>'
. completion: ensure that the repository path given on the command line exists
. completion tests: add tests for the __git_refs() helper function
. completion tests: check __gitdir()'s output in the error cases
. completion tests: consolidate getting path of current working directory
. completion tests: make the $cur variable local to the test helper functions
. completion tests: don't add test cruft to the test repository
. completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* dg/subtree-rebase-test (2016-06-28) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
This is just a test to specify the desired behaviour that currently
is not available.
Will merge to 'next'.
* jk/test-match-signal (2016-06-24) 4 commits
- t/lib-git-daemon: use test_match_signal
- test_must_fail: use test_match_signal
- t0005: use test_match_signal as appropriate
- tests: factor portable signal check out of t0005
The test framework learned a new helper test_match_signal to check
an exit code from getting killed by an expected signal.
HOLD
($gmane/298523)
* ah/unpack-trees-advice-messages (2016-06-27) 1 commit
- unpack-trees: fix English grammar in do-this-before-that messages
Will merge to 'next'.
* ew/gc-auto-pack-limit-fix (2016-06-27) 1 commit
- gc: fix off-by-one error with gc.autoPackLimit
"gc.autoPackLimit" when set to 1 should not trigger a repacking
when there is only one pack, but the code counted poorly and did
so.
Will merge to 'next'.
* nd/connect-ssh-command-config (2016-06-28) 2 commits
- SQUASH???
- connect: read $GIT_SSH_COMMAND from config file
A new configuration variable core.sshCommand to specify what value
for GIT_SSH_COMMAND to use per repository.
Is everybody happy with the SQUASH???
If so will merge to 'next'.
* nd/doc-new-command (2016-06-27) 1 commit
- new-command.txt: correct the command description file
Will merge to 'next'.
* po/range-doc (2016-06-27) 3 commits
- doc: give headings for the two and three dot notations
- doc: show the actual left, right, and boundary marks
- doc: use 'symmetric difference' consistently
Expecting a reroll.
* sb/submodule-parallel-fetch (2016-06-27) 2 commits
- xwrite: poll on non-blocking FDs
- xread: retry after poll on EAGAIN/EWOULDBLOCK
Fix a recently introduced codepaths that are involved in parallel
submodule operations, which gave up on reading too early, and
could have wasted CPU while attempting to write under a corner case
condition.
Will merge to 'next'.
* mm/doc-tt (2016-06-28) 7 commits
- doc: typeset HEAD and variants as literal
- CodingGuidelines: formatting HEAD in documentation
- doc: typeset long options with argument as literal
- doc: typeset '--' as literal
- doc: typeset long command-line options as literal
- doc: typeset short command-line options as literal
- Documentation/git-mv.txt: fix whitespace indentation
More mark-up updates to typeset strings that are expected to
literally typed by the end user in fixed-width font.
Will merge to 'next'.
* nd/fetch-ref-summary (2016-06-27) 5 commits
- fetch: reduce duplicate in ref update status lines with placeholder
- fetch: align all "remote -> local" output
- fetch: change flag code for displaying tag update and deleted ref
- fetch: refactor ref update status formatting code
- git-fetch.txt: document fetch output
Improve the look of the way "git fetch" reports what happened to
each ref that was fetched.
Still being discussed.
* ak/t7800-wo-readlink (2016-06-21) 1 commit
(merged to 'next' on 2016-06-28 at 403bbbb)
+ t7800: readlink may not be available
One among four invocations of readlink(1) in our test suite has
been rewritten so that the test can run on systems without the
command (others are in valgrind test framework and t9802).
Will merge to 'master'.
* js/perf-on-apple (2016-06-21) 1 commit
(merged to 'next' on 2016-06-28 at 83529b9)
+ perf: accommodate for MacOSX
t/perf needs /usr/bin/time with GNU extension; the invocation of it
is updated to "gtime" on Darwin.
Will merge to 'master'.
* sb/t5614-modernize (2016-06-21) 1 commit
(merged to 'next' on 2016-06-28 at ee05326)
+ t5614: don't use subshells
(this branch uses sb/clone-shallow-passthru.)
Test clean-up.
Will merge to 'master'.
* ao/p4-has-branch-prefix-fix (2016-06-22) 1 commit
(merged to 'next' on 2016-06-28 at 333f90d)
+ git-p4: correct hasBranchPrefix verbose output
A bug, which caused "git p4" while running under verbose mode to
report paths that are omitted due to branch prefix incorrectly, has
been fixed; the command said "Ignoring file outside of prefix" for
paths that are _inside_.
Will merge to 'master'.
* cb/t7810-test-label-fix (2016-06-21) 1 commit
(merged to 'next' on 2016-06-28 at 4d85a00)
+ t7810: fix duplicated test title
Test clean-up.
Will merge to 'master'.
* jc/t2300-setup (2016-06-22) 1 commit
(merged to 'next' on 2016-06-28 at 62b902a)
+ t2300: "git --exec-path" is not usable in $PATH on Windows as-is
Portability fix for Windows.
Will merge to 'master'.
* jk/perf-any-version (2016-06-22) 2 commits
(merged to 'next' on 2016-06-28 at 6a41c30)
+ p4211: explicitly disable renames in no-rename test
+ t/perf: fix regression in testing older versions of git
Allow t/perf framework to use the features from the most recent
version of Git even when testing an older installed version.
Will merge to 'master'.
* jn/preformatted-doc-url (2016-06-22) 1 commit
(merged to 'next' on 2016-06-28 at 60a99eb)
+ doc: git-htmldocs.googlecode.com is no more
Will merge to 'master'.
* ex/deprecate-empty-pathspec-as-match-all (2016-06-22) 1 commit
- pathspec: warn on empty strings as pathspec
An empty string used as a pathspec element has always meant
'everything matches', but it is too easy to write a script that
finds a path to remove in $path and run 'git rm "$paht"', which
ends up removing everything. Start warning about this use of an
empty string used for 'everything matches' and ask users to use a
more explicit '.' for that instead.
The hope is that existing users will not mind this change, and
eventually the warning can be turned into a hard error, upgrading
the deprecation into removal of this (mis)feature.
Will wait for further comments for a bit before merging to 'next'.
* jk/ansi-color (2016-06-23) 7 commits
(merged to 'next' on 2016-06-28 at 354989c)
+ color: support strike-through attribute
+ color: support "italic" attribute
+ color: allow "no-" for negating attributes
+ color: refactor parse_attr
+ add skip_prefix_mem helper
+ doc: refactor description of color format
+ color: fix max-size comment
The output coloring scheme learned two new attributes, italic and
strike, in addition to existing bold, reverse, etc.
Will merge to 'master'.
* nd/icase (2016-06-27) 13 commits
- SQUASH???
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: Add regcomp_or_die()
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep: rewrite an if/else condition to avoid duplicate expression
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
"git grep -i" has been taught to fold case in non-ascii locales
correctly.
Modulo minor possible nits, this round looked mostly sensible.
* mj/log-show-signature-conf (2016-06-24) 3 commits
(merged to 'next' on 2016-06-28 at c8b3347)
+ log: add log.showSignature configuration variable
+ log: add "--no-show-signature" command line option
+ t4202: refactor test
"git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
Will merge to 'master'.
* mg/signature-doc (2016-06-17) 4 commits
(merged to 'next' on 2016-06-28 at 2732a37)
+ Documentation/technical: signed merge tag format
+ Documentation/technical: signed commit format
+ Documentation/technical: signed tag format
+ Documentation/technical: describe signature formats
Formats of the various data (and how to validate them) where we use
GPG signature have been documented.
Will merge to 'master'.
* jk/string-list-static-init (2016-06-13) 2 commits
(merged to 'next' on 2016-06-27 at 3d4b2fa)
+ use string_list initializer consistently
+ Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init
(this branch uses jk/parseopt-string-list.)
Instead of taking advantage of a struct string_list that is
allocated with all NULs happens to be STRING_LIST_INIT_NODUP kind,
initialize them explicitly as such, to document their behaviour
better.
Will merge to 'master'.
* mh/ref-store (2016-06-20) 38 commits
- refs: implement iteration over only per-worktree refs
- refs: make lock generic
- refs: add method to rename refs
- refs: add methods to init refs db
- refs: make delete_refs() virtual
- refs: add method for initial ref transaction commit
- refs: add methods for reflog
- refs: add method iterator_begin
- files_ref_iterator_begin(): take a ref_store argument
- split_symref_update(): add a files_ref_store argument
- lock_ref_sha1_basic(): add a files_ref_store argument
- lock_ref_for_update(): add a files_ref_store argument
- commit_ref_update(): add a files_ref_store argument
- lock_raw_ref(): add a files_ref_store argument
- repack_without_refs(): add a files_ref_store argument
- refs: make peel_ref() virtual
- refs: make create_symref() virtual
- refs: make pack_refs() virtual
- refs: make verify_refname_available() virtual
- refs: make read_raw_ref() virtual
- resolve_gitlink_ref(): rename path parameter to submodule
- resolve_gitlink_ref(): avoid memory allocation in many cases
- resolve_gitlink_ref(): implement using resolve_ref_recursively()
- resolve_ref_recursively(): new function
- read_raw_ref(): take a (struct ref_store *) argument
- resolve_gitlink_packed_ref(): remove function
- resolve_packed_ref(): rename function from resolve_missing_loose_ref()
- refs: reorder definitions
- refs: add a transaction_commit() method
- {lock,commit,rollback}_packed_refs(): add files_ref_store arguments
- resolve_missing_loose_ref(): add a files_ref_store argument
- get_packed_ref(): add a files_ref_store argument
- add_packed_ref(): add a files_ref_store argument
- refs: create a base class "ref_store" for files_ref_store
- refs: add a backend method structure
- refs: rename struct ref_cache to files_ref_store
- rename_ref_available(): add docstring
- resolve_gitlink_ref(): eliminate temporary variable
(this branch uses mh/ref-iterators and mh/split-under-lock; is tangled with mh/update-ref-errors.)
The ref-store abstraction was introduced to the refs API so that we
can plug in different backends to store references.
Is everybody happy with this version?
If so, will merge to 'next'.
* mh/update-ref-errors (2016-06-20) 6 commits
- lock_ref_for_update(): avoid a symref resolution
- lock_ref_for_update(): make error handling more uniform
- t1404: add more tests of update-ref error handling
- t1404: document function test_update_rejected
- t1404: remove "prefix" argument to test_update_rejected
- t1404: rename file to t1404-update-ref-errors.sh
(this branch uses mh/split-under-lock; is tangled with mh/ref-iterators and mh/ref-store.)
Error handling in the codepaths that updates refs has been
improved.
Is everybody happy with this version?
If so, will merge to 'next'.
* lc/shell-default-value-noexpand (2016-06-19) 1 commit
(merged to 'next' on 2016-06-28 at 2dc7727)
+ sh-setup: enclose setting of ${VAR=default} in double-quotes
Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
to set the default value, without enclosing it in double quotes.
Will merge to 'master'.
* sb/clone-shallow-passthru (2016-06-20) 1 commit
(merged to 'next' on 2016-06-28 at d515d7d)
+ clone: do not let --depth imply --shallow-submodules
(this branch is used by sb/t5614-modernize.)
Fix an unintended regression in v2.9 that breaks "clone --depth"
that recurses down to submodules by forcing the submodules to also
be cloned shallowly, which many server instances that host upstream
of the submodules are not prepared for.
Will merge to 'master'.
* js/find-commit-subject-ignore-leading-blanks (2016-06-29) 5 commits
(merged to 'next' on 2016-06-29 at 9717e00)
+ reset --hard: skip blank lines when reporting the commit subject
+ sequencer: use skip_blank_lines() to find the commit subject
+ commit -C: skip blank lines at the beginning of the message
(merged to 'next' on 2016-06-28 at 32bbd94)
+ commit.c: make find_commit_subject() more robust
+ pretty: make the skip_blank_lines() function public
A helper function that takes the contents of a commit object and
finds its subject line did not ignore leading blank lines, as is
commonly done by other codepaths. Make it ignore leading blank
lines to match.
Will merge to 'master'.
* js/log-to-diffopt-file (2016-06-28) 11 commits
- diff: do not color output when --color=auto and --output=<file> is given
- t4211: ensure that log respects --output=<file>
- shortlog: respect the --output=<file> setting
- format-patch: use stdout directly
- format-patch: avoid freopen()
- format-patch: explicitly switch off color when writing to files
- shortlog: support outputting to streams other than stdout
- graph: respect the diffopt.file setting
- line-log: respect diffopt's configured output file stream
- log-tree: respect diffopt's configured output file stream
- log: prepare log/log-tree to reuse the diffopt.close_file attribute
The commands in the "log/diff" family had an FILE* pointer in the
data structure they pass around for a long time, but some codepaths
used to always write to the standard output. As a preparatory step
to make "git format-patch" available to the internal callers, these
codepaths have been updated to consistently write into that FILE*
instead.
Will merge to 'next'.
* js/mingw-parameter-less-c-functions (2016-06-20) 1 commit
(merged to 'next' on 2016-06-28 at e673c65)
+ mingw: let the build succeed with DEVELOPER=1
Some platform-specific code had non-ANSI strict declarations of C
functions that do not take any parameters, which has been
corrected.
Will merge to 'master'.
* bc/cocci (2016-06-28) 11 commits
- diff: convert prep_temp_blob() to struct object_id
- merge-recursive: convert merge_recursive_generic() to object_id
- merge-recursive: convert leaf functions to use struct object_id
- merge-recursive: convert struct merge_file_info to object_id
- merge-recursive: convert struct stage_data to use object_id
- diff: rename struct diff_filespec's sha1_valid member
- diff: convert struct diff_filespec to struct object_id
- coccinelle: apply object_id Coccinelle transformations
- coccinelle: convert hashcpy() with null_sha1 to hashclr()
- contrib/coccinelle: add basic Coccinelle transforms
- hex: add oid_to_hex_r()
Conversion from unsigned char sha1[20] to struct object_id
continues.
Needs review.
* jk/tzoffset-fix (2016-06-20) 3 commits
(merged to 'next' on 2016-06-28 at 08ec8c5)
+ local_tzoffset: detect errors from tm_to_time_t
+ t0006: test various date formats
+ t0006: rename test-date's "show" to "relative"
The internal code used to show local timezone offset is not
prepared to handle timestamps beyond year 2100, and gave a
bogus offset value to the caller. Use a more benign looking
+0000 instead and let "git log" going in such a case, instead
of aborting.
Will merge to 'master'.
* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit
(merged to 'next' on 2016-06-27 at 568f892)
+ add--interactive: respect diff.compactionHeuristic
"git add -i/-p" learned to honor diff.compactionHeuristic
experimental knob, so that the user can work on the same hunk split
as "git diff" output.
Will merge to 'master'.
* jk/big-and-future-archive-tar (2016-06-21) 2 commits
- archive-tar: write extended headers for far-future mtime
- archive-tar: write extended headers for file sizes >= 8GB
"git archive" learned to handle files that are larger than 8GB and
commits far in the future than expressible by the traditional US-TAR
format.
Expecting a reroll.
($gmane/298119)
* jk/gpg-interface-cleanup (2016-06-17) 7 commits
(merged to 'next' on 2016-06-28 at eed3498)
+ gpg-interface: check gpg signature creation status
+ sign_buffer: use pipe_command
+ verify_signed_buffer: use pipe_command
+ run-command: add pipe_command helper
+ verify_signed_buffer: use tempfile object
+ verify_signed_buffer: drop pbuf variable
+ gpg-interface: use child_process.args
A new run-command API function pipe_command() is introduced to
sanely feed data to the standard input while capturing data from
the standard output and the standard error of an external process,
which is cumbersome to hand-roll correctly without deadlocking.
The codepath to sign data in a prepared buffer with GPG has been
updated to use this API to read from the status-fd to check for
errors (instead of relying on GPG's exit status).
Will merge to 'master'.
* lf/sideband-returns-void (2016-06-16) 2 commits
(merged to 'next' on 2016-06-27 at 558c781)
+ upload-pack.c: make send_client_data() return void
+ sideband.c: make send_sideband() return void
A small internal API cleanup.
Will merge to 'master'.
* nd/graph-width-padded (2016-06-16) 2 commits
(merged to 'next' on 2016-06-28 at 0f733ef)
+ pretty.c: support <direction>|(<negative number>) forms
+ pretty: pass graph width to pretty formatting for use in '%>|(N)'
"log --graph --format=" learned that "%>|(N)" specifies the width
relative to the terminal's left edge, not relative to the area to
draw text that is to the right of the ancestry-graph section. It
also now accepts negative N that means the column limit is relative
to the right border.
Will merge to 'master'.
* jk/bisect-show-tree (2016-06-16) 1 commit
(merged to 'next' on 2016-06-27 at 6970f87e)
+ bisect: always call setup_revisions after init_revisions
"git bisect" makes an internal call to "git diff-tree" when
bisection finds the culprit, but this call did not initialize the
data structure to pass to the diff-tree API correctly.
Will merge to 'master'.
* jk/parseopt-string-list (2016-06-13) 3 commits
(merged to 'next' on 2016-06-27 at 27462e6)
+ 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 'master'.
* jk/repack-keep-unreachable (2016-06-14) 3 commits
(merged to 'next' on 2016-06-28 at 802b849)
+ 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 'master'.
* lf/recv-sideband-cleanup (2016-06-29) 2 commits
- SQUASH???
- sideband.c: refactor recv_sideband()
Code simplification. It however seems to add unnecessary trailing
output in some cases.
Queued with fixup from Nico.
Waiting for response from Lukas.
* nd/test-lib-httpd-show-error-log-in-verbose (2016-06-13) 1 commit
(merged to 'next' on 2016-06-27 at 9793d81)
+ lib-httpd.sh: print error.log on error
Debugging aid.
Will merge to 'master'.
* sb/submodule-clone-retry (2016-06-13) 2 commits
(merged to 'next' on 2016-06-28 at 8a86d54)
+ submodule update: continue when a clone fails
+ submodule--helper: initial clone learns retry logic
"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.
Will merge to 'master'.
* jc/blame-reverse (2016-06-14) 2 commits
- blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."
- blame: improve diagnosis for "--reverse NEW"
It is a common mistake to say "git blame --reverse OLD path",
expecting that the command line is dwimmed as if asking how lines
in path in an old revision OLD have survived up to the current
commit.
Any supporters? Otherwise will drop.
* km/fetch-do-not-free-remote-name (2016-06-14) 1 commit
(merged to 'next' on 2016-06-27 at 4bc34c4)
+ builtin/fetch.c: don't free remote->name after fetch
The ownership rule for the piece of memory that hold references to
be fetched in "git fetch" was screwy, which has been cleaned up.
Will merge to 'master'.
* nd/shallow-deepen (2016-06-13) 27 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: make check_non_tip() clean things up on error
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
Rerolled. What this topic attempts to achieve is worthwhile, I
would think.
* jk/send-pack-stdio (2016-06-10) 2 commits
(merged to 'next' on 2016-06-27 at 2cfb0ff)
+ write_or_die: remove the unused write_or_whine() function
+ send-pack: use buffered I/O to talk to pack-objects
Code clean-up.
Will merge to 'master'.
* pb/commit-editmsg-path (2016-06-09) 1 commit
(merged to 'next' on 2016-06-27 at 0f01ce1)
+ builtin/commit.c: memoize git-path for COMMIT_EDITMSG
Code clean-up.
Will merge to 'master'.
* jc/attr-more (2016-06-09) 8 commits
- attr.c: outline the future plans by heavily commenting
- attr.c: always pass check[] to collect_some_attrs()
- attr.c: introduce empty_attr_check_elems()
- attr.c: correct ugly hack for git_all_attrs()
- attr.c: rename a local variable check
- fixup! d5ad6c13
- attr.c: pass struct git_attr_check down the callchain
- attr.c: add push_stack() helper
(this branch uses jc/attr; is tangled with sb/pathspec-label and sb/submodule-default-paths.)
The beginning of long and tortuous journey to clean-up attribute
subsystem implementation.
Needs to be redone.
* mh/ref-iterators (2016-06-20) 13 commits
- for_each_reflog(): reimplement using iterators
- dir_iterator: new API for iterating over a directory tree
- for_each_reflog(): don't abort for bad references
- do_for_each_ref(): reimplement using reference iteration
- refs: introduce an iterator interface
- ref_resolves_to_object(): new function
- entry_resolves_to_object(): rename function from ref_resolves_to_object()
- get_ref_cache(): only create an instance if there is a submodule
- remote rm: handle symbolic refs correctly
- delete_refs(): add a flags argument
- refs: use name "prefix" consistently
- do_for_each_ref(): move docstring to the header file
- refs: remove unnecessary "extern" keywords
(this branch is used by mh/ref-store; uses mh/split-under-lock; is tangled with mh/update-ref-errors.)
The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
Is everybody happy with this version?
If so, will merge to 'next'.
* ew/mboxrd-format-am (2016-06-06) 3 commits
(merged to 'next' on 2016-06-28 at ee0a088)
+ am: support --patch-format=mboxrd
+ mailsplit: support unescaping mboxrd messages
+ pretty: support "mboxrd" output format
Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
Will merge to 'master'.
* mh/connect (2016-06-06) 10 commits
- connect: [host:port] is legacy for ssh
- connect: move ssh command line preparation to a separate function
- connect: actively reject git:// urls with a user part
- connect: change the --diag-url output to separate user and host
- connect: make parse_connect_url() return the user part of the url as a separate value
- connect: group CONNECT_DIAG_URL handling code
- connect: make parse_connect_url() return separated host and port
- connect: re-derive a host:port string from the separate host and port variables
- connect: call get_host_and_port() earlier
- connect: document why we sometimes call get_port after get_host_and_port
Rewrite Git-URL parsing routine (hopefully) without changing any
behaviour.
Comments?
* va/i18n-even-more (2016-06-17) 38 commits
(merged to 'next' on 2016-06-28 at 5919dfa)
+ i18n: branch: mark comment when editing branch description for translation
+ i18n: unmark die messages for translation
+ i18n: submodule: escape shell variables inside eval_gettext
+ i18n: submodule: join strings marked for translation
+ i18n: init-db: join message pieces
+ i18n: remote: allow translations to reorder message
+ i18n: remote: mark URL fallback text for translation
+ i18n: standardise messages
+ i18n: sequencer: add period to error message
+ i18n: merge: change command option help to lowercase
+ i18n: merge: mark messages for translation
+ i18n: notes: mark options for translation
+ i18n: notes: mark strings for translation
+ i18n: transport-helper.c: change N_() call to _()
+ i18n: bisect: mark strings for translation
+ t5523: use test_i18ngrep for negation
+ t4153: fix negated test_i18ngrep call
+ t9003: become resilient to GETTEXT_POISON
+ tests: unpack-trees: update to use test_i18n* functions
+ tests: use test_i18n* functions to suppress false positives
+ i18n: setup: mark strings for translation
+ i18n: rebase-interactive: mark comments of squash for translation
+ i18n: rebase-interactive: mark here-doc strings for translation
+ i18n: rebase-interactive: mark strings for translation
+ i18n: git-sh-setup.sh: mark strings for translation
+ t6030: update to use test_i18ncmp
+ i18n: bisect: simplify error message for i18n
+ i18n: rebase: mark placeholder for translation
+ i18n: rebase: fix marked string to use eval_gettext variant
+ merge-octopus: use die shell function from git-sh-setup.sh
+ i18n: merge-octopus: mark messages for translation
+ i18n: sequencer: mark string for translation
+ i18n: sequencer: mark entire sentences for translation
+ i18n: transport: mark strings for translation
+ i18n: advice: internationalize message for conflicts
+ i18n: advice: mark string about detached head for translation
+ i18n: builtin/remote.c: fix mark for translation
+ Merge branch 'jc/t2300-setup' into HEAD
More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
One patch from the original submission dropped due to conflicts
with jk/upload-pack-hook, which is still in flux.
Will merge to 'master'.
* nd/worktree-lock (2016-06-13) 6 commits
- worktree.c: find_worktree() search by path suffix
- worktree: add "unlock" command
- worktree: add "lock" command
- worktree.c: add is_worktree_locked()
- worktree.c: add is_main_worktree()
- worktree.c: add find_worktree()
(this branch uses nd/worktree-cleanup-post-head-protection.)
"git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location. "git worktree"
command learned a dedicated command pair to create and remoev such
a file, so that the users do not have to do this with editor.
Is everybody happy with this version?
If so, will merge to 'next'.
* jk/upload-pack-hook (2016-06-02) 7 commits
(merged to 'next' on 2016-06-28 at e5e5bb6)
+ upload-pack: provide a hook for running pack-objects
+ t1308: do not get fooled by symbolic links to the source tree
+ config: add a notion of "scope"
+ config: return configset value for current_config_ functions
+ config: set up config_source for command-line config
+ git_config_parse_parameter: refactor cleanup code
+ git_config_with_options: drop "found" counting
Allow a custom "git upload-pack" replacement to respond to
"fetch/clone" request.
Will merge to 'master'.
* sb/submodule-default-paths (2016-06-20) 5 commits
- completion: clone can recurse into submodules
- clone: add --init-submodule=<pathspec> switch
- submodule update: add `--init-default-path` switch
- Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
- Merge branch 'jc/attr' into sb/submodule-default-paths
(this branch uses jc/attr and sb/pathspec-label; is tangled with jc/attr-more.)
Allow specifying the set of submodules the user is interested in on
the command line of "git clone" that clones the superproject.
* ep/http-curl-trace (2016-05-24) 2 commits
(merged to 'next' on 2016-06-27 at c290515)
+ 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.
Will merge to 'master'.
* jc/attr (2016-05-25) 18 commits
- attr: support quoting pathname patterns in C style
- attr: expose validity check for attribute names
- attr: add counted string version of git_attr()
- attr: add counted string version of git_check_attr()
- attr: retire git_check_attrs() API
- attr: convert git_check_attrs() callers to use the new API
- attr: convert git_all_attrs() to use "struct git_attr_check"
- attr: (re)introduce git_check_attr() and struct git_attr_check
- attr: rename function and struct related to checking attributes
- attr.c: plug small leak in parse_attr_line()
- attr.c: tighten constness around "git_attr" structure
- attr.c: simplify macroexpand_one()
- attr.c: mark where #if DEBUG ends more clearly
- attr.c: complete a sentence in a comment
- attr.c: explain the lack of attr-name syntax check in parse_attr()
- attr.c: update a stale comment on "struct match_attr"
- attr.c: use strchrnul() to scan for one line
- commit.c: use strchrnul() to scan for one line
(this branch is used by jc/attr-more, sb/pathspec-label and sb/submodule-default-paths.)
The attributes API has been updated so that it can later be
optimized using the knowledge of which attributes are queried.
I wanted to polish this topic further to make the attribute
subsystem thread-ready, but because other topics depend on this
topic and they do not (yet) need it to be thread-ready, let's merge
this early part together with the dependent topics to 'next', and
back-burner the threading enhancement to another day.
* pb/bisect (2016-06-27) 9 commits
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
- bisect--helper: `bisect_reset` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- t6030: explicitly test for bisection cleanup
- bisect--helper: `bisect_clean_state` shell function in C
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
GSoC "bisect" topic.
* sb/pathspec-label (2016-06-03) 6 commits
- pathspec: disable preload-index when attribute pathspec magic is in use
- pathspec: allow escaped query values
- pathspec: allow querying for attributes
- pathspec: move prefix check out of the inner loop
- pathspec: move long magic parsing out of prefix_pathspec
- Documentation: fix a typo
(this branch is used by sb/submodule-default-paths; uses jc/attr; is tangled with jc/attr-more.)
The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
to limit paths that match $pattern further by attribute settings.
The preload-index mechanism is disabled when the new pathspec magic
is in use (at least for now), because the attribute subsystem is
not thread-ready.
* nd/worktree-cleanup-post-head-protection (2016-05-24) 6 commits
(merged to 'next' on 2016-06-28 at 55414fa)
+ 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.
Will merge to 'master'.
* mh/split-under-lock (2016-06-13) 33 commits
- lock_ref_sha1_basic(): only handle REF_NODEREF mode
- commit_ref_update(): remove the flags parameter
- lock_ref_for_update(): don't resolve symrefs
- lock_ref_for_update(): don't re-read non-symbolic references
- refs: resolve symbolic refs first
- ref_transaction_update(): check refname_is_safe() at a minimum
- unlock_ref(): move definition higher in the file
- lock_ref_for_update(): new function
- add_update(): initialize the whole ref_update
- verify_refname_available(): adjust constness in declaration
- refs: don't dereference on rename
- refs: allow log-only updates
- delete_branches(): use resolve_refdup()
- ref_transaction_commit(): correctly report close_ref() failure
- ref_transaction_create(): disallow recursive pruning
- refs: make error messages more consistent
- lock_ref_sha1_basic(): remove unneeded local variable
- read_raw_ref(): move docstring to header file
- read_raw_ref(): improve docstring
- read_raw_ref(): rename symref argument to referent
- read_raw_ref(): clear *type at start of function
- read_raw_ref(): rename flags argument to type
- ref_transaction_commit(): remove local variables n and updates
- rename_ref(): remove unneeded local variable
- commit_ref_update(): write error message to *err, not stderr
- refname_is_safe(): insist that the refname already be normalized
- refname_is_safe(): don't allow the empty string
- refname_is_safe(): use skip_prefix()
- remove_dir_recursively(): add docstring
- safe_create_leading_directories(): improve docstring
- read_raw_ref(): don't get confused by an empty directory
- commit_ref(): if there is an empty dir in the way, delete it
- t1404: demonstrate a bug resolving references
(this branch is used by mh/ref-iterators, mh/ref-store and mh/update-ref-errors.)
Further preparatory work on the refs API before the pluggable
backend series can land.
Is everybody happy with this version?
If so, will merge to 'next'.
* jc/send-email-skip-backup (2016-04-12) 1 commit
(merged to 'next' on 2016-06-28 at 67dac59)
+ send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Will merge to 'master'.
Perhaps people will enhance it more once it gains more visibility.
* kn/ref-filter-branch-list (2016-05-17) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Rerolled.
This also really needs review.
* dt/index-helper (2016-06-27) 21 commits
- unix-socket.c: add stub implementation when unix sockets are not supported
- index-helper: indexhelper.exitafter config
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: support watchman to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: log warnings
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- pkt-line: add gentle version of packet_write
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
A new "index-helper" daemon has been introduced to give newly
spawned Git process a quicker access to the data in the index, and
optionally interface with the watchman daemon to further reduce the
refresh cost.
Expecting a reroll.
($gmane/298331, $gmane/298319).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
While I think it would make it easier for people to experiment and
build on if the topic is merged to 'next', I am at the same time a
bit reluctant to merge an unproven new topic that introduces a new
file format, which we may end up having to support til the end of
time. Comments?
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 3%]
* preview: What's cooking in git.git (Jun 2016, #10; Tue, 28)
@ 2016-06-28 23:36 3% Junio C Hamano
0 siblings, 0 replies; 22+ results
From: Junio C Hamano @ 2016-06-28 23:36 UTC (permalink / raw
To: git
Quite a few topics that have been in 'pu' are now in 'next',
following yesterday's batch of topics that were merged to 'master'.
I'll do the real #10th issue tomorrow, but here is a snapshot for
today.
--------------------------------------------------
[New Topics]
* cc/apply-am (2016-06-28) 41 commits
- apply: use error_errno() where possible
- builtin/am: use apply api in run_apply()
- apply: change error_routine when be_silent is set
- usage: add get_error_routine() and get_warn_routine()
- usage: add set_warn_routine()
- apply: don't print on stdout when be_silent is set
- apply: make 'be_silent' incompatible with 'apply_verbosely'
- apply: add 'be_silent' variable to 'struct apply_state'
- write_or_die: use warning() instead of fprintf(stderr, ...)
- environment: add set_index_file()
- apply: make some parsing functions static again
- apply: move libified code from builtin/apply.c to apply.{c,h}
- apply: rename and move opt constants to apply.h
- builtin/apply: rename option parsing functions
- builtin/apply: make create_one_file() return -1 on error
- builtin/apply: make try_create_file() return -1 on error
- builtin/apply: make write_out_results() return -1 on error
- builtin/apply: make write_out_one_result() return -1 on error
- builtin/apply: make create_file() return -1 on error
- builtin/apply: make add_index_file() return -1 on error
- builtin/apply: make add_conflicted_stages_file() return -1 on error
- builtin/apply: make remove_file() return -1 on error
- builtin/apply: make build_fake_ancestor() return -1 on error
- builtin/apply: change die_on_unsafe_path() to check_unsafe_path()
- builtin/apply: make gitdiff_*() return -1 on error
- builtin/apply: make gitdiff_*() return 1 at end of header
- builtin/apply: make parse_traditional_patch() return -1 on error
- builtin/apply: make apply_all_patches() return 128 or 1 on error
- builtin/apply: move check_apply_state() to apply.c
- builtin/apply: make check_apply_state() return -1 instead of die()ing
- apply: make init_apply_state() return -1 instead of exit()ing
- builtin/apply: move init_apply_state() to apply.c
- builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ing
- builtin/apply: make parse_whitespace_option() return -1 instead of die()ing
- builtin/apply: make parse_single_patch() return -1 on error
- builtin/apply: make parse_chunk() return a negative integer on error
- builtin/apply: make find_header() return -128 instead of die()ing
- builtin/apply: read_patch_file() return -1 instead of die()ing
- builtin/apply: make apply_patch() return -1 or -128 instead of die()ing
- apply: move 'struct apply_state' to apply.h
- apply: make some names more specific
"git am" has been taught to make an internal call to "git apply"'s
innards without spawning the latter as a separate process.
Needs review.
* dp/autoconf-curl-ssl (2016-06-28) 1 commit
- ./configure.ac: detect SSL in libcurl using curl-config
The ./configure script generated from configure.ac was taught how
to detect support of SSL by libcurl better.
Needs review.
* js/color-on-windows-comment (2016-06-28) 1 commit
(merged to 'next' on 2016-06-28 at 38a2ea1)
+ color.h: remove obsolete comment about limitations on Windows
For a long time, we carried an in-code comment that said our
colored output would work only when we use fprintf/fputs on
Windows, which no longer is the case for the past few years.
Will merge to 'master'.
--------------------------------------------------
[Stalled]
* jh/clean-smudge-annex (2016-06-22) 10 commits
- SQUASH???
- use smudgeToFile filter in recursive merge
- use smudgeToFile filter in git am
- better recovery from failure of smudgeToFile filter
- warn on unusable smudgeToFile/cleanFromFile config
- use smudgeToFile in git checkout etc
- use cleanFromFile in git add
- add smudgeToFile and cleanFromFile filter configs
- clarify %f documentation
- Merge branch 'tb/convert-peek-in-index' into jh/clean-smudge-annex
(this branch uses tb/convert-peek-in-index.)
The interface to "clean/smudge" filters require Git to feed the
whole contents via pipe, which is suboptimal for some
applications. "cleanFromFile/smudgeToFile" commands are the moral
equilvalents for these filters but they interact with the files on
the filesystem directly.
* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
- blame: require 0 context lines while finding moved lines with -M
"git blame -M" missed a single line that was moved within the file.
We may want to squash a test or two to this commit. Volunteers?
* tb/convert-peek-in-index (2016-06-07) 3 commits
- correct ce_compare_data() in a middle of a merge
- read-cache: factor out get_sha1_from_index() helper
- convert: unify the "auto" handling of CRLF
(this branch is used by jh/clean-smudge-annex.)
Needs review.
* 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 arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* sg/completion-updates (2016-02-28) 21 commits
. completion: cache the path to the repository
. completion: extract repository discovery from __gitdir()
. completion: don't guard git executions with __gitdir()
. completion: consolidate silencing errors from git commands
. completion: don't use __gitdir() for git commands
. completion: respect 'git -C <path>'
. completion: fix completion after 'git -C <path>'
. completion: don't offer commands when 'git --opt' needs an argument
. rev-parse: add '--absolute-git-dir' option
. completion: list short refs from a remote given as a URL
. completion: don't list 'HEAD' when trying refs completion outside of a repo
. completion: list refs from remote when remote's name matches a directory
. completion: respect 'git --git-dir=<path>' when listing remote refs
. completion: fix most spots not respecting 'git --git-dir=<path>'
. completion: ensure that the repository path given on the command line exists
. completion tests: add tests for the __git_refs() helper function
. completion tests: check __gitdir()'s output in the error cases
. completion tests: consolidate getting path of current working directory
. completion tests: make the $cur variable local to the test helper functions
. completion tests: don't add test cruft to the test repository
. completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* dg/subtree-rebase-test (2016-06-28) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
This is just a test to specify the desired behaviour that currently
is not available.
Will merge to 'next'.
* jk/test-match-signal (2016-06-24) 4 commits
- t/lib-git-daemon: use test_match_signal
- test_must_fail: use test_match_signal
- t0005: use test_match_signal as appropriate
- tests: factor portable signal check out of t0005
The test framework learned a new helper test_match_signal to check
an exit code from getting killed by an expected signal.
Will merge to 'next'.
* ah/unpack-trees-advice-messages (2016-06-27) 1 commit
- unpack-trees: fix English grammar in do-this-before-that messages
Will merge to 'next'.
* ew/gc-auto-pack-limit-fix (2016-06-27) 1 commit
- gc: fix off-by-one error with gc.autoPackLimit
"gc.autoPackLimit" when set to 1 should not trigger a repacking
when there is only one pack, but the code counted poorly and did
so.
Will merge to 'next'.
* nd/connect-ssh-command-config (2016-06-28) 2 commits
- SQUASH???
- connect: read $GIT_SSH_COMMAND from config file
A new configuration variable core.sshCommand to specify what value
for GIT_SSH_COMMAND to use per repository.
Is everybody happy with the SQUASH???
If so will merge to 'next'.
* nd/doc-new-command (2016-06-27) 1 commit
- new-command.txt: correct the command description file
Will merge to 'next'.
* po/range-doc (2016-06-27) 3 commits
- doc: give headings for the two and three dot notations
- doc: show the actual left, right, and boundary marks
- doc: use 'symmetric difference' consistently
Expecting a reroll.
* sb/submodule-parallel-fetch (2016-06-27) 2 commits
- xwrite: poll on non-blocking FDs
- xread: retry after poll on EAGAIN/EWOULDBLOCK
Fix a recently introduced codepaths that are involved in parallel
submodule operations, which gave up on reading too early, and
could have wasted CPU while attempting to write under a corner case
condition.
Will merge to 'next'.
* mm/doc-tt (2016-06-28) 7 commits
- doc: typeset HEAD and variants as literal
- CodingGuidelines: formatting HEAD in documentation
- doc: typeset long options with argument as literal
- doc: typeset '--' as literal
- doc: typeset long command-line options as literal
- doc: typeset short command-line options as literal
- Documentation/git-mv.txt: fix whitespace indentation
More mark-up updates to typeset strings that are expected to
literally typed by the end user in fixed-width font.
Will merge to 'next'.
* nd/fetch-ref-summary (2016-06-27) 5 commits
- fetch: reduce duplicate in ref update status lines with placeholder
- fetch: align all "remote -> local" output
- fetch: change flag code for displaying tag update and deleted ref
- fetch: refactor ref update status formatting code
- git-fetch.txt: document fetch output
Improve the look of the way "git fetch" reports what happened to
each ref that was fetched.
Still being discussed.
* ak/t7800-wo-readlink (2016-06-21) 1 commit
(merged to 'next' on 2016-06-28 at 403bbbb)
+ t7800: readlink may not be available
One among four invocations of readlink(1) in our test suite has
been rewritten so that the test can run on systems without the
command (others are in valgrind test framework and t9802).
Will merge to 'master'.
* js/perf-on-apple (2016-06-21) 1 commit
(merged to 'next' on 2016-06-28 at 83529b9)
+ perf: accommodate for MacOSX
t/perf needs /usr/bin/time with GNU extension; the invocation of it
is updated to "gtime" on Darwin.
Will merge to 'master'.
* sb/t5614-modernize (2016-06-21) 1 commit
(merged to 'next' on 2016-06-28 at ee05326)
+ t5614: don't use subshells
(this branch uses sb/clone-shallow-passthru.)
Test clean-up.
Will merge to 'master'.
* ao/p4-has-branch-prefix-fix (2016-06-22) 1 commit
(merged to 'next' on 2016-06-28 at 333f90d)
+ git-p4: correct hasBranchPrefix verbose output
A bug, which caused "git p4" while running under verbose mode to
report paths that are omitted due to branch prefix incorrectly, has
been fixed; the command said "Ignoring file outside of prefix" for
paths that are _inside_.
Will merge to 'master'.
* cb/t7810-test-label-fix (2016-06-21) 1 commit
(merged to 'next' on 2016-06-28 at 4d85a00)
+ t7810: fix duplicated test title
Test clean-up.
Will merge to 'master'.
* jc/t2300-setup (2016-06-22) 1 commit
(merged to 'next' on 2016-06-28 at 62b902a)
+ t2300: "git --exec-path" is not usable in $PATH on Windows as-is
Portability fix for Windows.
Will merge to 'master'.
* jk/perf-any-version (2016-06-22) 2 commits
(merged to 'next' on 2016-06-28 at 6a41c30)
+ p4211: explicitly disable renames in no-rename test
+ t/perf: fix regression in testing older versions of git
Allow t/perf framework to use the features from the most recent
version of Git even when testing an older installed version.
Will merge to 'master'.
* jn/preformatted-doc-url (2016-06-22) 1 commit
(merged to 'next' on 2016-06-28 at 60a99eb)
+ doc: git-htmldocs.googlecode.com is no more
Will merge to 'master'.
* ex/deprecate-empty-pathspec-as-match-all (2016-06-22) 1 commit
- pathspec: warn on empty strings as pathspec
An empty string used as a pathspec element has always meant
'everything matches', but it is too easy to write a script that
finds a path to remove in $path and run 'git rm "$paht"', which
ends up removing everything. Start warning about this use of an
empty string used for 'everything matches' and ask users to use a
more explicit '.' for that instead.
The hope is that existing users will not mind this change, and
eventually the warning can be turned into a hard error, upgrading
the deprecation into removal of this (mis)feature.
Will wait for further comments for a bit before merging to 'next'.
* jk/ansi-color (2016-06-23) 7 commits
(merged to 'next' on 2016-06-28 at 354989c)
+ color: support strike-through attribute
+ color: support "italic" attribute
+ color: allow "no-" for negating attributes
+ color: refactor parse_attr
+ add skip_prefix_mem helper
+ doc: refactor description of color format
+ color: fix max-size comment
The output coloring scheme learned two new attributes, italic and
strike, in addition to existing bold, reverse, etc.
Will merge to 'master'.
* nd/icase (2016-06-27) 13 commits
- SQUASH???
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: Add regcomp_or_die()
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep: rewrite an if/else condition to avoid duplicate expression
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
"git grep -i" has been taught to fold case in non-ascii locales
correctly.
Modulo minor possible nits, this round looked mostly sensible.
* mj/log-show-signature-conf (2016-06-24) 3 commits
(merged to 'next' on 2016-06-28 at c8b3347)
+ log: add log.showSignature configuration variable
+ log: add "--no-show-signature" command line option
+ t4202: refactor test
"git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
Will merge to 'master'.
* mg/signature-doc (2016-06-17) 4 commits
(merged to 'next' on 2016-06-28 at 2732a37)
+ Documentation/technical: signed merge tag format
+ Documentation/technical: signed commit format
+ Documentation/technical: signed tag format
+ Documentation/technical: describe signature formats
Formats of the various data (and how to validate them) where we use
GPG signature have been documented.
Will merge to 'master'.
* jk/string-list-static-init (2016-06-13) 2 commits
(merged to 'next' on 2016-06-27 at 3d4b2fa)
+ use string_list initializer consistently
+ Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init
(this branch uses jk/parseopt-string-list.)
Instead of taking advantage of a struct string_list that is
allocated with all NULs happens to be STRING_LIST_INIT_NODUP kind,
initialize them explicitly as such, to document their behaviour
better.
Will merge to 'master'.
* mh/ref-store (2016-06-20) 38 commits
- refs: implement iteration over only per-worktree refs
- refs: make lock generic
- refs: add method to rename refs
- refs: add methods to init refs db
- refs: make delete_refs() virtual
- refs: add method for initial ref transaction commit
- refs: add methods for reflog
- refs: add method iterator_begin
- files_ref_iterator_begin(): take a ref_store argument
- split_symref_update(): add a files_ref_store argument
- lock_ref_sha1_basic(): add a files_ref_store argument
- lock_ref_for_update(): add a files_ref_store argument
- commit_ref_update(): add a files_ref_store argument
- lock_raw_ref(): add a files_ref_store argument
- repack_without_refs(): add a files_ref_store argument
- refs: make peel_ref() virtual
- refs: make create_symref() virtual
- refs: make pack_refs() virtual
- refs: make verify_refname_available() virtual
- refs: make read_raw_ref() virtual
- resolve_gitlink_ref(): rename path parameter to submodule
- resolve_gitlink_ref(): avoid memory allocation in many cases
- resolve_gitlink_ref(): implement using resolve_ref_recursively()
- resolve_ref_recursively(): new function
- read_raw_ref(): take a (struct ref_store *) argument
- resolve_gitlink_packed_ref(): remove function
- resolve_packed_ref(): rename function from resolve_missing_loose_ref()
- refs: reorder definitions
- refs: add a transaction_commit() method
- {lock,commit,rollback}_packed_refs(): add files_ref_store arguments
- resolve_missing_loose_ref(): add a files_ref_store argument
- get_packed_ref(): add a files_ref_store argument
- add_packed_ref(): add a files_ref_store argument
- refs: create a base class "ref_store" for files_ref_store
- refs: add a backend method structure
- refs: rename struct ref_cache to files_ref_store
- rename_ref_available(): add docstring
- resolve_gitlink_ref(): eliminate temporary variable
(this branch uses mh/ref-iterators and mh/split-under-lock; is tangled with mh/update-ref-errors.)
The ref-store abstraction was introduced to the refs API so that we
can plug in different backends to store references.
Is everybody happy with this version?
If so, will merge to 'next'.
* mh/update-ref-errors (2016-06-20) 6 commits
- lock_ref_for_update(): avoid a symref resolution
- lock_ref_for_update(): make error handling more uniform
- t1404: add more tests of update-ref error handling
- t1404: document function test_update_rejected
- t1404: remove "prefix" argument to test_update_rejected
- t1404: rename file to t1404-update-ref-errors.sh
(this branch uses mh/split-under-lock; is tangled with mh/ref-iterators and mh/ref-store.)
Error handling in the codepaths that updates refs has been
improved.
Is everybody happy with this version?
If so, will merge to 'next'.
* lc/shell-default-value-noexpand (2016-06-19) 1 commit
(merged to 'next' on 2016-06-28 at 2dc7727)
+ sh-setup: enclose setting of ${VAR=default} in double-quotes
Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
to set the default value, without enclosing it in double quotes.
Will merge to 'master'.
* sb/clone-shallow-passthru (2016-06-20) 1 commit
(merged to 'next' on 2016-06-28 at d515d7d)
+ clone: do not let --depth imply --shallow-submodules
(this branch is used by sb/t5614-modernize.)
Fix an unintended regression in v2.9 that breaks "clone --depth"
that recurses down to submodules by forcing the submodules to also
be cloned shallowly, which many server instances that host upstream
of the submodules are not prepared for.
Will merge to 'master'.
* js/find-commit-subject-ignore-leading-blanks (2016-06-22) 2 commits
(merged to 'next' on 2016-06-28 at 32bbd94)
+ commit.c: make find_commit_subject() more robust
+ pretty: make the skip_blank_lines() function public
A helper function that takes the contents of a commit object and
finds its subject line did not ignore leading blank lines, as is
commonly done by other codepaths. Make it ignore leading blank
lines to match.
Will merge to 'master'.
* js/log-to-diffopt-file (2016-06-28) 11 commits
- diff: do not color output when --color=auto and --output=<file> is given
- t4211: ensure that log respects --output=<file>
- shortlog: respect the --output=<file> setting
- format-patch: use stdout directly
- format-patch: avoid freopen()
- format-patch: explicitly switch off color when writing to files
- shortlog: support outputting to streams other than stdout
- graph: respect the diffopt.file setting
- line-log: respect diffopt's configured output file stream
- log-tree: respect diffopt's configured output file stream
- log: prepare log/log-tree to reuse the diffopt.close_file attribute
The commands in the "log/diff" family had an FILE* pointer in the
data structure they pass around for a long time, but some codepaths
used to always write to the standard output. As a preparatory step
to make "git format-patch" available to the internal callers, these
codepaths have been updated to consistently write into that FILE*
instead.
Will merge to 'next'.
* js/mingw-parameter-less-c-functions (2016-06-20) 1 commit
(merged to 'next' on 2016-06-28 at e673c65)
+ mingw: let the build succeed with DEVELOPER=1
Some platform-specific code had non-ANSI strict declarations of C
functions that do not take any parameters, which has been
corrected.
Will merge to 'master'.
* bc/cocci (2016-06-28) 11 commits
- diff: convert prep_temp_blob() to struct object_id
- merge-recursive: convert merge_recursive_generic() to object_id
- merge-recursive: convert leaf functions to use struct object_id
- merge-recursive: convert struct merge_file_info to object_id
- merge-recursive: convert struct stage_data to use object_id
- diff: rename struct diff_filespec's sha1_valid member
- diff: convert struct diff_filespec to struct object_id
- coccinelle: apply object_id Coccinelle transformations
- coccinelle: convert hashcpy() with null_sha1 to hashclr()
- contrib/coccinelle: add basic Coccinelle transforms
- hex: add oid_to_hex_r()
Conversion from unsigned char sha1[20] to struct object_id
continues.
Needs review.
* jk/tzoffset-fix (2016-06-20) 3 commits
(merged to 'next' on 2016-06-28 at 08ec8c5)
+ local_tzoffset: detect errors from tm_to_time_t
+ t0006: test various date formats
+ t0006: rename test-date's "show" to "relative"
The internal code used to show local timezone offset is not
prepared to handle timestamps beyond year 2100, and gave a
bogus offset value to the caller. Use a more benign looking
+0000 instead and let "git log" going in such a case, instead
of aborting.
Will merge to 'master'.
* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit
(merged to 'next' on 2016-06-27 at 568f892)
+ add--interactive: respect diff.compactionHeuristic
"git add -i/-p" learned to honor diff.compactionHeuristic
experimental knob, so that the user can work on the same hunk split
as "git diff" output.
Will merge to 'master'.
* jk/big-and-future-archive-tar (2016-06-21) 2 commits
- archive-tar: write extended headers for far-future mtime
- archive-tar: write extended headers for file sizes >= 8GB
"git archive" learned to handle files that are larger than 8GB and
commits far in the future than expressible by the traditional US-TAR
format.
Expecting a reroll.
($gmane/298119)
* jk/gpg-interface-cleanup (2016-06-17) 7 commits
(merged to 'next' on 2016-06-28 at eed3498)
+ gpg-interface: check gpg signature creation status
+ sign_buffer: use pipe_command
+ verify_signed_buffer: use pipe_command
+ run-command: add pipe_command helper
+ verify_signed_buffer: use tempfile object
+ verify_signed_buffer: drop pbuf variable
+ gpg-interface: use child_process.args
A new run-command API function pipe_command() is introduced to
sanely feed data to the standard input while capturing data from
the standard output and the standard error of an external process,
which is cumbersome to hand-roll correctly without deadlocking.
The codepath to sign data in a prepared buffer with GPG has been
updated to use this API to read from the status-fd to check for
errors (instead of relying on GPG's exit status).
Will merge to 'master'.
* lf/sideband-returns-void (2016-06-16) 2 commits
(merged to 'next' on 2016-06-27 at 558c781)
+ upload-pack.c: make send_client_data() return void
+ sideband.c: make send_sideband() return void
A small internal API cleanup.
Will merge to 'master'.
* nd/graph-width-padded (2016-06-16) 2 commits
(merged to 'next' on 2016-06-28 at 0f733ef)
+ pretty.c: support <direction>|(<negative number>) forms
+ pretty: pass graph width to pretty formatting for use in '%>|(N)'
"log --graph --format=" learned that "%>|(N)" specifies the width
relative to the terminal's left edge, not relative to the area to
draw text that is to the right of the ancestry-graph section. It
also now accepts negative N that means the column limit is relative
to the right border.
Will merge to 'master'.
* jk/bisect-show-tree (2016-06-16) 1 commit
(merged to 'next' on 2016-06-27 at 6970f87e)
+ bisect: always call setup_revisions after init_revisions
"git bisect" makes an internal call to "git diff-tree" when
bisection finds the culprit, but this call did not initialize the
data structure to pass to the diff-tree API correctly.
Will merge to 'master'.
* jk/parseopt-string-list (2016-06-13) 3 commits
(merged to 'next' on 2016-06-27 at 27462e6)
+ 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 'master'.
* jk/repack-keep-unreachable (2016-06-14) 3 commits
(merged to 'next' on 2016-06-28 at 802b849)
+ 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 'master'.
* lf/recv-sideband-cleanup (2016-06-28) 2 commits
- SQUASH???
- sideband.c: refactor recv_sideband()
Code simplification. It however seems to add unnecessary trailing
output in some cases.
Expecting a reroll.
* nd/test-lib-httpd-show-error-log-in-verbose (2016-06-13) 1 commit
(merged to 'next' on 2016-06-27 at 9793d81)
+ lib-httpd.sh: print error.log on error
Debugging aid.
Will merge to 'master'.
* sb/submodule-clone-retry (2016-06-13) 2 commits
(merged to 'next' on 2016-06-28 at 8a86d54)
+ submodule update: continue when a clone fails
+ submodule--helper: initial clone learns retry logic
"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.
Will merge to 'master'.
* jc/blame-reverse (2016-06-14) 2 commits
- blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."
- blame: improve diagnosis for "--reverse NEW"
It is a common mistake to say "git blame --reverse OLD path",
expecting that the command line is dwimmed as if asking how lines
in path in an old revision OLD have survived up to the current
commit.
Any supporters? Otherwise will drop.
* km/fetch-do-not-free-remote-name (2016-06-14) 1 commit
(merged to 'next' on 2016-06-27 at 4bc34c4)
+ builtin/fetch.c: don't free remote->name after fetch
The ownership rule for the piece of memory that hold references to
be fetched in "git fetch" was screwy, which has been cleaned up.
Will merge to 'master'.
* nd/shallow-deepen (2016-06-13) 27 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: make check_non_tip() clean things up on error
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
Rerolled. What this topic attempts to achieve is worthwhile, I
would think.
* jk/send-pack-stdio (2016-06-10) 2 commits
(merged to 'next' on 2016-06-27 at 2cfb0ff)
+ write_or_die: remove the unused write_or_whine() function
+ send-pack: use buffered I/O to talk to pack-objects
Code clean-up.
Will merge to 'master'.
* pb/commit-editmsg-path (2016-06-09) 1 commit
(merged to 'next' on 2016-06-27 at 0f01ce1)
+ builtin/commit.c: memoize git-path for COMMIT_EDITMSG
Code clean-up.
Will merge to 'master'.
* jc/attr-more (2016-06-09) 8 commits
- attr.c: outline the future plans by heavily commenting
- attr.c: always pass check[] to collect_some_attrs()
- attr.c: introduce empty_attr_check_elems()
- attr.c: correct ugly hack for git_all_attrs()
- attr.c: rename a local variable check
- fixup! d5ad6c13
- attr.c: pass struct git_attr_check down the callchain
- attr.c: add push_stack() helper
(this branch uses jc/attr; is tangled with sb/pathspec-label and sb/submodule-default-paths.)
The beginning of long and tortuous journey to clean-up attribute
subsystem implementation.
Needs to be redone.
* mh/ref-iterators (2016-06-20) 13 commits
- for_each_reflog(): reimplement using iterators
- dir_iterator: new API for iterating over a directory tree
- for_each_reflog(): don't abort for bad references
- do_for_each_ref(): reimplement using reference iteration
- refs: introduce an iterator interface
- ref_resolves_to_object(): new function
- entry_resolves_to_object(): rename function from ref_resolves_to_object()
- get_ref_cache(): only create an instance if there is a submodule
- remote rm: handle symbolic refs correctly
- delete_refs(): add a flags argument
- refs: use name "prefix" consistently
- do_for_each_ref(): move docstring to the header file
- refs: remove unnecessary "extern" keywords
(this branch is used by mh/ref-store; uses mh/split-under-lock; is tangled with mh/update-ref-errors.)
The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
Is everybody happy with this version?
If so, will merge to 'next'.
* ew/mboxrd-format-am (2016-06-06) 3 commits
(merged to 'next' on 2016-06-28 at ee0a088)
+ am: support --patch-format=mboxrd
+ mailsplit: support unescaping mboxrd messages
+ pretty: support "mboxrd" output format
Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
Will merge to 'master'.
* mh/connect (2016-06-06) 10 commits
- connect: [host:port] is legacy for ssh
- connect: move ssh command line preparation to a separate function
- connect: actively reject git:// urls with a user part
- connect: change the --diag-url output to separate user and host
- connect: make parse_connect_url() return the user part of the url as a separate value
- connect: group CONNECT_DIAG_URL handling code
- connect: make parse_connect_url() return separated host and port
- connect: re-derive a host:port string from the separate host and port variables
- connect: call get_host_and_port() earlier
- connect: document why we sometimes call get_port after get_host_and_port
Rewrite Git-URL parsing routine (hopefully) without changing any
behaviour.
Comments?
* va/i18n-even-more (2016-06-17) 38 commits
(merged to 'next' on 2016-06-28 at 5919dfa)
+ i18n: branch: mark comment when editing branch description for translation
+ i18n: unmark die messages for translation
+ i18n: submodule: escape shell variables inside eval_gettext
+ i18n: submodule: join strings marked for translation
+ i18n: init-db: join message pieces
+ i18n: remote: allow translations to reorder message
+ i18n: remote: mark URL fallback text for translation
+ i18n: standardise messages
+ i18n: sequencer: add period to error message
+ i18n: merge: change command option help to lowercase
+ i18n: merge: mark messages for translation
+ i18n: notes: mark options for translation
+ i18n: notes: mark strings for translation
+ i18n: transport-helper.c: change N_() call to _()
+ i18n: bisect: mark strings for translation
+ t5523: use test_i18ngrep for negation
+ t4153: fix negated test_i18ngrep call
+ t9003: become resilient to GETTEXT_POISON
+ tests: unpack-trees: update to use test_i18n* functions
+ tests: use test_i18n* functions to suppress false positives
+ i18n: setup: mark strings for translation
+ i18n: rebase-interactive: mark comments of squash for translation
+ i18n: rebase-interactive: mark here-doc strings for translation
+ i18n: rebase-interactive: mark strings for translation
+ i18n: git-sh-setup.sh: mark strings for translation
+ t6030: update to use test_i18ncmp
+ i18n: bisect: simplify error message for i18n
+ i18n: rebase: mark placeholder for translation
+ i18n: rebase: fix marked string to use eval_gettext variant
+ merge-octopus: use die shell function from git-sh-setup.sh
+ i18n: merge-octopus: mark messages for translation
+ i18n: sequencer: mark string for translation
+ i18n: sequencer: mark entire sentences for translation
+ i18n: transport: mark strings for translation
+ i18n: advice: internationalize message for conflicts
+ i18n: advice: mark string about detached head for translation
+ i18n: builtin/remote.c: fix mark for translation
+ Merge branch 'jc/t2300-setup' into HEAD
More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
One patch from the original submission dropped due to conflicts
with jk/upload-pack-hook, which is still in flux.
Will merge to 'master'.
* nd/worktree-lock (2016-06-13) 6 commits
- worktree.c: find_worktree() search by path suffix
- worktree: add "unlock" command
- worktree: add "lock" command
- worktree.c: add is_worktree_locked()
- worktree.c: add is_main_worktree()
- worktree.c: add find_worktree()
(this branch uses nd/worktree-cleanup-post-head-protection.)
"git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location. "git worktree"
command learned a dedicated command pair to create and remoev such
a file, so that the users do not have to do this with editor.
Is everybody happy with this version?
If so, will merge to 'next'.
* jk/upload-pack-hook (2016-06-02) 7 commits
(merged to 'next' on 2016-06-28 at e5e5bb6)
+ upload-pack: provide a hook for running pack-objects
+ t1308: do not get fooled by symbolic links to the source tree
+ config: add a notion of "scope"
+ config: return configset value for current_config_ functions
+ config: set up config_source for command-line config
+ git_config_parse_parameter: refactor cleanup code
+ git_config_with_options: drop "found" counting
Allow a custom "git upload-pack" replacement to respond to
"fetch/clone" request.
Will merge to 'master'.
* sb/submodule-default-paths (2016-06-20) 5 commits
- completion: clone can recurse into submodules
- clone: add --init-submodule=<pathspec> switch
- submodule update: add `--init-default-path` switch
- Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
- Merge branch 'jc/attr' into sb/submodule-default-paths
(this branch uses jc/attr and sb/pathspec-label; is tangled with jc/attr-more.)
Allow specifying the set of submodules the user is interested in on
the command line of "git clone" that clones the superproject.
* ep/http-curl-trace (2016-05-24) 2 commits
(merged to 'next' on 2016-06-27 at c290515)
+ 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.
Will merge to 'master'.
* jc/attr (2016-05-25) 18 commits
- attr: support quoting pathname patterns in C style
- attr: expose validity check for attribute names
- attr: add counted string version of git_attr()
- attr: add counted string version of git_check_attr()
- attr: retire git_check_attrs() API
- attr: convert git_check_attrs() callers to use the new API
- attr: convert git_all_attrs() to use "struct git_attr_check"
- attr: (re)introduce git_check_attr() and struct git_attr_check
- attr: rename function and struct related to checking attributes
- attr.c: plug small leak in parse_attr_line()
- attr.c: tighten constness around "git_attr" structure
- attr.c: simplify macroexpand_one()
- attr.c: mark where #if DEBUG ends more clearly
- attr.c: complete a sentence in a comment
- attr.c: explain the lack of attr-name syntax check in parse_attr()
- attr.c: update a stale comment on "struct match_attr"
- attr.c: use strchrnul() to scan for one line
- commit.c: use strchrnul() to scan for one line
(this branch is used by jc/attr-more, sb/pathspec-label and sb/submodule-default-paths.)
The attributes API has been updated so that it can later be
optimized using the knowledge of which attributes are queried.
I wanted to polish this topic further to make the attribute
subsystem thread-ready, but because other topics depend on this
topic and they do not (yet) need it to be thread-ready, let's merge
this early part together with the dependent topics to 'next', and
back-burner the threading enhancement to another day.
* pb/bisect (2016-06-27) 9 commits
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
- bisect--helper: `bisect_reset` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- t6030: explicitly test for bisection cleanup
- bisect--helper: `bisect_clean_state` shell function in C
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
GSoC "bisect" topic.
* sb/pathspec-label (2016-06-03) 6 commits
- pathspec: disable preload-index when attribute pathspec magic is in use
- pathspec: allow escaped query values
- pathspec: allow querying for attributes
- pathspec: move prefix check out of the inner loop
- pathspec: move long magic parsing out of prefix_pathspec
- Documentation: fix a typo
(this branch is used by sb/submodule-default-paths; uses jc/attr; is tangled with jc/attr-more.)
The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
to limit paths that match $pattern further by attribute settings.
The preload-index mechanism is disabled when the new pathspec magic
is in use (at least for now), because the attribute subsystem is
not thread-ready.
* nd/worktree-cleanup-post-head-protection (2016-05-24) 6 commits
(merged to 'next' on 2016-06-28 at 55414fa)
+ 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.
Will merge to 'master'.
* mh/split-under-lock (2016-06-13) 33 commits
- lock_ref_sha1_basic(): only handle REF_NODEREF mode
- commit_ref_update(): remove the flags parameter
- lock_ref_for_update(): don't resolve symrefs
- lock_ref_for_update(): don't re-read non-symbolic references
- refs: resolve symbolic refs first
- ref_transaction_update(): check refname_is_safe() at a minimum
- unlock_ref(): move definition higher in the file
- lock_ref_for_update(): new function
- add_update(): initialize the whole ref_update
- verify_refname_available(): adjust constness in declaration
- refs: don't dereference on rename
- refs: allow log-only updates
- delete_branches(): use resolve_refdup()
- ref_transaction_commit(): correctly report close_ref() failure
- ref_transaction_create(): disallow recursive pruning
- refs: make error messages more consistent
- lock_ref_sha1_basic(): remove unneeded local variable
- read_raw_ref(): move docstring to header file
- read_raw_ref(): improve docstring
- read_raw_ref(): rename symref argument to referent
- read_raw_ref(): clear *type at start of function
- read_raw_ref(): rename flags argument to type
- ref_transaction_commit(): remove local variables n and updates
- rename_ref(): remove unneeded local variable
- commit_ref_update(): write error message to *err, not stderr
- refname_is_safe(): insist that the refname already be normalized
- refname_is_safe(): don't allow the empty string
- refname_is_safe(): use skip_prefix()
- remove_dir_recursively(): add docstring
- safe_create_leading_directories(): improve docstring
- read_raw_ref(): don't get confused by an empty directory
- commit_ref(): if there is an empty dir in the way, delete it
- t1404: demonstrate a bug resolving references
(this branch is used by mh/ref-iterators, mh/ref-store and mh/update-ref-errors.)
Further preparatory work on the refs API before the pluggable
backend series can land.
Is everybody happy with this version?
If so, will merge to 'next'.
* jc/send-email-skip-backup (2016-04-12) 1 commit
(merged to 'next' on 2016-06-28 at 67dac59)
+ send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Will merge to 'master'.
Perhaps people will enhance it more once it gains more visibility.
* kn/ref-filter-branch-list (2016-05-17) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Rerolled.
This also really needs review.
* dt/index-helper (2016-06-27) 21 commits
- unix-socket.c: add stub implementation when unix sockets are not supported
- index-helper: indexhelper.exitafter config
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: support watchman to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: log warnings
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- pkt-line: add gentle version of packet_write
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
A new "index-helper" daemon has been introduced to give newly
spawned Git process a quicker access to the data in the index, and
optionally interface with the watchman daemon to further reduce the
refresh cost.
Expecting a reroll.
($gmane/298331, $gmane/298319).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
While I think it would make it easier for people to experiment and
build on if the topic is merged to 'next', I am at the same time a
bit reluctant to merge an unproven new topic that introduces a new
file format, which we may end up having to support til the end of
time. Comments?
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Jun 2016, #09; Mon, 27)
@ 2016-06-27 23:21 3% Junio C Hamano
0 siblings, 0 replies; 22+ results
From: Junio C Hamano @ 2016-06-27 23:21 UTC (permalink / raw
To: git
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.
The first batch for this cycle has been merged to 'master', the tip
of 'next' has been rewound and rebuilt, while a few topics got
temporarily ejected from 'next'.
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"]
* ap/git-svn-propset-doc (2016-06-15) 1 commit
(merged to 'next' on 2016-06-22 at 5a34f7d)
+ git-svn: document the 'git svn propset' command
"git svn propset" subcommand that was added in 2.3 days is
documented now.
* cc/apply-introduce-state (2016-06-06) 50 commits
(merged to 'next' on 2016-06-20 at 4f205b8)
+ builtin/apply: remove misleading comment on lock_file field
+ builtin/apply: move 'newfd' global into 'struct apply_state'
+ builtin/apply: add 'lock_file' pointer into 'struct apply_state'
+ builtin/apply: move applying patches into apply_all_patches()
+ builtin/apply: move 'state' check into check_apply_state()
+ builtin/apply: move 'symlink_changes' global into 'struct apply_state'
+ builtin/apply: move 'fn_table' global into 'struct apply_state'
+ builtin/apply: move 'state_linenr' global into 'struct apply_state'
+ builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
+ builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
+ builtin/apply: move 'ws_error_action' into 'struct apply_state'
+ builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
+ builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
+ builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
+ builtin/apply: move 'whitespace_option' into 'struct apply_state'
+ builtin/apply: move 'whitespace_error' global into 'struct apply_state'
+ builtin/apply: move 'root' global into 'struct apply_state'
+ builtin/apply: move 'p_value_known' global into 'struct apply_state'
+ builtin/apply: move 'p_value' global into 'struct apply_state'
+ builtin/apply: move 'has_include' global into 'struct apply_state'
+ builtin/apply: move 'limit_by_name' global into 'struct apply_state'
+ builtin/apply: move 'patch_input_file' global into 'struct apply_state'
+ builtin/apply: move 'apply' global into 'struct apply_state'
+ builtin/apply: move 'p_context' global into 'struct apply_state'
+ builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
+ builtin/apply: move 'line_termination' global into 'struct apply_state'
+ builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
+ builtin/apply: move 'no_add' global into 'struct apply_state'
+ builtin/apply: move 'threeway' global into 'struct apply_state'
+ builtin/apply: move 'summary' global into 'struct apply_state'
+ builtin/apply: move 'numstat' global into 'struct apply_state'
+ builtin/apply: move 'diffstat' global into 'struct apply_state'
+ builtin/apply: move 'cached' global into 'struct apply_state'
+ builtin/apply: move 'allow_overlap' global into 'struct apply_state'
+ builtin/apply: move 'update_index' global into 'struct apply_state'
+ builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
+ builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
+ builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
+ builtin/apply: move 'check_index' global into 'struct apply_state'
+ builtin/apply: move 'check' global into 'struct apply_state'
+ builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
+ builtin/apply: move 'state' init into init_apply_state()
+ builtin/apply: introduce 'struct apply_state' to start libifying
+ builtin/apply: move 'read_stdin' global into cmd_apply()
+ builtin/apply: move 'options' variable into cmd_apply()
+ builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
+ builtin/apply: avoid local variable shadowing 'len' parameter
+ builtin/apply: avoid parameter shadowing 'linenr' global
+ builtin/apply: avoid parameter shadowing 'p_value' global
+ builtin/apply: make gitdiff_verify_name() return void
Originally merged to 'next' on 2016-06-06
The "git apply" standalone program is being libified; this is the
first step to move many state variables into a structure that can
be explicitly (re)initialized to make the machinery callable more
than once.
The next step that moves some remaining state variables into the
structure and turns die()s into an error return that propagates up
to the caller is not queued yet but in flight. It would be good to
review the above first and give the remainder of the series a solid
base to build on.
* dn/gpg-doc (2016-06-16) 1 commit
(merged to 'next' on 2016-06-22 at f467355)
+ Documentation: GPG capitalization
The documentation tries to consistently spell "GPG"; when
referring to the specific program name, "gpg" is used.
* em/newer-freebsd-shells-are-fine-with-returns (2016-06-17) 1 commit
(merged to 'next' on 2016-06-22 at dbee33c)
+ rebase: update comment about FreeBSD /bin/sh
Comments about misbehaving FreeBSD shells have been clarified with
the version number (9.x and before are broken, newer ones are OK).
* et/add-chmod-x (2016-06-07) 1 commit
(merged to 'next' on 2016-06-22 at 71d65a0)
+ add: add --chmod=+x / --chmod=-x options
"git update-index --add --chmod=+x file" may be usable as an escape
hatch, but not a friendly thing to force for people who do need to
use it regularly. "git add --chmod=+x file" can be used instead.
* jc/deref-tag (2016-06-14) 1 commit
(merged to 'next' on 2016-06-22 at 1075713)
+ blame, line-log: do not loop around deref_tag()
Code clean-up.
* jk/avoid-unbounded-alloca (2016-06-07) 1 commit
(merged to 'next' on 2016-06-22 at 93feb23)
+ tree-diff: avoid alloca for large allocations
A codepath that used alloca(3) to place an unbounded amount of data
on the stack has been updated to avoid doing so.
* jk/fetch-prune-doc (2016-06-14) 1 commit
(merged to 'next' on 2016-06-22 at 6563376)
+ fetch: document that pruning happens before fetching
Minor doc update.
* lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit
(merged to 'next' on 2016-06-22 at 92162f5)
+ receive-pack: send auto-gc output over sideband 2
Messages that are generated by auto gc during "git push" on the
receiving end are now passed back to the sending end in such a way
that they are shown with "remote: " prefix to avoid confusing the
users.
* lv/status-say-working-tree-not-directory (2016-06-09) 1 commit
(merged to 'next' on 2016-06-22 at c65c7c1)
+ Use "working tree" instead of "working directory" for git status
"git status" used to say "working directory" when it meant "working
tree".
* mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit
(merged to 'next' on 2016-06-22 at 183295b)
+ cherry-pick: allow to pick to unborn branches
"git cherry-pick A" worked on an unborn branch, but "git
cherry-pick A..B" didn't.
* nb/gnome-keyring-build (2016-06-14) 1 commit
(merged to 'next' on 2016-06-22 at 0dfb90c)
+ gnome-keyring: Don't hard-code pkg-config executable
Build improvements for gnome-keyring (in contrib/)
* pb/strbuf-read-file-doc (2016-06-14) 1 commit
(merged to 'next' on 2016-06-22 at 10e4b4f)
+ strbuf: describe the return value of strbuf_read_file
Minor doc update.
* pc/occurred (2016-06-10) 2 commits
(merged to 'next' on 2016-06-22 at ce0b944)
+ config.c: fix misspelt "occurred" in an error message
+ refs.h: fix misspelt "occurred" in a comment
Typofix.
* rj/compat-regex-size-max-fix (2016-06-06) 1 commit
(merged to 'next' on 2016-06-22 at 376c5b1)
+ regex: fix a SIZE_MAX macro redefinition warning
A compilation fix.
* sg/reflog-past-root (2016-06-06) 1 commit
(merged to 'next' on 2016-06-22 at c5d4e29)
+ reflog: continue walking the reflog past root commits
"git reflog" stopped upon seeing an entry that denotes a branch
creation event (aka "unborn"), which made it appear as if the
reflog was truncated.
* tb/complete-status (2016-06-10) 3 commits
(merged to 'next' on 2016-06-22 at 44ae68f)
+ completion: add git status
+ completion: add __git_get_option_value helper
+ completion: factor out untracked file modes into a variable
The completion script (in contrib/) learned to complete "git
status" options.
* tr/doc-tt (2016-06-08) 4 commits
(merged to 'next' on 2016-06-22 at dc6df3b)
+ doc: change configuration variables format
+ doc: more consistency in environment variables format
+ doc: change environment variables format
+ doc: clearer rule about formatting literals
The documentation set has been updated so that literal commands,
configuration variables and environment variables are consistently
typeset in fixed-width font and bold in manpages.
* vs/prompt-avoid-unset-variable (2016-06-06) 1 commit
(merged to 'next' on 2016-06-22 at 8bf21d3)
+ git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
The git-prompt scriptlet (in contrib/) was not friendly with those
who uses "set -u", which has been fixed.
--------------------------------------------------
[New Topics]
* jk/test-match-signal (2016-06-24) 4 commits
- t/lib-git-daemon: use test_match_signal
- test_must_fail: use test_match_signal
- t0005: use test_match_signal as appropriate
- tests: factor portable signal check out of t0005
The test framework learned a new helper test_match_signal to check
an exit code from getting killed by an expected signal.
Will merge to 'next'.
* ah/unpack-trees-advice-messages (2016-06-27) 1 commit
- unpack-trees: fix English grammar in do-this-before-that messages
Will merge to 'next'.
* ew/gc-auto-pack-limit-fix (2016-06-27) 1 commit
- gc: fix off-by-one error with gc.autoPackLimit
"gc.autoPackLimit" when set to 1 should not trigger a repacking
when there is only one pack, but the code counted poorly and did
so.
Will merge to 'next'.
* nd/connect-ssh-command-config (2016-06-27) 1 commit
- connect: read $GIT_SSH_COMMAND from config file
A new configuration variable core.sshCommand to specify what value
for GIT_SSH_COMMAND to use per repository.
* nd/doc-new-command (2016-06-27) 1 commit
- new-command.txt: correct the command description file
Will merge to 'next'.
* po/range-doc (2016-06-27) 3 commits
- doc: give headings for the two and three dot notations
- doc: show the actual left, right, and boundary marks
- doc: use 'symmetric difference' consistently
* sb/submodule-parallel-fetch (2016-06-27) 2 commits
- xwrite: poll on non-blocking FDs
- xread: retry after poll on EAGAIN/EWOULDBLOCK
Fix a recently introduced codepaths that are involved in parallel
submodule operations, which gave up on reading too early, and
could have wasted CPU while attempting to write under a corner case
condition.
Will merge to 'next'.
* mm/doc-tt (2016-06-27) 6 commits
- doc: typeset HEAD and variants as litteral
- CodingGuidelines: formatting HEAD in documentation
- doc: typeset long options with argument as litteral
- doc: typeset -- as litteral
- doc: typeset long command-line options as literal
- doc: typeset short command-line options as literal
More mark-up updates to typeset strings that are expected to
literally typed by the end user in fixed-width font.
* nd/fetch-ref-summary (2016-06-27) 5 commits
- fetch: reduce duplicate in ref update status lines with placeholder
- fetch: align all "remote -> local" output
- fetch: change flag code for displaying tag update and deleted ref
- fetch: refactor ref update status formatting code
- git-fetch.txt: document fetch output
Improve the look of the way "git fetch" reports what happened to
each ref that was fetched.
Still being discussed.
--------------------------------------------------
[Stalled]
* tb/convert-peek-in-index (2016-06-07) 3 commits
- correct ce_compare_data() in a middle of a merge
- read-cache: factor out get_sha1_from_index() helper
- convert: unify the "auto" handling of CRLF
(this branch is used by jh/clean-smudge-annex.)
Needs review.
* 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 arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* sg/completion-updates (2016-02-28) 21 commits
. completion: cache the path to the repository
. completion: extract repository discovery from __gitdir()
. completion: don't guard git executions with __gitdir()
. completion: consolidate silencing errors from git commands
. completion: don't use __gitdir() for git commands
. completion: respect 'git -C <path>'
. completion: fix completion after 'git -C <path>'
. completion: don't offer commands when 'git --opt' needs an argument
. rev-parse: add '--absolute-git-dir' option
. completion: list short refs from a remote given as a URL
. completion: don't list 'HEAD' when trying refs completion outside of a repo
. completion: list refs from remote when remote's name matches a directory
. completion: respect 'git --git-dir=<path>' when listing remote refs
. completion: fix most spots not respecting 'git --git-dir=<path>'
. completion: ensure that the repository path given on the command line exists
. completion tests: add tests for the __git_refs() helper function
. completion tests: check __gitdir()'s output in the error cases
. completion tests: consolidate getting path of current working directory
. completion tests: make the $cur variable local to the test helper functions
. completion tests: don't add test cruft to the test repository
. completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* ak/t7800-wo-readlink (2016-06-21) 1 commit
- t7800: readlink may not be available
One among four invocations of readlink(1) in our test suite has
been rewritten so that the test can run on systems without the
command (others are in valgrind test framework and t9802).
Will merge to 'next'.
* js/perf-on-apple (2016-06-21) 1 commit
- perf: accommodate for MacOSX
t/perf needs /usr/bin/time with GNU extension; the invocation of it
is updated to "gtime" on Darwin.
Will merge to 'next'.
* sb/t5614-modernize (2016-06-21) 1 commit
- t5614: don't use subshells
(this branch uses sb/clone-shallow-passthru.)
Test clean-up.
Will merge to 'next'.
* ao/p4-has-branch-prefix-fix (2016-06-22) 1 commit
- git-p4: correct hasBranchPrefix verbose output
A bug, which caused "git p4" while running under verbose mode to
report paths that are omitted due to branch prefix incorrectly, has
been fixed; the command said "Ignoring file outside of prefix" for
paths that are _inside_.
Will merge to 'next'.
* cb/t7810-test-label-fix (2016-06-21) 1 commit
- t7810: fix duplicated test title
Test clean-up.
Will merge to 'next'.
* jc/t2300-setup (2016-06-22) 1 commit
- t2300: "git --exec-path" is not usable in $PATH on Windows as-is
Portability fix for Windows.
Will merge to 'next'.
* jk/perf-any-version (2016-06-22) 2 commits
- p4211: explicitly disable renames in no-rename test
- t/perf: fix regression in testing older versions of git
Allow t/perf framework to use the features from the most recent
version of Git even when testing an older installed version.
Will merge to 'next'.
* jn/preformatted-doc-url (2016-06-22) 1 commit
- doc: git-htmldocs.googlecode.com is no more
Will merge to 'next'.
* ex/deprecate-empty-pathspec-as-match-all (2016-06-22) 1 commit
- pathspec: warn on empty strings as pathspec
An empty string used as a pathspec element has always meant
'everything matches', but it is too easy to write a script that
finds a path to remove in $path and run 'git rm "$paht"', which
ends up removing everything. Start warning about this use of an
empty string used for 'everything matches' and ask users to use a
more explicit '.' for that instead.
The hope is that existing users will not mind this change, and
eventually the warning can be turned into a hard error, upgrading
the deprecation into removal of this (mis)feature.
Will wait for further comments for a bit before merging to 'next'.
* jk/ansi-color (2016-06-23) 7 commits
- color: support strike-through attribute
- color: support "italic" attribute
- color: allow "no-" for negating attributes
- color: refactor parse_attr
- add skip_prefix_mem helper
- doc: refactor description of color format
- color: fix max-size comment
The output coloring scheme learned two new attributes, italic and
strike, in addition to existing bold, reverse, etc.
Will merge to 'next'.
* nd/icase (2016-06-27) 13 commits
- SQUASH???
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: Add regcomp_or_die()
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep: rewrite an if/else condition to avoid duplicate expression
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
"git grep -i" has been taught to fold case in non-ascii locales
correctly.
Modulo minor possible nits, this round looked mostly sensible.
* mj/log-show-signature-conf (2016-06-24) 3 commits
- log: add log.showSignature configuration variable
- log: add "--no-show-signature" command line option
- t4202: refactor test
"git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
Will merge to 'next'.
* mg/signature-doc (2016-06-17) 4 commits
- Documentation/technical: signed merge tag format
- Documentation/technical: signed commit format
- Documentation/technical: signed tag format
- Documentation/technical: describe signature formats
Formats of the various data (and how to validate them) where we use
GPG signature have been documented.
Will merge to 'next'.
* jk/string-list-static-init (2016-06-13) 2 commits
(merged to 'next' on 2016-06-27 at 3d4b2fa)
+ use string_list initializer consistently
+ Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init
(this branch uses jk/parseopt-string-list.)
Instead of taking advantage of a struct string_list that is
allocated with all NULs happens to be STRING_LIST_INIT_NODUP kind,
initialize them explicitly as such, to document their behaviour
better.
Will merge to 'master'.
* mh/ref-store (2016-06-20) 38 commits
- refs: implement iteration over only per-worktree refs
- refs: make lock generic
- refs: add method to rename refs
- refs: add methods to init refs db
- refs: make delete_refs() virtual
- refs: add method for initial ref transaction commit
- refs: add methods for reflog
- refs: add method iterator_begin
- files_ref_iterator_begin(): take a ref_store argument
- split_symref_update(): add a files_ref_store argument
- lock_ref_sha1_basic(): add a files_ref_store argument
- lock_ref_for_update(): add a files_ref_store argument
- commit_ref_update(): add a files_ref_store argument
- lock_raw_ref(): add a files_ref_store argument
- repack_without_refs(): add a files_ref_store argument
- refs: make peel_ref() virtual
- refs: make create_symref() virtual
- refs: make pack_refs() virtual
- refs: make verify_refname_available() virtual
- refs: make read_raw_ref() virtual
- resolve_gitlink_ref(): rename path parameter to submodule
- resolve_gitlink_ref(): avoid memory allocation in many cases
- resolve_gitlink_ref(): implement using resolve_ref_recursively()
- resolve_ref_recursively(): new function
- read_raw_ref(): take a (struct ref_store *) argument
- resolve_gitlink_packed_ref(): remove function
- resolve_packed_ref(): rename function from resolve_missing_loose_ref()
- refs: reorder definitions
- refs: add a transaction_commit() method
- {lock,commit,rollback}_packed_refs(): add files_ref_store arguments
- resolve_missing_loose_ref(): add a files_ref_store argument
- get_packed_ref(): add a files_ref_store argument
- add_packed_ref(): add a files_ref_store argument
- refs: create a base class "ref_store" for files_ref_store
- refs: add a backend method structure
- refs: rename struct ref_cache to files_ref_store
- rename_ref_available(): add docstring
- resolve_gitlink_ref(): eliminate temporary variable
(this branch uses mh/ref-iterators and mh/split-under-lock; is tangled with mh/update-ref-errors.)
The ref-store abstraction was introduced to the refs API so that we
can plug in different backends to store references.
Rebased on top of mh/split-under-lock.
* mh/update-ref-errors (2016-06-20) 6 commits
- lock_ref_for_update(): avoid a symref resolution
- lock_ref_for_update(): make error handling more uniform
- t1404: add more tests of update-ref error handling
- t1404: document function test_update_rejected
- t1404: remove "prefix" argument to test_update_rejected
- t1404: rename file to t1404-update-ref-errors.sh
(this branch uses mh/split-under-lock; is tangled with mh/ref-iterators and mh/ref-store.)
Error handling in the codepaths that updates refs has been
improved.
Rebased on top of mh/split-under-lock.
* jh/clean-smudge-annex (2016-06-22) 10 commits
- SQUASH???
- use smudgeToFile filter in recursive merge
- use smudgeToFile filter in git am
- better recovery from failure of smudgeToFile filter
- warn on unusable smudgeToFile/cleanFromFile config
- use smudgeToFile in git checkout etc
- use cleanFromFile in git add
- add smudgeToFile and cleanFromFile filter configs
- clarify %f documentation
- Merge branch 'tb/convert-peek-in-index' into jh/clean-smudge-annex
(this branch uses tb/convert-peek-in-index.)
The interface to "clean/smudge" filters require Git to feed the
whole contents via pipe, which is suboptimal for some
applications. "cleanFromFile/smudgeToFile" commands are the moral
equilvalents for these filters but they interact with the files on
the filesystem directly.
* lc/shell-default-value-noexpand (2016-06-19) 1 commit
- sh-setup: enclose setting of ${VAR=default} in double-quotes
Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
to set the default value, without enclosing it in double quotes.
Will merge to 'next'.
* sb/clone-shallow-passthru (2016-06-20) 1 commit
- clone: do not let --depth imply --shallow-submodules
(this branch is used by sb/t5614-modernize.)
Fix an unintended regression in v2.9 that breaks "clone --depth"
that recurses down to submodules by forcing the submodules to also
be cloned shallowly, which many server instances that host upstream
of the submodules are not prepared for.
Will merge to 'next'.
* js/find-commit-subject-ignore-leading-blanks (2016-06-22) 2 commits
- commit.c: make find_commit_subject() more robust
- pretty: make the skip_blank_lines() function public
A helper function that takes the contents of a commit object and
finds its subject line did not ignore leading blank lines, as is
commonly done by other codepaths. Make it ignore leading blank
lines to match.
Will merge to 'next'.
* js/log-to-diffopt-file (2016-06-24) 10 commits
- t4211: ensure that log respects --output=<file>
- shortlog: respect the --output=<file> setting
- format-patch: use stdout directly
- format-patch: avoid freopen()
- format-patch: explicitly switch off color when writing to files
- shortlog: support outputting to streams other than stdout
- graph: respect the diffopt.file setting
- line-log: respect diffopt's configured output file stream
- log-tree: respect diffopt's configured output file stream
- log: prepare log/log-tree to reuse the diffopt.close_file attribute
The commands in the "log/diff" family had an FILE* pointer in the
data structure they pass around for a long time, but some codepaths
used to always write to the standard output. As a preparatory step
to make "git format-patch" available to the internal callers, these
codepaths have been updated to consistently write into that FILE*
instead.
* js/mingw-parameter-less-c-functions (2016-06-20) 1 commit
- mingw: let the build succeed with DEVELOPER=1
Some platform-specific code had non-ANSI strict declarations of C
functions that do not take any parameters, which has been
corrected.
Will merge to 'next'.
* bc/cocci (2016-06-20) 8 commits
- merge-recursive: convert merge_recursive_generic to object_id
- merge-recursive: convert leaf functions to use struct object_id
- merge-recursive: convert struct merge_file_info to object_id
- merge-recursive: convert struct stage_data to use object_id
- diff: rename struct diff_filespec's sha1_valid member
- diff: convert struct diff_filespec to struct object_id
- coccinelle: apply object_id Coccinelle transformations
- contrib/coccinelle: add basic Coccinelle transforms
Conversion from unsigned char sha1[20] to struct object_id
continues.
* jk/tzoffset-fix (2016-06-20) 3 commits
- local_tzoffset: detect errors from tm_to_time_t
- t0006: test various date formats
- t0006: rename test-date's "show" to "relative"
The internal code used to show local timezone offset is not
prepared to handle timestamps beyond year 2100, and gave a
bogus offset value to the caller. Use a more benign looking
+0000 instead and let "git log" going in such a case, instead
of aborting.
Will merge to 'next'.
* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit
(merged to 'next' on 2016-06-27 at 568f892)
+ add--interactive: respect diff.compactionHeuristic
"git add -i/-p" learned to honor diff.compactionHeuristic
experimental knob, so that the user can work on the same hunk split
as "git diff" output.
Will merge to 'master'.
* jk/big-and-future-archive-tar (2016-06-21) 2 commits
- archive-tar: write extended headers for far-future mtime
- archive-tar: write extended headers for file sizes >= 8GB
"git archive" learned to handle files that are larger than 8GB and
commits far in the future than expressible by the traditional US-TAR
format.
Expecting a reroll.
($gmane/298119)
* jk/gpg-interface-cleanup (2016-06-17) 7 commits
- gpg-interface: check gpg signature creation status
- sign_buffer: use pipe_command
- verify_signed_buffer: use pipe_command
- run-command: add pipe_command helper
- verify_signed_buffer: use tempfile object
- verify_signed_buffer: drop pbuf variable
- gpg-interface: use child_process.args
A new run-command API function pipe_command() is introduced to
sanely feed data to the standard input while capturing data from
the standard output and the standard error of an external process,
which is cumbersome to hand-roll correctly without deadlocking.
The codepath to sign data in a prepared buffer with GPG has been
updated to use this API to read from the status-fd to check for
errors (instead of relying on GPG's exit status).
Will merge to 'next'.
* lf/sideband-returns-void (2016-06-16) 2 commits
(merged to 'next' on 2016-06-27 at 558c781)
+ upload-pack.c: make send_client_data() return void
+ sideband.c: make send_sideband() return void
A small internal API cleanup.
Will merge to 'master'.
* nd/graph-width-padded (2016-06-16) 2 commits
- pretty.c: support <direction>|(<negative number>) forms
- pretty: pass graph width to pretty formatting for use in '%>|(N)'
"log --graph --format=" learned that "%>|(N)" specifies the width
relative to the terminal's left edge, not relative to the area to
draw text that is to the right of the ancestry-graph section. It
also now accepts negative N that means the column limit is relative
to the right border.
Will merge to 'next'.
* jk/bisect-show-tree (2016-06-16) 1 commit
(merged to 'next' on 2016-06-27 at 6970f87e)
+ bisect: always call setup_revisions after init_revisions
"git bisect" makes an internal call to "git diff-tree" when
bisection finds the culprit, but this call did not initialize the
data structure to pass to the diff-tree API correctly.
Will merge to 'master'.
* jk/parseopt-string-list (2016-06-13) 3 commits
(merged to 'next' on 2016-06-27 at 27462e6)
+ 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 'master'.
* 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
(merged to 'next' on 2016-06-27 at 9793d81)
+ lib-httpd.sh: print error.log on error
Debugging aid.
Will merge to 'master'.
* sb/submodule-clone-retry (2016-06-13) 2 commits
- submodule update: continue when a clone fails
- submodule--helper: initial clone learns retry logic
"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.
Will merge to 'next'.
* jc/blame-reverse (2016-06-14) 2 commits
- blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."
- blame: improve diagnosis for "--reverse NEW"
It is a common mistake to say "git blame --reverse OLD path",
expecting that the command line is dwimmed as if asking how lines
in path in an old revision OLD have survived up to the current
commit.
Any supporters? Otherwise will drop.
* km/fetch-do-not-free-remote-name (2016-06-14) 1 commit
(merged to 'next' on 2016-06-27 at 4bc34c4)
+ builtin/fetch.c: don't free remote->name after fetch
The ownership rule for the piece of memory that hold references to
be fetched in "git fetch" was screwy, which has been cleaned up.
Will merge to 'master'.
* nd/shallow-deepen (2016-06-13) 27 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: make check_non_tip() clean things up on error
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Rerolled.
Needs review. What this topic attempts to achieve is worthwhile, I
would think.
* jk/send-pack-stdio (2016-06-10) 2 commits
(merged to 'next' on 2016-06-27 at 2cfb0ff)
+ write_or_die: remove the unused write_or_whine() function
+ send-pack: use buffered I/O to talk to pack-objects
Code clean-up.
Will merge to 'master'.
* pb/commit-editmsg-path (2016-06-09) 1 commit
(merged to 'next' on 2016-06-27 at 0f01ce1)
+ builtin/commit.c: memoize git-path for COMMIT_EDITMSG
Code clean-up.
Will merge to 'master'.
* jc/attr-more (2016-06-09) 8 commits
- attr.c: outline the future plans by heavily commenting
- attr.c: always pass check[] to collect_some_attrs()
- attr.c: introduce empty_attr_check_elems()
- attr.c: correct ugly hack for git_all_attrs()
- attr.c: rename a local variable check
- fixup! d5ad6c13
- attr.c: pass struct git_attr_check down the callchain
- attr.c: add push_stack() helper
(this branch uses jc/attr; is tangled with sb/pathspec-label and sb/submodule-default-paths.)
The beginning of long and tortuous journey to clean-up attribute
subsystem implementation.
Needs to be redone.
* mh/ref-iterators (2016-06-20) 13 commits
- for_each_reflog(): reimplement using iterators
- dir_iterator: new API for iterating over a directory tree
- for_each_reflog(): don't abort for bad references
- do_for_each_ref(): reimplement using reference iteration
- refs: introduce an iterator interface
- ref_resolves_to_object(): new function
- entry_resolves_to_object(): rename function from ref_resolves_to_object()
- get_ref_cache(): only create an instance if there is a submodule
- remote rm: handle symbolic refs correctly
- delete_refs(): add a flags argument
- refs: use name "prefix" consistently
- do_for_each_ref(): move docstring to the header file
- refs: remove unnecessary "extern" keywords
(this branch is used by mh/ref-store; uses mh/split-under-lock; is tangled with mh/update-ref-errors.)
The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
Rebased on top of mh/split-under-lock.
* ew/mboxrd-format-am (2016-06-06) 3 commits
- am: support --patch-format=mboxrd
- mailsplit: support unescaping mboxrd messages
- pretty: support "mboxrd" output format
Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
Will merge to 'next'.
* mh/connect (2016-06-06) 10 commits
- connect: [host:port] is legacy for ssh
- connect: move ssh command line preparation to a separate function
- connect: actively reject git:// urls with a user part
- connect: change the --diag-url output to separate user and host
- connect: make parse_connect_url() return the user part of the url as a separate value
- connect: group CONNECT_DIAG_URL handling code
- connect: make parse_connect_url() return separated host and port
- connect: re-derive a host:port string from the separate host and port variables
- connect: call get_host_and_port() earlier
- connect: document why we sometimes call get_port after get_host_and_port
Rewrite Git-URL parsing routine (hopefully) without changing any
behaviour.
* va/i18n-even-more (2016-06-17) 38 commits
- i18n: branch: mark comment when editing branch description for translation
- i18n: unmark die messages for translation
- i18n: submodule: escape shell variables inside eval_gettext
- i18n: submodule: join strings marked for translation
- i18n: init-db: join message pieces
- i18n: remote: allow translations to reorder message
- i18n: remote: mark URL fallback text for translation
- i18n: standardise messages
- i18n: sequencer: add period to error message
- i18n: merge: change command option help to lowercase
- i18n: merge: mark messages for translation
- i18n: notes: mark options for translation
- i18n: notes: mark strings for translation
- i18n: transport-helper.c: change N_() call to _()
- i18n: bisect: mark strings for translation
- t5523: use test_i18ngrep for negation
- t4153: fix negated test_i18ngrep call
- t9003: become resilient to GETTEXT_POISON
- tests: unpack-trees: update to use test_i18n* functions
- tests: use test_i18n* functions to suppress false positives
- i18n: setup: mark strings for translation
- i18n: rebase-interactive: mark comments of squash for translation
- i18n: rebase-interactive: mark here-doc strings for translation
- i18n: rebase-interactive: mark strings for translation
- i18n: git-sh-setup.sh: mark strings for translation
- t6030: update to use test_i18ncmp
- i18n: bisect: simplify error message for i18n
- i18n: rebase: mark placeholder for translation
- i18n: rebase: fix marked string to use eval_gettext variant
- merge-octopus: use die shell function from git-sh-setup.sh
- i18n: merge-octopus: mark messages for translation
- i18n: sequencer: mark string for translation
- i18n: sequencer: mark entire sentences for translation
- i18n: transport: mark strings for translation
- i18n: advice: internationalize message for conflicts
- i18n: advice: mark string about detached head for translation
- i18n: builtin/remote.c: fix mark for translation
- Merge branch 'jc/t2300-setup' into HEAD
More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
One patch from the original submission dropped due to conflicts
with jk/upload-pack-hook, which is still in flux.
Will merge to 'next'.
* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
- blame: require 0 context lines while finding moved lines with -M
"git blame -M" missed a single line that was moved within the file.
We may want to squash a test or two to this commit. Volunteers?
* nd/worktree-lock (2016-06-13) 6 commits
- worktree.c: find_worktree() search by path suffix
- worktree: add "unlock" command
- worktree: add "lock" command
- worktree.c: add is_worktree_locked()
- worktree.c: add is_main_worktree()
- worktree.c: add find_worktree()
(this branch uses nd/worktree-cleanup-post-head-protection.)
"git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location. "git worktree"
command learned a dedicated command pair to create and remoev such
a file, so that the users do not have to do this with editor.
Is everybody happy with this version?
If so, will merge to 'next'.
* jk/upload-pack-hook (2016-06-02) 7 commits
- upload-pack: provide a hook for running pack-objects
- t1308: do not get fooled by symbolic links to the source tree
- config: add a notion of "scope"
- config: return configset value for current_config_ functions
- config: set up config_source for command-line config
- git_config_parse_parameter: refactor cleanup code
- git_config_with_options: drop "found" counting
Allow a custom "git upload-pack" replacement to respond to
"fetch/clone" request.
Will merge to 'next'.
* sb/submodule-default-paths (2016-06-20) 5 commits
- completion: clone can recurse into submodules
- clone: add --init-submodule=<pathspec> switch
- submodule update: add `--init-default-path` switch
- Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
- Merge branch 'jc/attr' into sb/submodule-default-paths
(this branch uses jc/attr and sb/pathspec-label; is tangled with jc/attr-more.)
Allow specifying the set of submodules the user is interested in on
the command line of "git clone" that clones the superproject.
* ep/http-curl-trace (2016-05-24) 2 commits
(merged to 'next' on 2016-06-27 at c290515)
+ 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.
Will merge to 'master'.
* jc/attr (2016-05-25) 18 commits
- attr: support quoting pathname patterns in C style
- attr: expose validity check for attribute names
- attr: add counted string version of git_attr()
- attr: add counted string version of git_check_attr()
- attr: retire git_check_attrs() API
- attr: convert git_check_attrs() callers to use the new API
- attr: convert git_all_attrs() to use "struct git_attr_check"
- attr: (re)introduce git_check_attr() and struct git_attr_check
- attr: rename function and struct related to checking attributes
- attr.c: plug small leak in parse_attr_line()
- attr.c: tighten constness around "git_attr" structure
- attr.c: simplify macroexpand_one()
- attr.c: mark where #if DEBUG ends more clearly
- attr.c: complete a sentence in a comment
- attr.c: explain the lack of attr-name syntax check in parse_attr()
- attr.c: update a stale comment on "struct match_attr"
- attr.c: use strchrnul() to scan for one line
- commit.c: use strchrnul() to scan for one line
(this branch is used by jc/attr-more, sb/pathspec-label and sb/submodule-default-paths.)
The attributes API has been updated so that it can later be
optimized using the knowledge of which attributes are queried.
I wanted to polish this topic further to make the attribute
subsystem thread-ready, but because other topics depend on this
topic and they do not (yet) need it to be thread-ready, let's merge
this early part together with the dependent topics to 'next', and
back-burner the threading enhancement to another day.
* pb/bisect (2016-06-27) 9 commits
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
- bisect--helper: `bisect_reset` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- t6030: explicitly test for bisection cleanup
- bisect--helper: `bisect_clean_state` shell function in C
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
GSoC "bisect" topic.
* sb/pathspec-label (2016-06-03) 6 commits
- pathspec: disable preload-index when attribute pathspec magic is in use
- pathspec: allow escaped query values
- pathspec: allow querying for attributes
- pathspec: move prefix check out of the inner loop
- pathspec: move long magic parsing out of prefix_pathspec
- Documentation: fix a typo
(this branch is used by sb/submodule-default-paths; uses jc/attr; is tangled with jc/attr-more.)
The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
to limit paths that match $pattern further by attribute settings.
The preload-index mechanism is disabled when the new pathspec magic
is in use (at least for now), because the attribute subsystem is
not thread-ready.
* 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.
Will merge to 'next'.
* mh/split-under-lock (2016-06-13) 33 commits
- lock_ref_sha1_basic(): only handle REF_NODEREF mode
- commit_ref_update(): remove the flags parameter
- lock_ref_for_update(): don't resolve symrefs
- lock_ref_for_update(): don't re-read non-symbolic references
- refs: resolve symbolic refs first
- ref_transaction_update(): check refname_is_safe() at a minimum
- unlock_ref(): move definition higher in the file
- lock_ref_for_update(): new function
- add_update(): initialize the whole ref_update
- verify_refname_available(): adjust constness in declaration
- refs: don't dereference on rename
- refs: allow log-only updates
- delete_branches(): use resolve_refdup()
- ref_transaction_commit(): correctly report close_ref() failure
- ref_transaction_create(): disallow recursive pruning
- refs: make error messages more consistent
- lock_ref_sha1_basic(): remove unneeded local variable
- read_raw_ref(): move docstring to header file
- read_raw_ref(): improve docstring
- read_raw_ref(): rename symref argument to referent
- read_raw_ref(): clear *type at start of function
- read_raw_ref(): rename flags argument to type
- ref_transaction_commit(): remove local variables n and updates
- rename_ref(): remove unneeded local variable
- commit_ref_update(): write error message to *err, not stderr
- refname_is_safe(): insist that the refname already be normalized
- refname_is_safe(): don't allow the empty string
- refname_is_safe(): use skip_prefix()
- remove_dir_recursively(): add docstring
- safe_create_leading_directories(): improve docstring
- read_raw_ref(): don't get confused by an empty directory
- commit_ref(): if there is an empty dir in the way, delete it
- t1404: demonstrate a bug resolving references
(this branch is used by mh/ref-iterators, mh/ref-store and mh/update-ref-errors.)
Further preparatory work on the refs API before the pluggable
backend series can land.
Replaced with a rerolled version.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Will merge to 'next'.
Perhaps people will enhance it more once it gains more visibility.
* kn/ref-filter-branch-list (2016-05-17) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Rerolled.
This also really needs review.
* dt/index-helper (2016-06-27) 21 commits
- unix-socket.c: add stub implementation when unix sockets are not supported
- index-helper: indexhelper.exitafter config
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: support watchman to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: log warnings
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- pkt-line: add gentle version of packet_write
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
A new "index-helper" daemon has been introduced to give newly
spawned Git process a quicker access to the data in the index, and
optionally interface with the watchman daemon to further reduce the
refresh cost.
Expecting a reroll.
($gmane/298331, $gmane/298319).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
While I think it would make it easier for people to experiment and
build on if the topic is merged to 'next', I am at the same time a
bit reluctant to merge an unproven new topic that introduces a new
file format, which we may end up having to support til the end of
time. Comments?
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Jun 2016, #08; Thu, 23)
@ 2016-06-23 22:37 3% Junio C Hamano
0 siblings, 0 replies; 22+ results
From: Junio C Hamano @ 2016-06-23 22:37 UTC (permalink / raw
To: git
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.
The first batch for this cycle has been merged to 'master', the tip
of 'next' has been rewound and rebuilt, while a few topics got
temporarily ejected from 'next'.
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
--------------------------------------------------
[New Topics]
* ak/t7800-wo-readlink (2016-06-21) 1 commit
- t7800: readlink may not be available
One among four invocations of readlink(1) in our test suite has
been rewritten so that the test can run on systems without the
command (others are in valgrind test framework and t9802).
Will merge to 'next'.
* js/perf-on-apple (2016-06-21) 1 commit
- perf: accommodate for MacOSX
t/perf needs /usr/bin/time with GNU extension; the invocation of it
is updated to "gtime" on Darwin.
Will merge to 'next'.
* sb/t5614-modernize (2016-06-21) 1 commit
- t5614: don't use subshells
(this branch uses sb/clone-shallow-passthru.)
Test clean-up.
Will merge to 'next'.
* ao/p4-has-branch-prefix-fix (2016-06-22) 1 commit
- git-p4: correct hasBranchPrefix verbose output
A bug, which caused "git p4" while running under verbose mode to
report paths that are omitted due to branch prefix incorrectly, has
been fixed; the command said "Ignoring file outside of prefix" for
paths that are _inside_.
Will merge to 'next'.
* cb/t7810-test-label-fix (2016-06-21) 1 commit
- t7810: fix duplicated test title
Test clean-up.
Will merge to 'next'.
* jc/t2300-setup (2016-06-22) 1 commit
- t2300: "git --exec-path" is not usable in $PATH on Windows as-is
Portability fix for Windows.
Will merge to 'next'.
* jk/perf-any-version (2016-06-22) 2 commits
- p4211: explicitly disable renames in no-rename test
- t/perf: fix regression in testing older versions of git
Allow t/perf framework to use the features from the most recent
version of Git even when testing an older installed version.
Will merge to 'next'.
* jn/preformatted-doc-url (2016-06-22) 1 commit
- doc: git-htmldocs.googlecode.com is no more
Will merge to 'next'.
* ex/deprecate-empty-pathspec-as-match-all (2016-06-22) 1 commit
- pathspec: warn on empty strings as pathspec
An empty string used as a pathspec element has always meant
'everything matches', but it is too easy to write a script that
finds a path to remove in $path and run 'git rm "$paht"', which
ends up removing everything. Start warning about this use of an
empty string used for 'everything matches' and ask users to use a
more explicit '.' for that instead.
The hope is that existing users will not mind this change, and
eventually the warning can be turned into a hard error, upgrading
the deprecation into removal of this (mis)feature.
Will wait for further comments for a bit before merging to 'next'.
* jk/ansi-color (2016-06-23) 7 commits
- color: support strike-through attribute
- color: support "italic" attribute
- color: allow "no-" for negating attributes
- color: refactor parse_attr
- add skip_prefix_mem helper
- doc: refactor description of color format
- color: fix max-size comment
The output coloring scheme learned two new attributes, italic and
strike, in addition to existing bold, reverse, etc.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* tb/convert-peek-in-index (2016-06-07) 3 commits
- correct ce_compare_data() in a middle of a merge
- read-cache: factor out get_sha1_from_index() helper
- convert: unify the "auto" handling of CRLF
(this branch is used by jh/clean-smudge-annex.)
Needs review.
* 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 arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* sg/completion-updates (2016-02-28) 21 commits
. completion: cache the path to the repository
. completion: extract repository discovery from __gitdir()
. completion: don't guard git executions with __gitdir()
. completion: consolidate silencing errors from git commands
. completion: don't use __gitdir() for git commands
. completion: respect 'git -C <path>'
. completion: fix completion after 'git -C <path>'
. completion: don't offer commands when 'git --opt' needs an argument
. rev-parse: add '--absolute-git-dir' option
. completion: list short refs from a remote given as a URL
. completion: don't list 'HEAD' when trying refs completion outside of a repo
. completion: list refs from remote when remote's name matches a directory
. completion: respect 'git --git-dir=<path>' when listing remote refs
. completion: fix most spots not respecting 'git --git-dir=<path>'
. completion: ensure that the repository path given on the command line exists
. completion tests: add tests for the __git_refs() helper function
. completion tests: check __gitdir()'s output in the error cases
. completion tests: consolidate getting path of current working directory
. completion tests: make the $cur variable local to the test helper functions
. completion tests: don't add test cruft to the test repository
. completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* nd/icase (2016-06-23) 11 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
"git grep -i" has been taught to fold case in non-ascii locales
correctly.
Modulo minor possible nits, this round looked mostly sensible.
* mj/log-show-signature-conf (2016-06-22) 3 commits
- log: add log.showSignature configuration variable
- log: add "--no-show-signature" command line option
- t4202: refactor test
"git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
The value of the first step is unclear. The top two looked OK.
* em/newer-freebsd-shells-are-fine-with-returns (2016-06-17) 1 commit
(merged to 'next' on 2016-06-22 at dbee33c)
+ rebase: update comment about FreeBSD /bin/sh
Comments about misbehaving FreeBSD shells have been clarified with
the version number (9.x and before are broken, newer ones are OK).
Will merge to 'master'.
* mg/signature-doc (2016-06-17) 4 commits
- Documentation/technical: signed merge tag format
- Documentation/technical: signed commit format
- Documentation/technical: signed tag format
- Documentation/technical: describe signature formats
Formats of the various data (and how to validate them) where we use
GPG signature have been documented.
Will merge to 'next'.
* jk/string-list-static-init (2016-06-13) 2 commits
- use string_list initializer consistently
- Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init
(this branch uses jk/parseopt-string-list.)
Instead of taking advantage of a struct string_list that is
allocated with all NULs happens to be STRING_LIST_INIT_NODUP kind,
initialize them explicitly as such, to document their behaviour
better.
Will merge to 'next'.
* mh/ref-store (2016-06-20) 38 commits
- refs: implement iteration over only per-worktree refs
- refs: make lock generic
- refs: add method to rename refs
- refs: add methods to init refs db
- refs: make delete_refs() virtual
- refs: add method for initial ref transaction commit
- refs: add methods for reflog
- refs: add method iterator_begin
- files_ref_iterator_begin(): take a ref_store argument
- split_symref_update(): add a files_ref_store argument
- lock_ref_sha1_basic(): add a files_ref_store argument
- lock_ref_for_update(): add a files_ref_store argument
- commit_ref_update(): add a files_ref_store argument
- lock_raw_ref(): add a files_ref_store argument
- repack_without_refs(): add a files_ref_store argument
- refs: make peel_ref() virtual
- refs: make create_symref() virtual
- refs: make pack_refs() virtual
- refs: make verify_refname_available() virtual
- refs: make read_raw_ref() virtual
- resolve_gitlink_ref(): rename path parameter to submodule
- resolve_gitlink_ref(): avoid memory allocation in many cases
- resolve_gitlink_ref(): implement using resolve_ref_recursively()
- resolve_ref_recursively(): new function
- read_raw_ref(): take a (struct ref_store *) argument
- resolve_gitlink_packed_ref(): remove function
- resolve_packed_ref(): rename function from resolve_missing_loose_ref()
- refs: reorder definitions
- refs: add a transaction_commit() method
- {lock,commit,rollback}_packed_refs(): add files_ref_store arguments
- resolve_missing_loose_ref(): add a files_ref_store argument
- get_packed_ref(): add a files_ref_store argument
- add_packed_ref(): add a files_ref_store argument
- refs: create a base class "ref_store" for files_ref_store
- refs: add a backend method structure
- refs: rename struct ref_cache to files_ref_store
- rename_ref_available(): add docstring
- resolve_gitlink_ref(): eliminate temporary variable
(this branch uses mh/ref-iterators and mh/split-under-lock; is tangled with mh/update-ref-errors.)
The ref-store abstraction was introduced to the refs API so that we
can plug in different backends to store references.
Rebased on top of mh/split-under-lock.
* mh/update-ref-errors (2016-06-20) 6 commits
- lock_ref_for_update(): avoid a symref resolution
- lock_ref_for_update(): make error handling more uniform
- t1404: add more tests of update-ref error handling
- t1404: document function test_update_rejected
- t1404: remove "prefix" argument to test_update_rejected
- t1404: rename file to t1404-update-ref-errors.sh
(this branch uses mh/split-under-lock; is tangled with mh/ref-iterators and mh/ref-store.)
Error handling in the codepaths that updates refs has been
improved.
Rebased on top of mh/split-under-lock.
* jh/clean-smudge-annex (2016-06-22) 10 commits
- SQUASH???
- use smudgeToFile filter in recursive merge
- use smudgeToFile filter in git am
- better recovery from failure of smudgeToFile filter
- warn on unusable smudgeToFile/cleanFromFile config
- use smudgeToFile in git checkout etc
- use cleanFromFile in git add
- add smudgeToFile and cleanFromFile filter configs
- clarify %f documentation
- Merge branch 'tb/convert-peek-in-index' into jh/clean-smudge-annex
(this branch uses tb/convert-peek-in-index.)
The interface to "clean/smudge" filters require Git to feed the
whole contents via pipe, which is suboptimal for some
applications. "cleanFromFile/smudgeToFile" commands are the moral
equilvalents for these filters but they interact with the files on
the filesystem directly.
* lc/shell-default-value-noexpand (2016-06-19) 1 commit
- sh-setup: enclose setting of ${VAR=default} in double-quotes
Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
to set the default value, without enclosing it in double quotes.
Will merge to 'next'.
* sb/clone-shallow-passthru (2016-06-20) 1 commit
- clone: do not let --depth imply --shallow-submodules
(this branch is used by sb/t5614-modernize.)
Fix an unintended regression in v2.9 that breaks "clone --depth"
that recurses down to submodules by forcing the submodules to also
be cloned shallowly, which many server instances that host upstream
of the submodules are not prepared for.
Will merge to 'next'.
* js/find-commit-subject-ignore-leading-blanks (2016-06-22) 2 commits
- commit.c: make find_commit_subject() more robust
- pretty: make the skip_blank_lines() function public
A helper function that takes the contents of a commit object and
finds its subject line did not ignore leading blank lines, as is
commonly done by other codepaths. Make it ignore leading blank
lines to match.
Will merge to 'next'.
* js/log-to-diffopt-file (2016-06-21) 9 commits
- format-patch: use stdout directly
- format-patch: avoid freopen()
- format-patch: explicitly switch off color when writing to files
- shortlog: support outputting to streams other than stdout
- graph: respect the diffopt.file setting
- line-log: respect diffopt's configured output file stream
- log-tree: respect diffopt's configured output file stream
- Disallow diffopt.close_file when using the log_tree machinery
- am: stop ignoring errors reported by log_tree_diff()
The commands in the "log/diff" family had an optional FILE* pointer
in the data structure they pass around for a long time, but some
codepaths used to always write to the standard output. As a
preparatory step to make "git format-patch" available to the
internal callers, these codepaths have been updated to consistently
write into that FILE* instead.
* js/mingw-parameter-less-c-functions (2016-06-20) 1 commit
- mingw: let the build succeed with DEVELOPER=1
Some platform-specific code had non-ANSI strict declarations of C
functions that do not take any parameters, which has been
corrected.
Will merge to 'next'.
* bc/cocci (2016-06-20) 8 commits
- merge-recursive: convert merge_recursive_generic to object_id
- merge-recursive: convert leaf functions to use struct object_id
- merge-recursive: convert struct merge_file_info to object_id
- merge-recursive: convert struct stage_data to use object_id
- diff: rename struct diff_filespec's sha1_valid member
- diff: convert struct diff_filespec to struct object_id
- coccinelle: apply object_id Coccinelle transformations
- contrib/coccinelle: add basic Coccinelle transforms
Conversion from unsigned char sha1[20] to struct object_id
continues.
* jk/tzoffset-fix (2016-06-20) 3 commits
- local_tzoffset: detect errors from tm_to_time_t
- t0006: test various date formats
- t0006: rename test-date's "show" to "relative"
The internal code used to show local timezone offset is not
prepared to handle timestamps beyond year 2100, and gave a
bogus offset value to the caller. Use a more benign looking
+0000 instead and let "git log" going in such a case, instead
of aborting.
Will merge to 'next'.
* ap/git-svn-propset-doc (2016-06-15) 1 commit
(merged to 'next' on 2016-06-22 at 5a34f7d)
+ git-svn: document the 'git svn propset' command
"git svn propset" subcommand that was added in 2.3 days is
documented now.
Will merge to 'master'.
* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit
- add--interactive: respect diff.compactionHeuristic
"git add -i/-p" learned to honor diff.compactionHeuristic
experimental knob, so that the user can work on the same hunk split
as "git diff" output.
Will merge to 'next'.
* jk/big-and-future-archive-tar (2016-06-21) 2 commits
- archive-tar: write extended headers for far-future mtime
- archive-tar: write extended headers for file sizes >= 8GB
"git archive" learned to handle files that are larger than 8GB and
commits far in the future than expressible by the traditional US-TAR
format.
Expecting a reroll.
* jk/gpg-interface-cleanup (2016-06-17) 7 commits
- gpg-interface: check gpg signature creation status
- sign_buffer: use pipe_command
- verify_signed_buffer: use pipe_command
- run-command: add pipe_command helper
- verify_signed_buffer: use tempfile object
- verify_signed_buffer: drop pbuf variable
- gpg-interface: use child_process.args
A new run-command API function pipe_command() is introduced to
sanely feed data to the standard input while capturing data from
the standard output and the standard error of an external process,
which is cumbersome to hand-roll correctly without deadlocking.
The codepath to sign data in a prepared buffer with GPG has been
updated to use this API to read from the status-fd to check for
errors (instead of relying on GPG's exit status).
Will merge to 'next'.
* lf/sideband-returns-void (2016-06-16) 2 commits
- upload-pack.c: make send_client_data() return void
- sideband.c: make send_sideband() return void
A small internal API cleanup.
Will merge to 'next'.
* nd/graph-width-padded (2016-06-16) 2 commits
- pretty.c: support <direction>|(<negative number>) forms
- pretty: pass graph width to pretty formatting for use in '%>|(N)'
"log --graph --format=" learned that "%>|(N)" specifies the width
relative to the terminal's left edge, not relative to the area to
draw text that is to the right of the ancestry-graph section. It
also now accepts negative N that means the column limit is relative
to the right border.
Will merge to 'next'.
* dn/gpg-doc (2016-06-16) 1 commit
(merged to 'next' on 2016-06-22 at f467355)
+ Documentation: GPG capitalization
The documentation tries to consistently spell "GPG"; when
referring to the specific program name, "gpg" is used.
Will merge to 'master'.
* jk/bisect-show-tree (2016-06-16) 1 commit
- bisect: always call setup_revisions after init_revisions
"git bisect" makes an internal call to "git diff-tree" when
bisection finds the culprit, but this call did not initialize the
data structure to pass to the diff-tree API correctly.
Will merge to 'next'.
* lv/status-say-working-tree-not-directory (2016-06-09) 1 commit
(merged to 'next' on 2016-06-22 at c65c7c1)
+ 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 'master'.
* 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
(merged to 'next' on 2016-06-22 at ce0b944)
+ config.c: fix misspelt "occurred" in an error message
+ refs.h: fix misspelt "occurred" in a comment
Will merge to 'master'.
* sb/submodule-clone-retry (2016-06-13) 2 commits
- submodule update: continue when a clone fails
- submodule--helper: initial clone learns retry logic
"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.
Will merge to 'next'.
* jc/blame-reverse (2016-06-14) 2 commits
- blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."
- blame: improve diagnosis for "--reverse NEW"
It is a common mistake to say "git blame --reverse OLD path",
expecting that the command line is dwimmed as if asking how lines
in path in an old revision OLD have survived up to the current
commit.
Any supporters? Otherwise will drop.
* jc/deref-tag (2016-06-14) 1 commit
(merged to 'next' on 2016-06-22 at 1075713)
+ blame, line-log: do not loop around deref_tag()
Code clean-up.
Will merge to 'master'.
* jk/fetch-prune-doc (2016-06-14) 1 commit
(merged to 'next' on 2016-06-22 at 6563376)
+ fetch: document that pruning happens before fetching
Will merge to 'master'.
* 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
(merged to 'next' on 2016-06-22 at 0dfb90c)
+ gnome-keyring: Don't hard-code pkg-config executable
Build improvements for gnome-keyring (in contrib/)
Will merge to 'master'.
* pb/strbuf-read-file-doc (2016-06-14) 1 commit
(merged to 'next' on 2016-06-22 at 10e4b4f)
+ strbuf: describe the return value of strbuf_read_file
Will merge to 'master'.
* nd/shallow-deepen (2016-06-13) 27 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: make check_non_tip() clean things up on error
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Rerolled.
Needs review. What this topic attempts to achieve is worthwhile, I
would think.
* jk/avoid-unbounded-alloca (2016-06-07) 1 commit
(merged to 'next' on 2016-06-22 at 93feb23)
+ tree-diff: avoid alloca for large allocations
Will merge to 'master'.
* jk/send-pack-stdio (2016-06-10) 2 commits
- write_or_die: remove the unused write_or_whine() function
- send-pack: use buffered I/O to talk to pack-objects
Code clean-up.
Will merge to 'next'.
* pb/commit-editmsg-path (2016-06-09) 1 commit
- builtin/commit.c: memoize git-path for COMMIT_EDITMSG
Code clean-up.
Will merge to 'next'.
* jc/attr-more (2016-06-09) 8 commits
- attr.c: outline the future plans by heavily commenting
- attr.c: always pass check[] to collect_some_attrs()
- attr.c: introduce empty_attr_check_elems()
- attr.c: correct ugly hack for git_all_attrs()
- attr.c: rename a local variable check
- fixup! d5ad6c13
- attr.c: pass struct git_attr_check down the callchain
- attr.c: add push_stack() helper
(this branch uses jc/attr; is tangled with sb/pathspec-label and sb/submodule-default-paths.)
The beginning of long and tortuous journey to clean-up attribute
subsystem implementation.
Needs to be redone.
* mh/ref-iterators (2016-06-20) 13 commits
- for_each_reflog(): reimplement using iterators
- dir_iterator: new API for iterating over a directory tree
- for_each_reflog(): don't abort for bad references
- do_for_each_ref(): reimplement using reference iteration
- refs: introduce an iterator interface
- ref_resolves_to_object(): new function
- entry_resolves_to_object(): rename function from ref_resolves_to_object()
- get_ref_cache(): only create an instance if there is a submodule
- remote rm: handle symbolic refs correctly
- delete_refs(): add a flags argument
- refs: use name "prefix" consistently
- do_for_each_ref(): move docstring to the header file
- refs: remove unnecessary "extern" keywords
(this branch is used by mh/ref-store; uses mh/split-under-lock; is tangled with mh/update-ref-errors.)
The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
Rebased on top of mh/split-under-lock.
* ew/mboxrd-format-am (2016-06-06) 3 commits
- am: support --patch-format=mboxrd
- mailsplit: support unescaping mboxrd messages
- pretty: support "mboxrd" output format
Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
Will merge to 'next'.
* lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit
(merged to 'next' on 2016-06-22 at 92162f5)
+ receive-pack: send auto-gc output over sideband 2
Allow messages that are generated by auto gc during "git push" on
the receiving end to be explicitly passed back to the sending end
over sideband, so that they are shown with "remote: " prefix to
avoid confusing the users.
Will merge to 'master'.
* mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit
(merged to 'next' on 2016-06-22 at 183295b)
+ cherry-pick: allow to pick to unborn branches
"git cherry-pick A" worked on an unborn branch, but "git
cherry-pick A..B" didn't.
Will merge to 'master'.
* sg/reflog-past-root (2016-06-06) 1 commit
(merged to 'next' on 2016-06-22 at c5d4e29)
+ reflog: continue walking the reflog past root commits
"git reflog" stopped upon seeing an entry that denotes a branch
creation event (aka "unborn"), which made it appear as if the
reflog was truncated.
Will merge to 'master'.
* tb/complete-status (2016-06-10) 3 commits
(merged to 'next' on 2016-06-22 at 44ae68f)
+ completion: add git status
+ completion: add __git_get_option_value helper
+ completion: factor out untracked file modes into a variable
The completion script (in contrib/) learned to complete "git
status" options.
Will merge to 'master'.
* tr/doc-tt (2016-06-08) 4 commits
(merged to 'next' on 2016-06-22 at dc6df3b)
+ doc: change configuration variables format
+ doc: more consistency in environment variables format
+ doc: change environment variables format
+ doc: clearer rule about formatting literals
The documentation set has been updated so that literal commands,
configuration variables and environment variables are consistently
typeset in fixed-width font and bold in manpages.
Will merge to 'master'.
* vs/prompt-avoid-unset-variable (2016-06-06) 1 commit
(merged to 'next' on 2016-06-22 at 8bf21d3)
+ git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
The git-prompt scriptlet (in contrib/) was not friendly with those
who uses "set -u", which has been fixed.
Will merge to 'master'.
* rj/compat-regex-size-max-fix (2016-06-06) 1 commit
(merged to 'next' on 2016-06-22 at 376c5b1)
+ regex: fix a SIZE_MAX macro redefinition warning
A compilation fix.
Will merge to 'master'.
* et/add-chmod-x (2016-06-07) 1 commit
(merged to 'next' on 2016-06-22 at 71d65a0)
+ add: add --chmod=+x / --chmod=-x options
"git update-index --add --chmod=+x file" may be usable as an escape
hatch, but not a friendly thing to force for people who do need to
use it regularly. "git add --chmod=+x file" can be used instead.
Will merge to 'master'.
* mh/connect (2016-06-06) 10 commits
- connect: [host:port] is legacy for ssh
- connect: move ssh command line preparation to a separate function
- connect: actively reject git:// urls with a user part
- connect: change the --diag-url output to separate user and host
- connect: make parse_connect_url() return the user part of the url as a separate value
- connect: group CONNECT_DIAG_URL handling code
- connect: make parse_connect_url() return separated host and port
- connect: re-derive a host:port string from the separate host and port variables
- connect: call get_host_and_port() earlier
- connect: document why we sometimes call get_port after get_host_and_port
Rewrite Git-URL parsing routine (hopefully) without changing any
behaviour.
Will merge to 'next'???
* va/i18n-even-more (2016-06-17) 38 commits
- i18n: branch: mark comment when editing branch description for translation
- i18n: unmark die messages for translation
- i18n: submodule: escape shell variables inside eval_gettext
- i18n: submodule: join strings marked for translation
- i18n: init-db: join message pieces
- i18n: remote: allow translations to reorder message
- i18n: remote: mark URL fallback text for translation
- i18n: standardise messages
- i18n: sequencer: add period to error message
- i18n: merge: change command option help to lowercase
- i18n: merge: mark messages for translation
- i18n: notes: mark options for translation
- i18n: notes: mark strings for translation
- i18n: transport-helper.c: change N_() call to _()
- i18n: bisect: mark strings for translation
- t5523: use test_i18ngrep for negation
- t4153: fix negated test_i18ngrep call
- t9003: become resilient to GETTEXT_POISON
- tests: unpack-trees: update to use test_i18n* functions
- tests: use test_i18n* functions to suppress false positives
- i18n: setup: mark strings for translation
- i18n: rebase-interactive: mark comments of squash for translation
- i18n: rebase-interactive: mark here-doc strings for translation
- i18n: rebase-interactive: mark strings for translation
- i18n: git-sh-setup.sh: mark strings for translation
- t6030: update to use test_i18ncmp
- i18n: bisect: simplify error message for i18n
- i18n: rebase: mark placeholder for translation
- i18n: rebase: fix marked string to use eval_gettext variant
- merge-octopus: use die shell function from git-sh-setup.sh
- i18n: merge-octopus: mark messages for translation
- i18n: sequencer: mark string for translation
- i18n: sequencer: mark entire sentences for translation
- i18n: transport: mark strings for translation
- i18n: advice: internationalize message for conflicts
- i18n: advice: mark string about detached head for translation
- i18n: builtin/remote.c: fix mark for translation
- Merge branch 'jc/t2300-setup' into HEAD
More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
One patch from the original submission dropped due to conflicts
with jk/upload-pack-hook, which is still in flux.
Will merge to 'next'.
* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
- blame: require 0 context lines while finding moved lines with -M
"git blame -M" missed a single line that was moved within the file.
We may want to squash a test or two to this commit. Volunteers?
* nd/worktree-lock (2016-06-13) 6 commits
- worktree.c: find_worktree() search by path suffix
- worktree: add "unlock" command
- worktree: add "lock" command
- worktree.c: add is_worktree_locked()
- worktree.c: add is_main_worktree()
- worktree.c: add find_worktree()
(this branch uses nd/worktree-cleanup-post-head-protection.)
"git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location. "git worktree"
command learned a dedicated command pair to create and remoev such
a file, so that the users do not have to do this with editor.
Is everybody happy with this version?
If so, will merge to 'next'.
* jk/upload-pack-hook (2016-06-02) 7 commits
- upload-pack: provide a hook for running pack-objects
- t1308: do not get fooled by symbolic links to the source tree
- config: add a notion of "scope"
- config: return configset value for current_config_ functions
- config: set up config_source for command-line config
- git_config_parse_parameter: refactor cleanup code
- git_config_with_options: drop "found" counting
Allow a custom "git upload-pack" replacement to respond to
"fetch/clone" request.
Will merge to 'next'.
* sb/submodule-default-paths (2016-06-20) 5 commits
- completion: clone can recurse into submodules
- clone: add --init-submodule=<pathspec> switch
- submodule update: add `--init-default-path` switch
- Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
- Merge branch 'jc/attr' into sb/submodule-default-paths
(this branch uses jc/attr and sb/pathspec-label; is tangled with jc/attr-more.)
Allow specifying the set of submodules the user is interested in on
the command line of "git clone" that clones the superproject.
* 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.
Will merge to 'next'.
* jc/attr (2016-05-25) 18 commits
- attr: support quoting pathname patterns in C style
- attr: expose validity check for attribute names
- attr: add counted string version of git_attr()
- attr: add counted string version of git_check_attr()
- attr: retire git_check_attrs() API
- attr: convert git_check_attrs() callers to use the new API
- attr: convert git_all_attrs() to use "struct git_attr_check"
- attr: (re)introduce git_check_attr() and struct git_attr_check
- attr: rename function and struct related to checking attributes
- attr.c: plug small leak in parse_attr_line()
- attr.c: tighten constness around "git_attr" structure
- attr.c: simplify macroexpand_one()
- attr.c: mark where #if DEBUG ends more clearly
- attr.c: complete a sentence in a comment
- attr.c: explain the lack of attr-name syntax check in parse_attr()
- attr.c: update a stale comment on "struct match_attr"
- attr.c: use strchrnul() to scan for one line
- commit.c: use strchrnul() to scan for one line
(this branch is used by jc/attr-more, sb/pathspec-label and sb/submodule-default-paths.)
The attributes API has been updated so that it can later be
optimized using the knowledge of which attributes are queried.
I wanted to polish this topic further to make the attribute
subsystem thread-ready, but because other topics depend on this
topic and they do not (yet) need it to be thread-ready, let's merge
this early part together with the dependent topics to 'next', and
back-burner the threading enhancement to another day.
* cc/apply-introduce-state (2016-06-06) 50 commits
(merged to 'next' on 2016-06-20 at 4f205b8)
+ builtin/apply: remove misleading comment on lock_file field
+ builtin/apply: move 'newfd' global into 'struct apply_state'
+ builtin/apply: add 'lock_file' pointer into 'struct apply_state'
+ builtin/apply: move applying patches into apply_all_patches()
+ builtin/apply: move 'state' check into check_apply_state()
+ builtin/apply: move 'symlink_changes' global into 'struct apply_state'
+ builtin/apply: move 'fn_table' global into 'struct apply_state'
+ builtin/apply: move 'state_linenr' global into 'struct apply_state'
+ builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
+ builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
+ builtin/apply: move 'ws_error_action' into 'struct apply_state'
+ builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
+ builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
+ builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
+ builtin/apply: move 'whitespace_option' into 'struct apply_state'
+ builtin/apply: move 'whitespace_error' global into 'struct apply_state'
+ builtin/apply: move 'root' global into 'struct apply_state'
+ builtin/apply: move 'p_value_known' global into 'struct apply_state'
+ builtin/apply: move 'p_value' global into 'struct apply_state'
+ builtin/apply: move 'has_include' global into 'struct apply_state'
+ builtin/apply: move 'limit_by_name' global into 'struct apply_state'
+ builtin/apply: move 'patch_input_file' global into 'struct apply_state'
+ builtin/apply: move 'apply' global into 'struct apply_state'
+ builtin/apply: move 'p_context' global into 'struct apply_state'
+ builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
+ builtin/apply: move 'line_termination' global into 'struct apply_state'
+ builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
+ builtin/apply: move 'no_add' global into 'struct apply_state'
+ builtin/apply: move 'threeway' global into 'struct apply_state'
+ builtin/apply: move 'summary' global into 'struct apply_state'
+ builtin/apply: move 'numstat' global into 'struct apply_state'
+ builtin/apply: move 'diffstat' global into 'struct apply_state'
+ builtin/apply: move 'cached' global into 'struct apply_state'
+ builtin/apply: move 'allow_overlap' global into 'struct apply_state'
+ builtin/apply: move 'update_index' global into 'struct apply_state'
+ builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
+ builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
+ builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
+ builtin/apply: move 'check_index' global into 'struct apply_state'
+ builtin/apply: move 'check' global into 'struct apply_state'
+ builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
+ builtin/apply: move 'state' init into init_apply_state()
+ builtin/apply: introduce 'struct apply_state' to start libifying
+ builtin/apply: move 'read_stdin' global into cmd_apply()
+ builtin/apply: move 'options' variable into cmd_apply()
+ builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
+ builtin/apply: avoid local variable shadowing 'len' parameter
+ builtin/apply: avoid parameter shadowing 'linenr' global
+ builtin/apply: avoid parameter shadowing 'p_value' global
+ builtin/apply: make gitdiff_verify_name() return void
Originally merged to 'next' on 2016-06-06
The "git apply" standalone program is being libified; this is the
first step to move many state variables into a structure that can
be explicitly (re)initialized to make the machinery callable more
than once.
The next step that moves some remaining state variables into the
structure and turns die()s into an error return that propagates up
to the caller is not queued yet but in flight. It would be good to
review the above first and give the remainder of the series a solid
base to build on.
Will merge to 'master'.
* pb/bisect (2016-05-24) 3 commits
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Beginning of GSoC "git bisect" project.
I know another topic is getting rerolled many times on top of this;
are people happy with these three patches? If so, will merge to
'next'.
* sb/pathspec-label (2016-06-03) 6 commits
- pathspec: disable preload-index when attribute pathspec magic is in use
- pathspec: allow escaped query values
- pathspec: allow querying for attributes
- pathspec: move prefix check out of the inner loop
- pathspec: move long magic parsing out of prefix_pathspec
- Documentation: fix a typo
(this branch is used by sb/submodule-default-paths; uses jc/attr; is tangled with jc/attr-more.)
The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
to limit paths that match $pattern further by attribute settings.
The preload-index mechanism is disabled when the new pathspec magic
is in use (at least for now), because the attribute subsystem is
not thread-ready.
* 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.
Will merge to 'next'.
* mh/split-under-lock (2016-06-13) 33 commits
- lock_ref_sha1_basic(): only handle REF_NODEREF mode
- commit_ref_update(): remove the flags parameter
- lock_ref_for_update(): don't resolve symrefs
- lock_ref_for_update(): don't re-read non-symbolic references
- refs: resolve symbolic refs first
- ref_transaction_update(): check refname_is_safe() at a minimum
- unlock_ref(): move definition higher in the file
- lock_ref_for_update(): new function
- add_update(): initialize the whole ref_update
- verify_refname_available(): adjust constness in declaration
- refs: don't dereference on rename
- refs: allow log-only updates
- delete_branches(): use resolve_refdup()
- ref_transaction_commit(): correctly report close_ref() failure
- ref_transaction_create(): disallow recursive pruning
- refs: make error messages more consistent
- lock_ref_sha1_basic(): remove unneeded local variable
- read_raw_ref(): move docstring to header file
- read_raw_ref(): improve docstring
- read_raw_ref(): rename symref argument to referent
- read_raw_ref(): clear *type at start of function
- read_raw_ref(): rename flags argument to type
- ref_transaction_commit(): remove local variables n and updates
- rename_ref(): remove unneeded local variable
- commit_ref_update(): write error message to *err, not stderr
- refname_is_safe(): insist that the refname already be normalized
- refname_is_safe(): don't allow the empty string
- refname_is_safe(): use skip_prefix()
- remove_dir_recursively(): add docstring
- safe_create_leading_directories(): improve docstring
- read_raw_ref(): don't get confused by an empty directory
- commit_ref(): if there is an empty dir in the way, delete it
- t1404: demonstrate a bug resolving references
(this branch is used by mh/ref-iterators, mh/ref-store and mh/update-ref-errors.)
Further preparatory work on the refs API before the pluggable
backend series can land.
Replaced with a rerolled version.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Will merge to 'next'.
Perhaps people will enhance it more once it gains more visibility.
* kn/ref-filter-branch-list (2016-05-17) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Rerolled.
This also really needs review.
* dt/index-helper (2016-05-20) 20 commits
- index-helper: indexhelper.exitafter config
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: support watchman to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: log warnings
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- pkt-line: add gentle version of packet_write
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
A new "index-helper" daemon has been introduced to give newly
spawned Git process a quicker access to the data in the index, and
optionally interface with the watchman daemon to further reduce the
refresh cost.
Belated review comments still trickling in.
Will hold.
($gmane/295106).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
While I think it would make it easier for people to experiment and
build on if the topic is merged to 'next', I am at the same time a
bit reluctant to merge an unproven new topic that introduces a new
file format, which we may end up having to support til the end of
time. Comments?
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Jun 2016, #07; Mon, 20)
@ 2016-06-20 23:11 3% Junio C Hamano
0 siblings, 0 replies; 22+ results
From: Junio C Hamano @ 2016-06-20 23:11 UTC (permalink / raw
To: git
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.
The first batch for this cycle has been merged to 'master', the tip
of 'next' has been rewound and rebuilt, while a few topics are
temporarily ejected from 'next'.
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"]
* ah/no-verify-signature-with-pull-rebase (2016-05-20) 1 commit
(merged to 'next' on 2016-05-31 at 30add83)
+ pull: warn on --verify-signatures with --rebase
"git pull --rebase --verify-signature" learned to warn the user
that "--verify-signature" is a no-op when rebasing.
* aq/upload-pack-use-parse-options (2016-05-31) 1 commit
(merged to 'next' on 2016-06-06 at 505f1ee)
+ upload-pack.c: use parse-options API
"git upload-pack" command has been updated to use the parse-options
API.
* et/pretty-format-c-auto (2016-05-27) 1 commit
(merged to 'next' on 2016-05-31 at 1e9c920)
+ format_commit_message: honor `color=auto` for `%C(auto)`
The commands in `git log` family take %C(auto) in a custom format
string. This unconditionally turned the color on, ignoring
--no-color or with --color=auto when the output is not connected to
a tty; this was corrected to make the format truly behave as
"auto".
* ew/daemon-socket-keepalive (2016-05-25) 1 commit
(merged to 'next' on 2016-05-31 at c32acf1)
+ daemon: enable SO_KEEPALIVE for all sockets
When "git daemon" is run without --[init-]timeout specified, a
connection from a client that silently goes offline can hang around
for a long time, wasting resources. The socket-level KEEPALIVE has
been enabled to allow the OS to notice such failed connections.
* ew/fast-import-unpack-limit (2016-05-29) 2 commits
(merged to 'next' on 2016-05-29 at af32aba)
+ fast-import: invalidate pack_id references after loosening
(merged to 'next' on 2016-05-11 at ffd4efb)
+ fast-import: implement unpack limit
"git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
* jc/clear-pathspec (2016-06-02) 1 commit
(merged to 'next' on 2016-06-06 at 9e7e291)
+ pathspec: rename free_pathspec() to clear_pathspec()
We usually call a function that clears the contents a data
structure X without freeing the structure itself clear_X(), and
call a function that does clear_X() and also frees it free_X().
free_pathspec() function has been renamed to clear_pathspec()
to avoid confusion.
* jg/dash-is-last-branch-in-worktree-add (2016-05-31) 1 commit
(merged to 'next' on 2016-06-02 at 3959ef6)
+ worktree: allow "-" short-hand for @{-1} in add command
"git worktree add" learned that '-' can be used as a short-hand for
"@{-1}", the previous branch.
* jk/rev-list-count-with-bitmap (2016-06-03) 2 commits
(merged to 'next' on 2016-06-06 at dd9b30f)
+ rev-list: disable bitmaps when "-n" is used with listing objects
+ rev-list: "adjust" results of "--count --use-bitmap-index -n"
"git rev-list --count" whose walk-length is limited with "-n"
option did not work well with the counting optimized to look at the
bitmap index.
* rs/xdiff-hunk-with-func-line (2016-06-09) 9 commits
(merged to 'next' on 2016-06-10 at 9ff9ba8)
+ xdiff: fix merging of appended hunk with -W
(merged to 'next' on 2016-06-02 at 0c2e335)
+ grep: -W: don't extend context to trailing empty lines
+ t7810: add test for grep -W and trailing empty context lines
+ xdiff: don't trim common tail with -W
+ xdiff: -W: don't include common trailing empty lines in context
+ xdiff: ignore empty lines before added functions with -W
+ xdiff: handle appended chunks better with -W
+ xdiff: factor out match_func_rec()
+ t4051: rewrite, add more tests
"git show -W" (extend hunks to cover the entire function, delimited
by lines that match the "funcname" pattern) used to show the entire
file when a change added an entire function at the end of the file,
which has been fixed.
* sb/submodule-misc-cleanups (2016-05-25) 1 commit
(merged to 'next' on 2016-05-31 at 0d07b9c)
+ submodule update: make use of the existing fetch_in_submodule function
Minor simplification.
* sb/submodule-recommend-shallowness (2016-05-27) 2 commits
(merged to 'next' on 2016-05-31 at 1ee161c)
+ submodule update: learn `--[no-]recommend-shallow` option
+ submodule-config: keep shallow recommendation around
(this branch is used by sb/submodule-clone-retry.)
An upstream project can make a recommendation to shallowly clone
some submodules in the .gitmodules file it ships.
* wd/userdiff-css (2016-06-03) 1 commit
(merged to 'next' on 2016-06-06 at 536102f)
+ userdiff: add built-in pattern for CSS
Update the funcname definition to support css files.
--------------------------------------------------
[New Topics]
* em/newer-freebsd-shells-are-fine-with-returns (2016-06-17) 1 commit
- rebase: update comment about FreeBSD /bin/sh
Comments about misbehaving FreeBSD shells have been clarified with
the version number (9.x and before are broken, newer ones are OK).
Will merge to 'next'.
* mg/signature-doc (2016-06-17) 4 commits
- Documentation/technical: signed merge tag format
- Documentation/technical: signed commit format
- Documentation/technical: signed tag format
- Documentation/technical: describe signature formats
Formats of the various data (and how to validate them) where we use
GPG signature have been documented.
Will merge to 'next'.
* jk/string-list-static-init (2016-06-13) 2 commits
- use string_list initializer consistently
- Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init
(this branch uses jk/parseopt-string-list.)
Instead of taking advantage of a struct string_list that is
allocated with all NULs happens to be STRING_LIST_INIT_NODUP kind,
initialize them explicitly as such, to document their behaviour
better.
Will merge to 'next'.
* mh/ref-store (2016-06-20) 38 commits
- refs: implement iteration over only per-worktree refs
- refs: make lock generic
- refs: add method to rename refs
- refs: add methods to init refs db
- refs: make delete_refs() virtual
- refs: add method for initial ref transaction commit
- refs: add methods for reflog
- refs: add method iterator_begin
- files_ref_iterator_begin(): take a ref_store argument
- split_symref_update(): add a files_ref_store argument
- lock_ref_sha1_basic(): add a files_ref_store argument
- lock_ref_for_update(): add a files_ref_store argument
- commit_ref_update(): add a files_ref_store argument
- lock_raw_ref(): add a files_ref_store argument
- repack_without_refs(): add a files_ref_store argument
- refs: make peel_ref() virtual
- refs: make create_symref() virtual
- refs: make pack_refs() virtual
- refs: make verify_refname_available() virtual
- refs: make read_raw_ref() virtual
- resolve_gitlink_ref(): rename path parameter to submodule
- resolve_gitlink_ref(): avoid memory allocation in many cases
- resolve_gitlink_ref(): implement using resolve_ref_recursively()
- resolve_ref_recursively(): new function
- read_raw_ref(): take a (struct ref_store *) argument
- resolve_gitlink_packed_ref(): remove function
- resolve_packed_ref(): rename function from resolve_missing_loose_ref()
- refs: reorder definitions
- refs: add a transaction_commit() method
- {lock,commit,rollback}_packed_refs(): add files_ref_store arguments
- resolve_missing_loose_ref(): add a files_ref_store argument
- get_packed_ref(): add a files_ref_store argument
- add_packed_ref(): add a files_ref_store argument
- refs: create a base class "ref_store" for files_ref_store
- refs: add a backend method structure
- refs: rename struct ref_cache to files_ref_store
- rename_ref_available(): add docstring
- resolve_gitlink_ref(): eliminate temporary variable
(this branch uses mh/ref-iterators and mh/split-under-lock; is tangled with mh/update-ref-errors.)
The ref-store abstraction was introduced to the refs API so that we
can plug in different backends to store references.
Rebased on top of mh/split-under-lock.
* mh/update-ref-errors (2016-06-20) 6 commits
- lock_ref_for_update(): avoid a symref resolution
- lock_ref_for_update(): make error handling more uniform
- t1404: add more tests of update-ref error handling
- t1404: document function test_update_rejected
- t1404: remove "prefix" argument to test_update_rejected
- t1404: rename file to t1404-update-ref-errors.sh
(this branch uses mh/split-under-lock; is tangled with mh/ref-iterators and mh/ref-store.)
Error handling in the codepaths that updates refs has been
improved.
Rebased on top of mh/split-under-lock.
* jh/clean-smudge-annex (2016-06-17) 5 commits
- warn on unusable smudgeToFile/cleanFromFile config
- use smudgeToFile in git checkout etc
- use cleanFromFile in git add
- add smudgeToFile and cleanFromFile filter configs
- clarify %f documentation
The interface to "clean/smudge" filters require Git to feed the
whole contents via pipe, which is suboptimal for some
applications. "cleanFromFile/smudgeToFile" commands are the moral
equilvalents for these filters but they interact with the files on
the filesystem directly.
This unfortunately does not build when merged to 'pu', as there are
interactions with other topic(s).
* lc/shell-default-value-noexpand (2016-06-19) 1 commit
- sh-setup: enclose setting of ${VAR=default} in double-quotes
Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
to set the default value, without enclosing it in double quotes.
Will merge to 'next'.
* sb/clone-shallow-passthru (2016-06-20) 1 commit
- clone: do not let --depth imply --shallow-submodules
Fix an unintended regression in v2.9 that breaks "clone --depth"
that recurses down to submodules by forcing the submodules to also
be cloned shallowly, which many server instances that host upstream
of the submodules are not prepared for.
Will merge to 'next'.
* js/find-commit-subject-ignore-leading-blanks (2016-06-20) 1 commit
- commit: make find_commit_subject() more robust
* js/log-diff-to-non-stdout (2016-06-20) 8 commits
- SQUASH???
- format-patch: use stdout directly
- format-patch: avoid freopen()
- format-patch: explicitly switch off color when writing to files
- shortlog: support outputting to streams other than stdout
- graph: respect the diffopt.file setting
- line-log: respect diffopt's configured output file stream
- log-tree: respect diffopt's configured output file stream
The commands in the "log/diff" family had an optional FILE* pointer
in the data structure they pass around for a long time, but some
codepaths used to always write to the standard output. As a
preparatory step to make "git format-patch" available to the
internal callers, these codepaths have been updated to consistently
write into that FILE* instead.
* js/mingw-parameter-less-c-functions (2016-06-20) 1 commit
- mingw: let the build succeed with DEVELOPER=1
Some platform-specific code had non-ANSI strict declarations of C
functions that do not take any parameters, which has been
corrected.
Will merge to 'next'.
* bc/cocci (2016-06-20) 8 commits
- merge-recursive: convert merge_recursive_generic to object_id
- merge-recursive: convert leaf functions to use struct object_id
- merge-recursive: convert struct merge_file_info to object_id
- merge-recursive: convert struct stage_data to use object_id
- diff: rename struct diff_filespec's sha1_valid member
- diff: convert struct diff_filespec to struct object_id
- coccinelle: apply object_id Coccinelle transformations
- contrib/coccinelle: add basic Coccinelle transforms
Conversion from unsigned char sha1[20] to struct object_id
continues.
* jk/tzoffset-fix (2016-06-20) 3 commits
- local_tzoffset: detect errors from tm_to_time_t
- t0006: test various date formats
- t0006: rename test-date's "show" to "relative"
The internal code used to show local timezone offset is not
prepared to handle timestamps beyond year 2100, and gave a
bogus offset value to the caller. Use a more benign looking
+0000 instead and let "git log" going in such a case, instead
of aborting.
--------------------------------------------------
[Stalled]
* mj/log-show-signature-conf (2016-06-06) 2 commits
- log: "--no-show-signature" commmand-line option
- log: add "log.showsignature" configuration variable
"git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
The order of the commits in the topic need to be reversed.
Expecting a reroll.
* 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 arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* sg/completion-updates (2016-02-28) 21 commits
. completion: cache the path to the repository
. completion: extract repository discovery from __gitdir()
. completion: don't guard git executions with __gitdir()
. completion: consolidate silencing errors from git commands
. completion: don't use __gitdir() for git commands
. completion: respect 'git -C <path>'
. completion: fix completion after 'git -C <path>'
. completion: don't offer commands when 'git --opt' needs an argument
. rev-parse: add '--absolute-git-dir' option
. completion: list short refs from a remote given as a URL
. completion: don't list 'HEAD' when trying refs completion outside of a repo
. completion: list refs from remote when remote's name matches a directory
. completion: respect 'git --git-dir=<path>' when listing remote refs
. completion: fix most spots not respecting 'git --git-dir=<path>'
. completion: ensure that the repository path given on the command line exists
. completion tests: add tests for the __git_refs() helper function
. completion tests: check __gitdir()'s output in the error cases
. completion tests: consolidate getting path of current working directory
. completion tests: make the $cur variable local to the test helper functions
. completion tests: don't add test cruft to the test repository
. completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
What it attempts to achieve is worthwhile, I would think, but
it seems to be broken, unfortunately.
($gmane/286137, 297593, 297605).
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* ap/git-svn-propset-doc (2016-06-15) 1 commit
- git-svn: document the 'git svn propset' command
"git svn propset" subcommand that was added in 2.3 days is
documented now.
Will merge to 'next'.
* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit
- add--interactive: respect diff.compactionHeuristic
"git add -i/-p" learned to honor diff.compactionHeuristic
experimental knob, so that the user can work on the same hunk split
as "git diff" output.
Will merge to 'next'.
* jk/big-and-future-archive-tar (2016-06-17) 2 commits
- archive-tar: write extended headers for far-future mtime
- archive-tar: write extended headers for file sizes >= 8GB
"git archive" learned to handle files that are larger than 8GB and
commits far in the future than expressible by the traditional US-TAR
format.
Will merge to 'next'.
* jk/gpg-interface-cleanup (2016-06-17) 7 commits
- gpg-interface: check gpg signature creation status
- sign_buffer: use pipe_command
- verify_signed_buffer: use pipe_command
- run-command: add pipe_command helper
- verify_signed_buffer: use tempfile object
- verify_signed_buffer: drop pbuf variable
- gpg-interface: use child_process.args
A new run-command API function pipe_command() is introduced to
sanely feed data to the standard input while capturing data from
the standard output and the standard error of an external process,
which is cumbersome to hand-roll correctly without deadlocking.
The codepath to sign data in a prepared buffer with GPG has been
updated to use this API to read from the status-fd to check for
errors (instead of relying on GPG's exit status).
Will merge to 'next'.
* lf/sideband-returns-void (2016-06-16) 2 commits
- upload-pack.c: make send_client_data() return void
- sideband.c: make send_sideband() return void
A small internal API cleanup.
Will merge to 'next'.
* nd/graph-width-padded (2016-06-16) 2 commits
- pretty.c: support <direction>|(<negative number>) forms
- pretty: pass graph width to pretty formatting for use in '%>|(N)'
"log --graph --format=" learned that "%>|(N)" specifies the width
relative to the terminal's left edge, not relative to the area to
draw text that is to the right of the ancestry-graph section. It
also now accepts negative N that means the column limit is relative
to the right border.
Will merge to 'next'.
* dn/gpg-doc (2016-06-16) 1 commit
- Documentation: GPG capitalization
The documentation tries to consistently spell "GPG"; when
referring to the specific program name, "gpg" is used.
Will merge to 'next'.
* jk/bisect-show-tree (2016-06-16) 1 commit
- bisect: always call setup_revisions after init_revisions
"git bisect" makes an internal call to "git diff-tree" when
bisection finds the culprit, but this call did not initialize the
data structure to pass to the diff-tree API correctly.
Will merge to 'next'.
* 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
"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.
Will merge to 'next'.
* jc/blame-reverse (2016-06-14) 2 commits
- blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."
- blame: improve diagnosis for "--reverse NEW"
It is a common mistake to say "git blame --reverse OLD path",
expecting that the command line is dwimmed as if asking how lines
in path in an old revision OLD have survived up to the current
commit.
Any supporters? Otherwise will drop.
* 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'.
* nd/shallow-deepen (2016-06-13) 27 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: make check_non_tip() clean things up on error
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Rerolled.
Needs review. What this topic attempts to achieve is worthwhile, I
would think.
* jk/avoid-unbounded-alloca (2016-06-07) 1 commit
- tree-diff: avoid alloca for large allocations
Will merge to 'next'.
* jk/send-pack-stdio (2016-06-10) 2 commits
- write_or_die: remove the unused write_or_whine() function
- send-pack: use buffered I/O to talk to pack-objects
Code clean-up.
Will merge to 'next'.
* pb/commit-editmsg-path (2016-06-09) 1 commit
- builtin/commit.c: memoize git-path for COMMIT_EDITMSG
Code clean-up.
Will merge to 'next'.
* jc/attr-more (2016-06-09) 8 commits
- attr.c: outline the future plans by heavily commenting
- attr.c: always pass check[] to collect_some_attrs()
- attr.c: introduce empty_attr_check_elems()
- attr.c: correct ugly hack for git_all_attrs()
- attr.c: rename a local variable check
- fixup! d5ad6c13
- attr.c: pass struct git_attr_check down the callchain
- attr.c: add push_stack() helper
(this branch uses jc/attr; is tangled with sb/pathspec-label and sb/submodule-default-paths.)
The beginning of long and tortuous journey to clean-up attribute
subsystem implementation.
Needs to be redone.
* mh/ref-iterators (2016-06-20) 13 commits
- for_each_reflog(): reimplement using iterators
- dir_iterator: new API for iterating over a directory tree
- for_each_reflog(): don't abort for bad references
- do_for_each_ref(): reimplement using reference iteration
- refs: introduce an iterator interface
- ref_resolves_to_object(): new function
- entry_resolves_to_object(): rename function from ref_resolves_to_object()
- get_ref_cache(): only create an instance if there is a submodule
- remote rm: handle symbolic refs correctly
- delete_refs(): add a flags argument
- refs: use name "prefix" consistently
- do_for_each_ref(): move docstring to the header file
- refs: remove unnecessary "extern" keywords
(this branch is used by mh/ref-store; uses mh/split-under-lock; is tangled with mh/update-ref-errors.)
The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
Rebased on top of mh/split-under-lock.
* ew/mboxrd-format-am (2016-06-06) 3 commits
- am: support --patch-format=mboxrd
- mailsplit: support unescaping mboxrd messages
- pretty: support "mboxrd" output format
Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
Will merge to 'next'.
* lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit
- receive-pack: send auto-gc output over sideband 2
Allow messages that are generated by auto gc during "git push" on
the receiving end to be explicitly passed back to the sending end
over sideband, so that they are shown with "remote: " prefix to
avoid confusing the users.
Will merge to 'next'.
* mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit
- cherry-pick: allow to pick to unborn branches
"git cherry-pick A" worked on an unborn branch, but "git
cherry-pick A..B" didn't.
Will merge to 'next'.
* sg/reflog-past-root (2016-06-06) 1 commit
- reflog: continue walking the reflog past root commits
"git reflog" stopped upon seeing an entry that denotes a branch
creation event (aka "unborn"), which made it appear as if the
reflog was truncated.
Will merge to 'next'.
* tb/complete-status (2016-06-10) 3 commits
- completion: add git status
- completion: add __git_get_option_value helper
- completion: factor out untracked file modes into a variable
The completion script (in contrib/) learned to complete "git
status" options.
Any further comments? Otherwise will merge to 'next'.
* tr/doc-tt (2016-06-08) 4 commits
- doc: change configuration variables format
- doc: more consistency in environment variables format
- doc: change environment variables format
- doc: clearer rule about formatting literals
The documentation set has been updated so that literal commands,
configuration variables and environment variables are consistently
typeset in fixed-width font and bold in manpages.
Will merge to 'next'.
* vs/prompt-avoid-unset-variable (2016-06-06) 1 commit
- git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
The git-prompt scriptlet (in contrib/) was not friendly with those
who uses "set -u", which has been fixed.
Will merge to 'next'.
* rj/compat-regex-size-max-fix (2016-06-06) 1 commit
- regex: fix a SIZE_MAX macro redefinition warning
A compilation fix.
Will merge to 'next'.
* et/add-chmod-x (2016-06-07) 1 commit
- add: add --chmod=+x / --chmod=-x options
"git update-index --add --chmod=+x file" may be usable as an escape
hatch, but not a friendly thing to force for people who do need to
use it regularly. "git add --chmod=+x file" can be used instead.
Will merge to 'next'.
* mh/connect (2016-06-06) 10 commits
- connect: [host:port] is legacy for ssh
- connect: move ssh command line preparation to a separate function
- connect: actively reject git:// urls with a user part
- connect: change the --diag-url output to separate user and host
- connect: make parse_connect_url() return the user part of the url as a separate value
- connect: group CONNECT_DIAG_URL handling code
- connect: make parse_connect_url() return separated host and port
- connect: re-derive a host:port string from the separate host and port variables
- connect: call get_host_and_port() earlier
- connect: document why we sometimes call get_port after get_host_and_port
Rewrite Git-URL parsing routine (hopefully) without changing any
behaviour.
Will merge to 'next'???
* tb/convert-peek-in-index (2016-06-07) 3 commits
- correct ce_compare_data() in a middle of a merge
- read-cache: factor out get_sha1_from_index() helper
- convert: unify the "auto" handling of CRLF
Needs review.
* va/i18n-even-more (2016-06-17) 38 commits
- i18n: branch: mark comment when editing branch description for translation
- i18n: unmark die messages for translation
- i18n: submodule: escape shell variables inside eval_gettext
- i18n: submodule: join strings marked for translation
- i18n: init-db: join message pieces
- i18n: remote: allow translations to reorder message
- i18n: remote: mark URL fallback text for translation
- i18n: standardise messages
- i18n: sequencer: add period to error message
- i18n: merge: change command option help to lowercase
- i18n: merge: mark messages for translation
- i18n: notes: mark options for translation
- i18n: notes: mark strings for translation
- i18n: transport-helper.c: change N_() call to _()
- i18n: bisect: mark strings for translation
- t5523: use test_i18ngrep for negation
- t4153: fix negated test_i18ngrep call
- t9003: become resilient to GETTEXT_POISON
- tests: unpack-trees: update to use test_i18n* functions
- tests: use test_i18n* functions to suppress false positives
- i18n: setup: mark strings for translation
- i18n: rebase-interactive: mark comments of squash for translation
- i18n: rebase-interactive: mark here-doc strings for translation
- i18n: rebase-interactive: mark strings for translation
- i18n: git-sh-setup.sh: mark strings for translation
- t6030: update to use test_i18ncmp
- i18n: bisect: simplify error message for i18n
- i18n: rebase: mark placeholder for translation
- i18n: rebase: fix marked string to use eval_gettext variant
- merge-octopus: use die shell function from git-sh-setup.sh
- i18n: merge-octopus: mark messages for translation
- i18n: sequencer: mark string for translation
- i18n: sequencer: mark entire sentences for translation
- i18n: transport: mark strings for translation
- i18n: advice: internationalize message for conflicts
- i18n: advice: mark string about detached head for translation
- i18n: builtin/remote.c: fix mark for translation
- Merge branch 'jc/t2300-setup' into HEAD
More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
One patch from the original submission dropped due to conflicts
with jk/upload-pack-hook, which is still in flux.
Will merge to 'next'.
* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
- blame: require 0 context lines while finding moved lines with -M
"git blame -M" missed a single line that was moved within the file.
We may want to squash a test or two to this commit. Volunteers?
* nd/worktree-lock (2016-06-13) 6 commits
- worktree.c: find_worktree() search by path suffix
- worktree: add "unlock" command
- worktree: add "lock" command
- worktree.c: add is_worktree_locked()
- worktree.c: add is_main_worktree()
- worktree.c: add find_worktree()
(this branch uses nd/worktree-cleanup-post-head-protection.)
"git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location. "git worktree"
command learned a dedicated command pair to create and remoev such
a file, so that the users do not have to do this with editor.
Is everybody happy with this version?
If so, will merge to 'next'.
* jk/upload-pack-hook (2016-06-02) 7 commits
- upload-pack: provide a hook for running pack-objects
- t1308: do not get fooled by symbolic links to the source tree
- config: add a notion of "scope"
- config: return configset value for current_config_ functions
- config: set up config_source for command-line config
- git_config_parse_parameter: refactor cleanup code
- git_config_with_options: drop "found" counting
Allow a custom "git upload-pack" replacement to respond to
"fetch/clone" request.
Will merge to 'next'.
* sb/submodule-default-paths (2016-06-20) 5 commits
- completion: clone can recurse into submodules
- clone: add --init-submodule=<pathspec> switch
- submodule update: add `--init-default-path` switch
- Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
- Merge branch 'jc/attr' into sb/submodule-default-paths
(this branch uses jc/attr and sb/pathspec-label; is tangled with jc/attr-more.)
Allow specifying the set of submodules the user is interested in on
the command line of "git clone" that clones the superproject.
* 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.
Will merge to 'next'.
* jc/attr (2016-05-25) 18 commits
- attr: support quoting pathname patterns in C style
- attr: expose validity check for attribute names
- attr: add counted string version of git_attr()
- attr: add counted string version of git_check_attr()
- attr: retire git_check_attrs() API
- attr: convert git_check_attrs() callers to use the new API
- attr: convert git_all_attrs() to use "struct git_attr_check"
- attr: (re)introduce git_check_attr() and struct git_attr_check
- attr: rename function and struct related to checking attributes
- attr.c: plug small leak in parse_attr_line()
- attr.c: tighten constness around "git_attr" structure
- attr.c: simplify macroexpand_one()
- attr.c: mark where #if DEBUG ends more clearly
- attr.c: complete a sentence in a comment
- attr.c: explain the lack of attr-name syntax check in parse_attr()
- attr.c: update a stale comment on "struct match_attr"
- attr.c: use strchrnul() to scan for one line
- commit.c: use strchrnul() to scan for one line
(this branch is used by jc/attr-more, sb/pathspec-label and sb/submodule-default-paths.)
The attributes API has been updated so that it can later be
optimized using the knowledge of which attributes are queried.
I wanted to polish this topic further to make the attribute
subsystem thread-ready, but because other topics depend on this
topic and they do not (yet) need it to be thread-ready, let's merge
this early part together with the dependent topics to 'next', and
back-burner the threading enhancement to another day.
* cc/apply-introduce-state (2016-06-06) 50 commits
(merged to 'next' on 2016-06-20 at 4f205b8)
+ builtin/apply: remove misleading comment on lock_file field
+ builtin/apply: move 'newfd' global into 'struct apply_state'
+ builtin/apply: add 'lock_file' pointer into 'struct apply_state'
+ builtin/apply: move applying patches into apply_all_patches()
+ builtin/apply: move 'state' check into check_apply_state()
+ builtin/apply: move 'symlink_changes' global into 'struct apply_state'
+ builtin/apply: move 'fn_table' global into 'struct apply_state'
+ builtin/apply: move 'state_linenr' global into 'struct apply_state'
+ builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
+ builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
+ builtin/apply: move 'ws_error_action' into 'struct apply_state'
+ builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
+ builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
+ builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
+ builtin/apply: move 'whitespace_option' into 'struct apply_state'
+ builtin/apply: move 'whitespace_error' global into 'struct apply_state'
+ builtin/apply: move 'root' global into 'struct apply_state'
+ builtin/apply: move 'p_value_known' global into 'struct apply_state'
+ builtin/apply: move 'p_value' global into 'struct apply_state'
+ builtin/apply: move 'has_include' global into 'struct apply_state'
+ builtin/apply: move 'limit_by_name' global into 'struct apply_state'
+ builtin/apply: move 'patch_input_file' global into 'struct apply_state'
+ builtin/apply: move 'apply' global into 'struct apply_state'
+ builtin/apply: move 'p_context' global into 'struct apply_state'
+ builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
+ builtin/apply: move 'line_termination' global into 'struct apply_state'
+ builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
+ builtin/apply: move 'no_add' global into 'struct apply_state'
+ builtin/apply: move 'threeway' global into 'struct apply_state'
+ builtin/apply: move 'summary' global into 'struct apply_state'
+ builtin/apply: move 'numstat' global into 'struct apply_state'
+ builtin/apply: move 'diffstat' global into 'struct apply_state'
+ builtin/apply: move 'cached' global into 'struct apply_state'
+ builtin/apply: move 'allow_overlap' global into 'struct apply_state'
+ builtin/apply: move 'update_index' global into 'struct apply_state'
+ builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
+ builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
+ builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
+ builtin/apply: move 'check_index' global into 'struct apply_state'
+ builtin/apply: move 'check' global into 'struct apply_state'
+ builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
+ builtin/apply: move 'state' init into init_apply_state()
+ builtin/apply: introduce 'struct apply_state' to start libifying
+ builtin/apply: move 'read_stdin' global into cmd_apply()
+ builtin/apply: move 'options' variable into cmd_apply()
+ builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
+ builtin/apply: avoid local variable shadowing 'len' parameter
+ builtin/apply: avoid parameter shadowing 'linenr' global
+ builtin/apply: avoid parameter shadowing 'p_value' global
+ builtin/apply: make gitdiff_verify_name() return void
Originally merged to 'next' on 2016-06-06
The "git apply" standalone program is being libified; this is the
first step to move many state variables into a structure that can
be explicitly (re)initialized to make the machinery callable more
than once.
The next step that moves some remaining state variables into the
structure and turns die()s into an error return that propagates up
to the caller is not queued yet but in flight. It would be good to
review the above first and give the remainder of the series a solid
base to build on.
Will merge to 'master'.
* pb/bisect (2016-05-24) 3 commits
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Beginning of GSoC "git bisect" project.
I know another topic is getting rerolled many times on top of this;
are people happy with these three patches? If so, will merge to
'next'.
* sb/pathspec-label (2016-06-03) 6 commits
- pathspec: disable preload-index when attribute pathspec magic is in use
- pathspec: allow escaped query values
- pathspec: allow querying for attributes
- pathspec: move prefix check out of the inner loop
- pathspec: move long magic parsing out of prefix_pathspec
- Documentation: fix a typo
(this branch is used by sb/submodule-default-paths; uses jc/attr; is tangled with jc/attr-more.)
The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
to limit paths that match $pattern further by attribute settings.
The preload-index mechanism is disabled when the new pathspec magic
is in use (at least for now), because the attribute subsystem is
not thread-ready.
* 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.
Will merge to 'next'.
* mh/split-under-lock (2016-06-13) 33 commits
- lock_ref_sha1_basic(): only handle REF_NODEREF mode
- commit_ref_update(): remove the flags parameter
- lock_ref_for_update(): don't resolve symrefs
- lock_ref_for_update(): don't re-read non-symbolic references
- refs: resolve symbolic refs first
- ref_transaction_update(): check refname_is_safe() at a minimum
- unlock_ref(): move definition higher in the file
- lock_ref_for_update(): new function
- add_update(): initialize the whole ref_update
- verify_refname_available(): adjust constness in declaration
- refs: don't dereference on rename
- refs: allow log-only updates
- delete_branches(): use resolve_refdup()
- ref_transaction_commit(): correctly report close_ref() failure
- ref_transaction_create(): disallow recursive pruning
- refs: make error messages more consistent
- lock_ref_sha1_basic(): remove unneeded local variable
- read_raw_ref(): move docstring to header file
- read_raw_ref(): improve docstring
- read_raw_ref(): rename symref argument to referent
- read_raw_ref(): clear *type at start of function
- read_raw_ref(): rename flags argument to type
- ref_transaction_commit(): remove local variables n and updates
- rename_ref(): remove unneeded local variable
- commit_ref_update(): write error message to *err, not stderr
- refname_is_safe(): insist that the refname already be normalized
- refname_is_safe(): don't allow the empty string
- refname_is_safe(): use skip_prefix()
- remove_dir_recursively(): add docstring
- safe_create_leading_directories(): improve docstring
- read_raw_ref(): don't get confused by an empty directory
- commit_ref(): if there is an empty dir in the way, delete it
- t1404: demonstrate a bug resolving references
(this branch is used by mh/ref-iterators, mh/ref-store and mh/update-ref-errors.)
Further preparatory work on the refs API before the pluggable
backend series can land.
Replaced with a rerolled version.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Will merge to 'next'.
Perhaps people will enhance it more once it gains more visibility.
* kn/ref-filter-branch-list (2016-05-17) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Rerolled.
This also really needs review.
* dt/index-helper (2016-05-20) 20 commits
- index-helper: indexhelper.exitafter config
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: support watchman to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: log warnings
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- pkt-line: add gentle version of packet_write
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
A new "index-helper" daemon has been introduced to give newly
spawned Git process a quicker access to the data in the index, and
optionally interface with the watchman daemon to further reduce the
refresh cost.
Belated review comments still trickling in.
Will hold.
($gmane/295106).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
While I think it would make it easier for people to experiment and
build on if the topic is merged to 'next', I am at the same time a
bit reluctant to merge an unproven new topic that introduces a new
file format, which we may end up having to support til the end of
time. Comments?
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Jun 2016, #06; Sun, 19)
@ 2016-06-19 22:46 3% Junio C Hamano
0 siblings, 0 replies; 22+ results
From: Junio C Hamano @ 2016-06-19 22:46 UTC (permalink / raw
To: git
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.
The tip of 'next' will be rewound and rebuilt, soon after the topics
that have been cooking graduates to 'master', which in turn will
happen RSN.
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
--------------------------------------------------
[New Topics]
* em/newer-freebsd-shells-are-fine-with-returns (2016-06-17) 1 commit
- rebase: update comment about FreeBSD /bin/sh
Comments about misbehaving FreeBSD shells have been clarified with
the version number (9.x and before are broken, newer ones are OK).
Will merge to 'next'.
* mg/signature-doc (2016-06-17) 4 commits
- Documentation/technical: signed merge tag format
- Documentation/technical: signed commit format
- Documentation/technical: signed tag format
- Documentation/technical: describe signature formats
Formats of the various data (and how to validate them) where we use
GPG signature have been documented.
* jk/string-list-static-init (2016-06-13) 2 commits
- use string_list initializer consistently
- Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init
(this branch uses jk/parseopt-string-list.)
Instead of taking advantage of a struct string_list that is
allocated with all NULs happens to be STRING_LIST_INIT_NODUP kind,
initialize them explicitly as such, to document their behaviour
better.
Will merge to 'next'.
* mh/ref-store (2016-06-07) 38 commits
- refs: implement iteration over only per-worktree refs
- refs: make lock generic
- refs: add method to rename refs
- refs: add methods to init refs db
- refs: add method for delete_refs
- refs: add method for initial ref transaction commit
- refs: add methods for reflog
- refs: add method iterator_begin
- files_ref_iterator_begin(): take a ref_store argument
- split_symref_update(): add a files_ref_store argument
- lock_ref_sha1_basic(): add a files_ref_store argument
- lock_ref_for_update(): add a files_ref_store argument
- commit_ref_update(): add a files_ref_store argument
- lock_raw_ref(): add a files_ref_store argument
- repack_without_refs(): add a files_ref_store argument
- refs: make peel_ref() virtual
- refs: make create_symref() virtual
- refs: make pack_refs() virtual
- refs: make verify_refname_available() virtual
- refs: make read_raw_ref() virtual
- resolve_gitlink_ref(): rename path parameter to submodule
- resolve_gitlink_ref(): avoid memory allocation in many cases
- resolve_gitlink_ref(): implement using resolve_ref_recursively()
- resolve_ref_recursively(): new function
- read_raw_ref(): take a (struct ref_store *) argument
- resolve_gitlink_packed_ref(): remove function
- resolve_packed_ref(): rename function from resolve_missing_loose_ref()
- refs: reorder definitions
- refs: add a transaction_commit() method
- {lock,commit,rollback}_packed_refs(): add files_ref_store arguments
- resolve_missing_loose_ref(): add a files_ref_store argument
- get_packed_ref(): add a files_ref_store argument
- add_packed_ref(): add a files_ref_store argument
- refs: create a base class "ref_store" for files_ref_store
- refs: add a backend method structure
- refs: rename struct ref_cache to files_ref_store
- rename_ref_available(): add docstring
- resolve_gitlink_ref(): eliminate temporary variable
(this branch uses mh/ref-iterators and mh/split-under-lock; is tangled with mh/update-ref-errors.)
As mh/split-under-lock will be replaced, this needs to be rebuilt
on top.
* mh/update-ref-errors (2016-06-10) 6 commits
- lock_ref_for_update(): avoid a symref resolution
- lock_ref_for_update(): make error handling more uniform
- t1404: add more tests of update-ref error handling
- t1404: document function test_update_rejected
- t1404: remove "prefix" argument to test_update_rejected
- t1404: rename file to t1404-update-ref-errors.sh
(this branch uses mh/split-under-lock; is tangled with mh/ref-iterators and mh/ref-store.)
As mh/split-under-lock will be replaced, this needs to be rebuilt
on top.
* jh/clean-smudge-annex (2016-06-17) 5 commits
- warn on unusable smudgeToFile/cleanFromFile config
- use smudgeToFile in git checkout etc
- use cleanFromFile in git add
- add smudgeToFile and cleanFromFile filter configs
- clarify %f documentation
The interface to "clean/smudge" filters require Git to feed the
whole contents via pipe, which is suboptimal for some
applications. "cleanFromFile/smudgeToFile" commands are the moral
equilvalents for these filters but they interact with the files on
the filesystem directly.
This unfortunately does not build when merged to 'pu', as there are
interactions with other topic(s).
* lc/shell-default-value-noexpand (2016-06-19) 1 commit
- sh-setup: enclose setting of ${VAR=default} in double-quotes
Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
to set the default value, without enclosing it in double quotes.
Will merge to 'next'.
* sb/clone-shallow-passthru (2016-06-19) 1 commit
- clone: do not let --depth imply --shallow-submodules
Fix an unintended regression in v2.9 that breaks "clone --depth"
that recurses down to submodules by forcing the submodules to also
be cloned shallowly, which many server instances that host upstream
of the submodules are not prepared for.
--------------------------------------------------
[Stalled]
* mj/log-show-signature-conf (2016-06-06) 2 commits
- log: "--no-show-signature" commmand-line option
- log: add "log.showsignature" configuration variable
"git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
The order of the commits in the topic need to be reversed.
Expecting a reroll.
* 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 arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* sg/completion-updates (2016-02-28) 21 commits
. completion: cache the path to the repository
. completion: extract repository discovery from __gitdir()
. completion: don't guard git executions with __gitdir()
. completion: consolidate silencing errors from git commands
. completion: don't use __gitdir() for git commands
. completion: respect 'git -C <path>'
. completion: fix completion after 'git -C <path>'
. completion: don't offer commands when 'git --opt' needs an argument
. rev-parse: add '--absolute-git-dir' option
. completion: list short refs from a remote given as a URL
. completion: don't list 'HEAD' when trying refs completion outside of a repo
. completion: list refs from remote when remote's name matches a directory
. completion: respect 'git --git-dir=<path>' when listing remote refs
. completion: fix most spots not respecting 'git --git-dir=<path>'
. completion: ensure that the repository path given on the command line exists
. completion tests: add tests for the __git_refs() helper function
. completion tests: check __gitdir()'s output in the error cases
. completion tests: consolidate getting path of current working directory
. completion tests: make the $cur variable local to the test helper functions
. completion tests: don't add test cruft to the test repository
. completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
What it attempts to achieve is worthwhile, I would think, but
it seems to be broken, unfortunately.
($gmane/286137, 297593, 297605).
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* ap/git-svn-propset-doc (2016-06-15) 1 commit
- git-svn: document the 'git svn propset' command
"git svn propset" subcommand that was added in 2.3 days is
documented now.
Will merge to 'next'.
* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit
- add--interactive: respect diff.compactionHeuristic
"git add -i/-p" learned to honor diff.compactionHeuristic
experimental knob, so that the user can work on the same hunk split
as "git diff" output.
Will merge to 'next'.
* jk/big-and-future-archive-tar (2016-06-17) 2 commits
- archive-tar: write extended headers for far-future mtime
- archive-tar: write extended headers for file sizes >= 8GB
"git archive" learned to handle files that are larger than 8GB and
commits far in the future than expressible by the traditional US-TAR
format.
Will merge to 'next'.
* jk/gpg-interface-cleanup (2016-06-17) 7 commits
- gpg-interface: check gpg signature creation status
- sign_buffer: use pipe_command
- verify_signed_buffer: use pipe_command
- run-command: add pipe_command helper
- verify_signed_buffer: use tempfile object
- verify_signed_buffer: drop pbuf variable
- gpg-interface: use child_process.args
A new run-command API function pipe_command() is introduced to
sanely feed data to the standard input while capturing data from
the standard output and the standard error of an external process,
which is cumbersome to hand-roll correctly without deadlocking.
The codepath to sign data in a prepared buffer with GPG has been
updated to use this API to read from the status-fd to check for
errors (instead of relying on GPG's exit status).
Will merge to 'next'.
* lf/sideband-returns-void (2016-06-16) 2 commits
- upload-pack.c: make send_client_data() return void
- sideband.c: make send_sideband() return void
A small internal API cleanup.
Will merge to 'next'.
* nd/graph-width-padded (2016-06-16) 2 commits
- pretty.c: support <direction>|(<negative number>) forms
- pretty: pass graph width to pretty formatting for use in '%>|(N)'
"log --graph --format=" learned that "%>|(N)" specifies the width
relative to the terminal's left edge, not relative to the area to
draw text that is to the right of the ancestry-graph section. It
also now accepts negative N that means the column limit is relative
to the right border.
Will merge to 'next'.
* dn/gpg-doc (2016-06-16) 1 commit
- Documentation: GPG capitalization
The documentation tries to consistently spell "GPG"; when
referring to the specific program name, "gpg" is used.
Will merge to 'next'.
* jk/bisect-show-tree (2016-06-16) 1 commit
- bisect: always call setup_revisions after init_revisions
"git bisect" makes an internal call to "git diff-tree" when
bisection finds the culprit, but this call did not initialize the
data structure to pass to the diff-tree API correctly.
Will merge to 'next'.
* 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.
Will merge to 'next'.
* jc/blame-reverse (2016-06-14) 2 commits
- blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."
- blame: improve diagnosis for "--reverse NEW"
It is a common mistake to say "git blame --reverse OLD path",
expecting that the command line is dwimmed as if asking how lines
in path in an old revision OLD have survived up to the current
commit.
Any supporters? Otherwise will drop.
* 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'.
* nd/shallow-deepen (2016-06-13) 27 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: make check_non_tip() clean things up on error
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Rerolled.
Needs review. What this topic attempts to achieve is worthwhile, I
would think.
* jk/avoid-unbounded-alloca (2016-06-07) 1 commit
- tree-diff: avoid alloca for large allocations
Will merge to 'next'.
* jk/send-pack-stdio (2016-06-10) 2 commits
- write_or_die: remove the unused write_or_whine() function
- send-pack: use buffered I/O to talk to pack-objects
Code clean-up.
Will merge to 'next'.
* pb/commit-editmsg-path (2016-06-09) 1 commit
- builtin/commit.c: memoize git-path for COMMIT_EDITMSG
Code clean-up.
Will merge to 'next'.
* wd/userdiff-css (2016-06-03) 1 commit
(merged to 'next' on 2016-06-06 at 536102f)
+ userdiff: add built-in pattern for CSS
Originally merged to 'next' on 2016-06-06
Update the funcname definition to support css files.
Will merge to 'master'.
* jc/attr-more (2016-06-09) 8 commits
- attr.c: outline the future plans by heavily commenting
- attr.c: always pass check[] to collect_some_attrs()
- attr.c: introduce empty_attr_check_elems()
- attr.c: correct ugly hack for git_all_attrs()
- attr.c: rename a local variable check
- fixup! d5ad6c13
- attr.c: pass struct git_attr_check down the callchain
- attr.c: add push_stack() helper
(this branch uses jc/attr; is tangled with sb/pathspec-label and sb/submodule-default-paths.)
The beginning of long and tortuous journey to clean-up attribute
subsystem implementation.
Needs to be redone.
* jk/rev-list-count-with-bitmap (2016-06-03) 2 commits
(merged to 'next' on 2016-06-06 at dd9b30f)
+ rev-list: disable bitmaps when "-n" is used with listing objects
+ rev-list: "adjust" results of "--count --use-bitmap-index -n"
Originally merged to 'next' on 2016-06-06
"git rev-list --count" whose walk-length is limited with "-n"
option did not work well with the counting optimized to look at the
bitmap index.
Will merge to 'master'.
* mh/ref-iterators (2016-06-03) 13 commits
(merged to 'next' on 2016-06-06 at c8e79dc)
+ for_each_reflog(): reimplement using iterators
+ dir_iterator: new API for iterating over a directory tree
+ for_each_reflog(): don't abort for bad references
+ do_for_each_ref(): reimplement using reference iteration
+ refs: introduce an iterator interface
+ ref_resolves_to_object(): new function
+ entry_resolves_to_object(): rename function from ref_resolves_to_object()
+ get_ref_cache(): only create an instance if there is a submodule
+ remote rm: handle symbolic refs correctly
+ delete_refs(): add a flags argument
+ refs: use name "prefix" consistently
+ do_for_each_ref(): move docstring to the header file
+ refs: remove unnecessary "extern" keywords
(this branch is used by mh/ref-store; uses mh/split-under-lock; is tangled with mh/update-ref-errors.)
Originally merged to 'next' on 2016-06-06
The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
As mh/split-under-lock will be replaced, this needs to be rebuilt
on top.
Will eject from 'next'.
* ew/mboxrd-format-am (2016-06-06) 3 commits
- am: support --patch-format=mboxrd
- mailsplit: support unescaping mboxrd messages
- pretty: support "mboxrd" output format
Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
Will merge to 'next'.
* lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit
- receive-pack: send auto-gc output over sideband 2
Allow messages that are generated by auto gc during "git push" on
the receiving end to be explicitly passed back to the sending end
over sideband, so that they are shown with "remote: " prefix to
avoid confusing the users.
Will merge to 'next'.
* mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit
- cherry-pick: allow to pick to unborn branches
"git cherry-pick A" worked on an unborn branch, but "git
cherry-pick A..B" didn't.
Will merge to 'next'.
* sg/reflog-past-root (2016-06-06) 1 commit
- reflog: continue walking the reflog past root commits
"git reflog" stopped upon seeing an entry that denotes a branch
creation event (aka "unborn"), which made it appear as if the
reflog was truncated.
Will merge to 'next'.
* tb/complete-status (2016-06-10) 3 commits
- completion: add git status
- completion: add __git_get_option_value helper
- completion: factor out untracked file modes into a variable
The completion script (in contrib/) learned to complete "git
status" options.
Any further comments? Otherwise will merge to 'next'.
* tr/doc-tt (2016-06-08) 4 commits
- doc: change configuration variables format
- doc: more consistency in environment variables format
- doc: change environment variables format
- doc: clearer rule about formatting literals
The documentation set has been updated so that literal commands,
configuration variables and environment variables are consistently
typeset in fixed-width font and bold in manpages.
Will merge to 'next'.
* vs/prompt-avoid-unset-variable (2016-06-06) 1 commit
- git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
The git-prompt scriptlet (in contrib/) was not friendly with those
who uses "set -u", which has been fixed.
Will merge to 'next'.
* rj/compat-regex-size-max-fix (2016-06-06) 1 commit
- regex: fix a SIZE_MAX macro redefinition warning
A compilation fix.
Will merge to 'next'.
* et/add-chmod-x (2016-06-07) 1 commit
- add: add --chmod=+x / --chmod=-x options
"git update-index --add --chmod=+x file" may be usable as an escape
hatch, but not a friendly thing to force for people who do need to
use it regularly. "git add --chmod=+x file" can be used instead.
Will merge to 'next'.
* mh/connect (2016-06-06) 10 commits
- connect: [host:port] is legacy for ssh
- connect: move ssh command line preparation to a separate function
- connect: actively reject git:// urls with a user part
- connect: change the --diag-url output to separate user and host
- connect: make parse_connect_url() return the user part of the url as a separate value
- connect: group CONNECT_DIAG_URL handling code
- connect: make parse_connect_url() return separated host and port
- connect: re-derive a host:port string from the separate host and port variables
- connect: call get_host_and_port() earlier
- connect: document why we sometimes call get_port after get_host_and_port
Rewrite Git-URL parsing routine (hopefully) without changing any
behaviour.
Will merge to 'next'???
* aq/upload-pack-use-parse-options (2016-05-31) 1 commit
(merged to 'next' on 2016-06-06 at 505f1ee)
+ upload-pack.c: use parse-options API
Originally merged to 'next' on 2016-06-06
"git upload-pack" command has been updated to use the parse-options
API.
Will merge to 'master'.
* jc/clear-pathspec (2016-06-02) 1 commit
(merged to 'next' on 2016-06-06 at 9e7e291)
+ pathspec: rename free_pathspec() to clear_pathspec()
Originally merged to 'next' on 2016-06-06
We usually call a function that clears the contents a data
structure X without freeing the structure itself clear_X(), and
call a function that does clear_X() and also frees it free_X().
free_pathspec() function has been renamed to clear_pathspec()
to avoid confusion.
Will merge to 'master'.
* sb/submodule-recommend-shallowness (2016-05-27) 2 commits
(merged to 'next' on 2016-05-31 at 1ee161c)
+ submodule update: learn `--[no-]recommend-shallow` option
+ submodule-config: keep shallow recommendation around
(this branch is used by sb/submodule-clone-retry.)
Originally merged to 'next' on 2016-05-31
An upstream project can make a recommendation to make only a
shallow clone for some submodules in the .gitmodules file it ship.
Will merge to 'master'.
* tb/convert-peek-in-index (2016-06-07) 3 commits
- correct ce_compare_data() in a middle of a merge
- read-cache: factor out get_sha1_from_index() helper
- convert: unify the "auto" handling of CRLF
Needs review.
* va/i18n-even-more (2016-06-17) 38 commits
- i18n: branch: mark comment when editing branch description for translation
- i18n: unmark die messages for translation
- i18n: submodule: escape shell variables inside eval_gettext
- i18n: submodule: join strings marked for translation
- i18n: init-db: join message pieces
- i18n: remote: allow translations to reorder message
- i18n: remote: mark URL fallback text for translation
- i18n: standardise messages
- i18n: sequencer: add period to error message
- i18n: merge: change command option help to lowercase
- i18n: merge: mark messages for translation
- i18n: notes: mark options for translation
- i18n: notes: mark strings for translation
- i18n: transport-helper.c: change N_() call to _()
- i18n: bisect: mark strings for translation
- t5523: use test_i18ngrep for negation
- t4153: fix negated test_i18ngrep call
- t9003: become resilient to GETTEXT_POISON
- tests: unpack-trees: update to use test_i18n* functions
- tests: use test_i18n* functions to suppress false positives
- i18n: setup: mark strings for translation
- i18n: rebase-interactive: mark comments of squash for translation
- i18n: rebase-interactive: mark here-doc strings for translation
- i18n: rebase-interactive: mark strings for translation
- i18n: git-sh-setup.sh: mark strings for translation
- t6030: update to use test_i18ncmp
- i18n: bisect: simplify error message for i18n
- i18n: rebase: mark placeholder for translation
- i18n: rebase: fix marked string to use eval_gettext variant
- merge-octopus: use die shell function from git-sh-setup.sh
- i18n: merge-octopus: mark messages for translation
- i18n: sequencer: mark string for translation
- i18n: sequencer: mark entire sentences for translation
- i18n: transport: mark strings for translation
- i18n: advice: internationalize message for conflicts
- i18n: advice: mark string about detached head for translation
- i18n: builtin/remote.c: fix mark for translation
- Merge branch 'jc/t2300-setup' into HEAD
More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
One patch from the original submission dropped due to conflicts
with jk/upload-pack-hook, which is still in flux.
Will merge to 'next'.
* jg/dash-is-last-branch-in-worktree-add (2016-05-31) 1 commit
(merged to 'next' on 2016-06-02 at 3959ef6)
+ worktree: allow "-" short-hand for @{-1} in add command
Originally merged to 'next' on 2016-06-02
"git worktree add" learned that '-' can be used as a short-hand for
"@{-1}", the previous branch.
Will merge to 'master'.
* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
- blame: require 0 context lines while finding moved lines with -M
"git blame -M" missed a single line that was moved within the file.
We may want to squash a test or two to this commit. Volunteers?
* nd/worktree-lock (2016-06-13) 6 commits
- worktree.c: find_worktree() search by path suffix
- worktree: add "unlock" command
- worktree: add "lock" command
- worktree.c: add is_worktree_locked()
- worktree.c: add is_main_worktree()
- worktree.c: add find_worktree()
(this branch uses nd/worktree-cleanup-post-head-protection.)
"git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location. "git worktree"
command learned a dedicated command pair to create and remoev such
a file, so that the users do not have to do this with editor.
Is everybody happy with this version?
If so, will merge to 'next'.
* et/pretty-format-c-auto (2016-05-27) 1 commit
(merged to 'next' on 2016-05-31 at 1e9c920)
+ format_commit_message: honor `color=auto` for `%C(auto)`
Originally merged to 'next' on 2016-05-31
%C(auto) in a custom format string that commands in `git log`
family takes unconditionally turned the color on, ignoring
--no-color or --color=auto with output not connected to a tty;
this was corrected to make the format truly behave as "auto".
Will merge to 'master'.
* ew/daemon-socket-keepalive (2016-05-25) 1 commit
(merged to 'next' on 2016-05-31 at c32acf1)
+ daemon: enable SO_KEEPALIVE for all sockets
Originally merged to 'next' on 2016-05-31
When "git daemon" is run without --[init-]timeout specified, a
connection from a client that silently goes offline can hang around
for a long time, wasting resources. The socket-level KEEPALIVE has
been enabled to allow the OS to notice such failed connections.
Will merge to 'master'.
* jk/upload-pack-hook (2016-06-02) 7 commits
- upload-pack: provide a hook for running pack-objects
- t1308: do not get fooled by symbolic links to the source tree
- config: add a notion of "scope"
- config: return configset value for current_config_ functions
- config: set up config_source for command-line config
- git_config_parse_parameter: refactor cleanup code
- git_config_with_options: drop "found" counting
Allow a custom "git upload-pack" replacement to respond to
"fetch/clone" request.
Will merge to 'next'.
* rs/xdiff-hunk-with-func-line (2016-06-09) 9 commits
(merged to 'next' on 2016-06-10 at 9ff9ba8)
+ xdiff: fix merging of appended hunk with -W
(merged to 'next' on 2016-06-02 at 0c2e335)
+ grep: -W: don't extend context to trailing empty lines
+ t7810: add test for grep -W and trailing empty context lines
+ xdiff: don't trim common tail with -W
+ xdiff: -W: don't include common trailing empty lines in context
+ xdiff: ignore empty lines before added functions with -W
+ xdiff: handle appended chunks better with -W
+ xdiff: factor out match_func_rec()
+ t4051: rewrite, add more tests
Originally merged to 'next' on 2016-06-10
"git show -W" (extend hunks to cover the entire function, delimited
by lines that match the "funcname" pattern) used to show the entire
file when a change added an entire function at the end of the file,
which has been fixed.
Will merge to 'master'.
* sb/submodule-misc-cleanups (2016-05-25) 1 commit
(merged to 'next' on 2016-05-31 at 0d07b9c)
+ submodule update: make use of the existing fetch_in_submodule function
Originally merged to 'next' on 2016-05-31
Minor simplification.
Will merge to 'master'.
* sb/submodule-default-paths (2016-06-14) 8 commits
- completion: clone can recurse into submodules
- clone: add --init-submodule=<pathspec> switch
- submodule update: add `--init-default-path` switch
- Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
- Merge branch 'jc/attr' into sb/submodule-default-paths
- Merge branch 'sb/clone-shallow-passthru' into sb/submodule-default-paths
- Merge branch 'sb/submodule-deinit-all' into sb/submodule-default-paths
- Merge branch 'sb/submodule-parallel-update' into sb/submodule-default-paths
(this branch uses jc/attr and sb/pathspec-label; is tangled with jc/attr-more.)
Will hold.
The jc/attr topic that this depends on needs to be redone.
* ah/no-verify-signature-with-pull-rebase (2016-05-20) 1 commit
(merged to 'next' on 2016-05-31 at 30add83)
+ pull: warn on --verify-signatures with --rebase
Originally merged to 'next' on 2016-05-31
"git pull --rebase --verify-signature" learned to warn the user
that "--verify-signature" is a no-op.
Will merge to 'master'.
* 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.
Will merge to 'next'.
* jc/attr (2016-05-25) 18 commits
(merged to 'next' on 2016-05-31 at 5b2f08b)
+ attr: support quoting pathname patterns in C style
+ attr: expose validity check for attribute names
+ attr: add counted string version of git_attr()
+ attr: add counted string version of git_check_attr()
+ attr: retire git_check_attrs() API
+ attr: convert git_check_attrs() callers to use the new API
+ attr: convert git_all_attrs() to use "struct git_attr_check"
+ attr: (re)introduce git_check_attr() and struct git_attr_check
+ attr: rename function and struct related to checking attributes
+ attr.c: plug small leak in parse_attr_line()
+ attr.c: tighten constness around "git_attr" structure
+ attr.c: simplify macroexpand_one()
+ attr.c: mark where #if DEBUG ends more clearly
+ attr.c: complete a sentence in a comment
+ attr.c: explain the lack of attr-name syntax check in parse_attr()
+ attr.c: update a stale comment on "struct match_attr"
+ attr.c: use strchrnul() to scan for one line
+ commit.c: use strchrnul() to scan for one line
(this branch is used by jc/attr-more, sb/pathspec-label and sb/submodule-default-paths.)
Originally merged to 'next' on 2016-05-31
The attributes API has been updated so that it can later be
optimized using the knowledge of which attributes are queried.
Will eject from 'next'.
The updated API needs further rethinking.
* cc/apply-introduce-state (2016-06-06) 50 commits
(merged to 'next' on 2016-06-06 at 9f6bdcb)
+ builtin/apply: remove misleading comment on lock_file field
(merged to 'next' on 2016-06-03 at 1ab0cf9)
+ builtin/apply: move 'newfd' global into 'struct apply_state'
+ builtin/apply: add 'lock_file' pointer into 'struct apply_state'
+ builtin/apply: move applying patches into apply_all_patches()
+ builtin/apply: move 'state' check into check_apply_state()
+ builtin/apply: move 'symlink_changes' global into 'struct apply_state'
+ builtin/apply: move 'fn_table' global into 'struct apply_state'
+ builtin/apply: move 'state_linenr' global into 'struct apply_state'
+ builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
+ builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
+ builtin/apply: move 'ws_error_action' into 'struct apply_state'
+ builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
+ builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
+ builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
+ builtin/apply: move 'whitespace_option' into 'struct apply_state'
+ builtin/apply: move 'whitespace_error' global into 'struct apply_state'
+ builtin/apply: move 'root' global into 'struct apply_state'
+ builtin/apply: move 'p_value_known' global into 'struct apply_state'
+ builtin/apply: move 'p_value' global into 'struct apply_state'
+ builtin/apply: move 'has_include' global into 'struct apply_state'
+ builtin/apply: move 'limit_by_name' global into 'struct apply_state'
+ builtin/apply: move 'patch_input_file' global into 'struct apply_state'
+ builtin/apply: move 'apply' global into 'struct apply_state'
+ builtin/apply: move 'p_context' global into 'struct apply_state'
+ builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
+ builtin/apply: move 'line_termination' global into 'struct apply_state'
+ builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
+ builtin/apply: move 'no_add' global into 'struct apply_state'
+ builtin/apply: move 'threeway' global into 'struct apply_state'
+ builtin/apply: move 'summary' global into 'struct apply_state'
+ builtin/apply: move 'numstat' global into 'struct apply_state'
+ builtin/apply: move 'diffstat' global into 'struct apply_state'
+ builtin/apply: move 'cached' global into 'struct apply_state'
+ builtin/apply: move 'allow_overlap' global into 'struct apply_state'
+ builtin/apply: move 'update_index' global into 'struct apply_state'
+ builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
+ builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
+ builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
+ builtin/apply: move 'check_index' global into 'struct apply_state'
+ builtin/apply: move 'check' global into 'struct apply_state'
+ builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
+ builtin/apply: move 'state' init into init_apply_state()
+ builtin/apply: introduce 'struct apply_state' to start libifying
+ builtin/apply: move 'read_stdin' global into cmd_apply()
+ builtin/apply: move 'options' variable into cmd_apply()
+ builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
+ builtin/apply: avoid local variable shadowing 'len' parameter
+ builtin/apply: avoid parameter shadowing 'linenr' global
+ builtin/apply: avoid parameter shadowing 'p_value' global
+ builtin/apply: make gitdiff_verify_name() return void
Originally merged to 'next' on 2016-06-06
The "git apply" standalone program is being libified; this is the
first step to move many state variables into a structure that can
be explicitly (re)initialized to make the machinery callable more
than once.
The next step that moves some remaining state variables into the
structure and turns die()s into an error return that propagates up
to the caller is not queued yet but in flight. It would be good to
review the above first and give the remainder of the series a solid
base to build on.
Will hold.
* pb/bisect (2016-05-24) 3 commits
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Beginning of GSoC "git bisect" project.
I know another topic is getting rerolled many times on top of this;
are people happy with these three patches? If so, will merge to
'next'.
* sb/pathspec-label (2016-06-03) 6 commits
(merged to 'next' on 2016-06-03 at 362f097)
+ pathspec: disable preload-index when attribute pathspec magic is in use
+ pathspec: allow escaped query values
(merged to 'next' on 2016-05-31 at e72b604)
+ pathspec: allow querying for attributes
+ pathspec: move prefix check out of the inner loop
+ pathspec: move long magic parsing out of prefix_pathspec
+ Documentation: fix a typo
(this branch is used by sb/submodule-default-paths; uses jc/attr; is tangled with jc/attr-more.)
Originally merged to 'next' on 2016-06-03
The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
to limit paths that match $pattern further by attribute settings.
The preload-index mechanism is disabled when the new pathspec magic
is in use (at least for now), because the attribute subsystem is
not thread-ready.
Will eject from 'next'.
The jc/attr topic that this depends on needs to be redone.
* 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.
Will merge to 'next'.
* mh/split-under-lock (2016-05-13) 33 commits
(merged to 'next' on 2016-06-03 at 2e71330)
+ lock_ref_sha1_basic(): only handle REF_NODEREF mode
+ commit_ref_update(): remove the flags parameter
+ lock_ref_for_update(): don't resolve symrefs
+ lock_ref_for_update(): don't re-read non-symbolic references
+ refs: resolve symbolic refs first
+ ref_transaction_update(): check refname_is_safe() at a minimum
+ unlock_ref(): move definition higher in the file
+ lock_ref_for_update(): new function
+ add_update(): initialize the whole ref_update
+ verify_refname_available(): adjust constness in declaration
+ refs: don't dereference on rename
+ refs: allow log-only updates
+ delete_branches(): use resolve_refdup()
+ ref_transaction_commit(): correctly report close_ref() failure
+ ref_transaction_create(): disallow recursive pruning
+ refs: make error messages more consistent
+ lock_ref_sha1_basic(): remove unneeded local variable
+ read_raw_ref(): move docstring to header file
+ read_raw_ref(): improve docstring
+ read_raw_ref(): rename symref argument to referent
+ read_raw_ref(): clear *type at start of function
+ read_raw_ref(): rename flags argument to type
+ ref_transaction_commit(): remove local variable n
+ rename_ref(): remove unneeded local variable
+ commit_ref_update(): write error message to *err, not stderr
+ refname_is_safe(): insist that the refname already be normalized
+ refname_is_safe(): don't allow the empty string
+ refname_is_safe(): use skip_prefix()
+ remove_dir_recursively(): add docstring
+ safe_create_leading_directories(): improve docstring
+ read_raw_ref(): don't get confused by an empty directory
+ commit_ref(): if there is an empty dir in the way, delete it
+ t1404: demonstrate a bug resolving references
(this branch is used by mh/ref-iterators, mh/ref-store and mh/update-ref-errors.)
Originally merged to 'next' on 2016-06-03
Further preparatory work on the refs API before the pluggable
backend series can land.
Will eject from 'next'.
Will be replaced with the updated one from Michael after that.
* ew/fast-import-unpack-limit (2016-05-29) 2 commits
(merged to 'next' on 2016-05-29 at af32aba)
+ fast-import: invalidate pack_id references after loosening
(merged to 'next' on 2016-05-11 at ffd4efb)
+ fast-import: implement unpack limit
Originally merged to 'next' on 2016-05-29
"git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
Will merge to 'master'.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Will merge to 'next'.
Perhaps people will enhance it more once it gains more visibility.
* kn/ref-filter-branch-list (2016-05-17) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Rerolled.
This also really needs review.
* dt/index-helper (2016-05-20) 20 commits
- index-helper: indexhelper.exitafter config
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: support watchman to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: log warnings
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- pkt-line: add gentle version of packet_write
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
A new "index-helper" daemon has been introduced to give newly
spawned Git process a quicker access to the data in the index, and
optionally interface with the watchman daemon to further reduce the
refresh cost.
Belated review comments still trickling in.
Will hold.
($gmane/295106).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
While I think it would make it easier for people to experiment and
build on if the topic is merged to 'next', I am at the same time a
bit reluctant to merge an unproven new topic that introduces a new
file format, which we may end up having to support til the end of
time. Comments?
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Jun 2016, #05; Thu, 16)
@ 2016-06-17 3:20 3% Junio C Hamano
0 siblings, 0 replies; 22+ results
From: Junio C Hamano @ 2016-06-17 3:20 UTC (permalink / raw
To: git
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.
Let's start a new cycle by rewinding the tip of 'next' soonish. I
expect I'd eject a few premature topics out of 'next' while doing
so. There are many topics that need input from the list (look for
'?' in this document) to decide either to drop them or to move them
forward.
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
--------------------------------------------------
[New Topics]
* ap/git-svn-propset-doc (2016-06-15) 1 commit
- git-svn: document the 'git svn propset' command
"git svn propset" subcommand that was added in 2.3 days is
documented now.
Will merge to 'next'.
* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit
- add--interactive: respect diff.compactionHeuristic
"git add -i/-p" learned to honor diff.compactionHeuristic
experimental knob, so that the user can work on the same hunk split
as "git diff" output.
Will merge to 'next'.
* jk/big-and-old-archive-tar (2016-06-16) 2 commits
- archive-tar: write extended headers for far-future mtime
- archive-tar: write extended headers for file sizes >= 8GB
"git archive" learned to handle files that are larger than 8GB and
commits far in the future than expressible by the traditional US-TAR
format.
Will merge to 'next'.
* jk/gpg-interface-cleanup (2016-06-16) 7 commits
- gpg-interface: check gpg signature creation status
- sign_buffer: use pipe_command
- verify_signed_buffer: use pipe_command
- run-command: add pipe_command helper
- verify_signed_buffer: use tempfile object
- verify_signed_buffer: drop pbuf variable
- gpg-interface: use child_process.args
A new run-command API function pipe_command() is introduced to
sanely feed data to the standard input while capturing data from
the standard output and the standard error of an external process,
which is cumbersome to hand-roll correctly without deadlocking.
The codepath to sign data in a prepared buffer with GPG has been
updated to use this API to read from the status-fd to check for
errors (instead of relying on GPG's exit status).
Will merge to 'next'.
* lf/sideband-returns-void (2016-06-16) 2 commits
- upload-pack.c: make send_client_data() return void
- sideband.c: make send_sideband() return void
A small internal API cleanup.
Will merge to 'next'.
* nd/graph-width-padded (2016-06-16) 2 commits
- pretty.c: support <direction>|(<negative number>) forms
- pretty: pass graph width to pretty formatting for use in '%>|(N)'
"log --graph --format=" learned that "%>|(N)" specifies the width
relative to the terminal's left edge, not relative to the area to
draw text that is to the right of the ancestry-graph section. It
also now accepts negative N that means the column limit is relative
to the right border.
Will merge to 'next'.
* dn/gpg-doc (2016-06-16) 1 commit
- Documentation: GPG capitalization
The documentation tries to consistently spell "GPG"; when
referring to the specific program name, "gpg" is used.
Will merge to 'next'.
* jk/bisect-show-tree (2016-06-16) 1 commit
- bisect: always call setup_revisions after init_revisions
"git bisect" makes an internal call to "git diff-tree" when
bisection finds the culprit, but this call did not initialize the
data structure to pass to the diff-tree API correctly.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* mj/log-show-signature-conf (2016-06-06) 2 commits
- log: "--no-show-signature" commmand-line option
- log: add "log.showsignature" configuration variable
"git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
The order of the commits in the topic need to be reversed.
Expecting a reroll.
* 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 arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* sg/completion-updates (2016-02-28) 21 commits
. completion: cache the path to the repository
. completion: extract repository discovery from __gitdir()
. completion: don't guard git executions with __gitdir()
. completion: consolidate silencing errors from git commands
. completion: don't use __gitdir() for git commands
. completion: respect 'git -C <path>'
. completion: fix completion after 'git -C <path>'
. completion: don't offer commands when 'git --opt' needs an argument
. rev-parse: add '--absolute-git-dir' option
. completion: list short refs from a remote given as a URL
. completion: don't list 'HEAD' when trying refs completion outside of a repo
. completion: list refs from remote when remote's name matches a directory
. completion: respect 'git --git-dir=<path>' when listing remote refs
. completion: fix most spots not respecting 'git --git-dir=<path>'
. completion: ensure that the repository path given on the command line exists
. completion tests: add tests for the __git_refs() helper function
. completion tests: check __gitdir()'s output in the error cases
. completion tests: consolidate getting path of current working directory
. completion tests: make the $cur variable local to the test helper functions
. completion tests: don't add test cruft to the test repository
. completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
This really needs review. What it attempts to achieve is
worthwhile, I would think ($gmane/286137).
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* 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.
Will merge to 'next'.
* jc/blame-reverse (2016-06-14) 2 commits
- blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."
- blame: improve diagnosis for "--reverse NEW"
It is a common mistake to say "git blame --reverse OLD path",
expecting that the command line is dwimmed as if asking how lines
in path in an old revision OLD have survived up to the current
commit.
Any supporters? Otherwise will drop.
* 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'.
* nd/shallow-deepen (2016-06-13) 27 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: make check_non_tip() clean things up on error
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Rerolled.
Needs review. What this topic attempts to achieve is worthwhile, I
would think.
* jk/avoid-unbounded-alloca (2016-06-07) 1 commit
- tree-diff: avoid alloca for large allocations
Will merge to 'next'.
* jk/send-pack-stdio (2016-06-10) 2 commits
- write_or_die: remove the unused write_or_whine() function
- send-pack: use buffered I/O to talk to pack-objects
Code clean-up.
Will merge to 'next'.
* pb/commit-editmsg-path (2016-06-09) 1 commit
- builtin/commit.c: memoize git-path for COMMIT_EDITMSG
Code clean-up.
Will merge to 'next'.
* wd/userdiff-css (2016-06-03) 1 commit
(merged to 'next' on 2016-06-06 at 536102f)
+ userdiff: add built-in pattern for CSS
Update the funcname definition to support css files.
Will merge to 'master'.
* jc/attr-more (2016-06-09) 8 commits
- attr.c: outline the future plans by heavily commenting
- attr.c: always pass check[] to collect_some_attrs()
- attr.c: introduce empty_attr_check_elems()
- attr.c: correct ugly hack for git_all_attrs()
- attr.c: rename a local variable check
- fixup! d5ad6c13
- attr.c: pass struct git_attr_check down the callchain
- attr.c: add push_stack() helper
(this branch uses jc/attr; is tangled with sb/pathspec-label and sb/submodule-default-paths.)
The beginning of long and tortuous journey to clean-up attribute
subsystem implementation.
Needs to be redone.
* jk/rev-list-count-with-bitmap (2016-06-03) 2 commits
(merged to 'next' on 2016-06-06 at dd9b30f)
+ rev-list: disable bitmaps when "-n" is used with listing objects
+ rev-list: "adjust" results of "--count --use-bitmap-index -n"
"git rev-list --count" whose walk-length is limited with "-n"
option did not work well with the counting optimized to look at the
bitmap index.
Will merge to 'master'.
* mh/ref-iterators (2016-06-03) 13 commits
(merged to 'next' on 2016-06-06 at c8e79dc)
+ for_each_reflog(): reimplement using iterators
+ dir_iterator: new API for iterating over a directory tree
+ for_each_reflog(): don't abort for bad references
+ do_for_each_ref(): reimplement using reference iteration
+ refs: introduce an iterator interface
+ ref_resolves_to_object(): new function
+ entry_resolves_to_object(): rename function from ref_resolves_to_object()
+ get_ref_cache(): only create an instance if there is a submodule
+ remote rm: handle symbolic refs correctly
+ delete_refs(): add a flags argument
+ refs: use name "prefix" consistently
+ do_for_each_ref(): move docstring to the header file
+ refs: remove unnecessary "extern" keywords
(this branch is used by mh/ref-store; uses mh/split-under-lock; is tangled with mh/update-ref-errors.)
The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
Will merge to 'master'.
* ew/mboxrd-format-am (2016-06-06) 3 commits
- am: support --patch-format=mboxrd
- mailsplit: support unescaping mboxrd messages
- pretty: support "mboxrd" output format
Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
Will merge to 'next'.
* lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit
- receive-pack: send auto-gc output over sideband 2
Allow messages that are generated by auto gc during "git push" on
the receiving end to be explicitly passed back to the sending end
over sideband, so that they are shown with "remote: " prefix to
avoid confusing the users.
Will merge to 'next'.
* mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit
- cherry-pick: allow to pick to unborn branches
"git cherry-pick A" worked on an unborn branch, but "git
cherry-pick A..B" didn't.
Will merge to 'next'.
* sg/reflog-past-root (2016-06-06) 1 commit
- reflog: continue walking the reflog past root commits
"git reflog" stopped upon seeing an entry that denotes a branch
creation event (aka "unborn"), which made it appear as if the
reflog was truncated.
Will merge to 'next'.
* tb/complete-status (2016-06-10) 3 commits
- completion: add git status
- completion: add __git_get_option_value helper
- completion: factor out untracked file modes into a variable
The completion script (in contrib/) learned to complete "git
status" options.
Any further comments? Otherwise will merge to 'next'.
* tr/doc-tt (2016-06-08) 4 commits
- doc: change configuration variables format
- doc: more consistency in environment variables format
- doc: change environment variables format
- doc: clearer rule about formatting literals
The documentation set has been updated so that literal commands,
configuration variables and environment variables are consistently
typeset in fixed-width font and bold in manpages.
Will merge to 'next'.
* vs/prompt-avoid-unset-variable (2016-06-06) 1 commit
- git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
The git-prompt scriptlet (in contrib/) was not friendly with those
who uses "set -u", which has been fixed.
Will merge to 'next'.
* rj/compat-regex-size-max-fix (2016-06-06) 1 commit
- regex: fix a SIZE_MAX macro redefinition warning
A compilation fix.
Will merge to 'next'.
* et/add-chmod-x (2016-06-07) 1 commit
- add: add --chmod=+x / --chmod=-x options
"git update-index --add --chmod=+x file" may be usable as an escape
hatch, but not a friendly thing to force for people who do need to
use it regularly. "git add --chmod=+x file" can be used instead.
Will merge to 'next'.
* mh/connect (2016-06-06) 10 commits
- connect: [host:port] is legacy for ssh
- connect: move ssh command line preparation to a separate function
- connect: actively reject git:// urls with a user part
- connect: change the --diag-url output to separate user and host
- connect: make parse_connect_url() return the user part of the url as a separate value
- connect: group CONNECT_DIAG_URL handling code
- connect: make parse_connect_url() return separated host and port
- connect: re-derive a host:port string from the separate host and port variables
- connect: call get_host_and_port() earlier
- connect: document why we sometimes call get_port after get_host_and_port
Rewrite Git-URL parsing routine (hopefully) without changing any
behaviour.
Will merge to 'next'???
* aq/upload-pack-use-parse-options (2016-05-31) 1 commit
(merged to 'next' on 2016-06-06 at 505f1ee)
+ upload-pack.c: use parse-options API
"git upload-pack" command has been updated to use the parse-options
API.
Will merge to 'master'.
* jc/clear-pathspec (2016-06-02) 1 commit
(merged to 'next' on 2016-06-06 at 9e7e291)
+ pathspec: rename free_pathspec() to clear_pathspec()
We usually call a function that clears the contents a data
structure X without freeing the structure itself clear_X(), and
call a function that does clear_X() and also frees it free_X().
free_pathspec() function has been renamed to clear_pathspec()
to avoid confusion.
Will merge to 'master'.
* sb/submodule-recommend-shallowness (2016-05-27) 2 commits
(merged to 'next' on 2016-05-31 at 1ee161c)
+ submodule update: learn `--[no-]recommend-shallow` option
+ submodule-config: keep shallow recommendation around
(this branch is used by sb/submodule-clone-retry.)
An upstream project can make a recommendation to make only a
shallow clone for some submodules in the .gitmodules file it ship.
Will merge to 'master'.
* tb/convert-peek-in-index (2016-06-07) 3 commits
- correct ce_compare_data() in a middle of a merge
- read-cache: factor out get_sha1_from_index() helper
- convert: unify the "auto" handling of CRLF
Needs review.
* va/i18n-even-more (2016-06-07) 38 commits
- i18n: branch: mark comment when editing branch description for translation
- i18n: unmark die messages for translation
- i18n: submodule: escape shell variables inside eval_gettext
- i18n: submodule: join strings marked for translation
- i18n: init-db: join message pieces
- i18n: remote: allow translations to reorder message
- i18n: remote: mark URL fallback text for translation
- i18n: standardise messages
- i18n: sequencer: add period to error message
- i18n: merge: change command option help to lowercase
- i18n: merge: mark messages for translation
- i18n: notes: mark options for translation
- i18n: notes: mark strings for translation
- i18n: transport-helper.c: change N_() call to _()
- i18n: bisect: mark strings for translation
- t5523: use test_i18ngrep for negation
- t4153: fix negated test_i18ngrep call
- t9003: become resilient to GETTEXT_POISON
- tests: unpack-trees: update to use test_i18n* functions
- tests: use test_i18n* functions to suppress false positives
- i18n: setup: mark strings for translation
- i18n: rebase-interactive: mark comments of squash for translation
- i18n: rebase-interactive: mark here-doc strings for translation
- i18n: rebase-interactive: mark strings for translation
- i18n: git-sh-setup.sh: mark strings for translation
- t6030: update to use test_i18ncmp
- i18n: bisect: simplify error message for i18n
- i18n: rebase: mark placeholder for translation
- i18n: rebase: fix marked string to use eval_gettext variant
- merge-octupus: use die shell function from git-sh-setup.sh
- i18n: merge-octopus: mark messages for translation
- i18n: sequencer: mark string for translation
- i18n: sequencer: mark entire sentences for translation
- i18n: transport: mark strings for translation
- i18n: advice: internationalize message for conflicts
- i18n: advice: mark string about detached head for translation
- i18n: builtin/remote.c: fix mark for translation
- Merge branch 'jc/t2300-setup' into HEAD
More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
One patch from the original submission dropped due to conflicts
with other topics in flight.
Will merge to 'next'.
* jg/dash-is-last-branch-in-worktree-add (2016-05-31) 1 commit
(merged to 'next' on 2016-06-02 at 3959ef6)
+ worktree: allow "-" short-hand for @{-1} in add command
"git worktree add" learned that '-' can be used as a short-hand for
"@{-1}", the previous branch.
Will merge to 'master'.
* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
- blame: require 0 context lines while finding moved lines with -M
"git blame -M" missed a single line that was moved within the file.
We may want to squash a test or two to this commit. Volunteers?
* nd/worktree-lock (2016-06-13) 6 commits
- worktree.c: find_worktree() search by path suffix
- worktree: add "unlock" command
- worktree: add "lock" command
- worktree.c: add is_worktree_locked()
- worktree.c: add is_main_worktree()
- worktree.c: add find_worktree()
(this branch uses nd/worktree-cleanup-post-head-protection.)
"git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location. "git worktree"
command learned a dedicated command pair to create and remoev such
a file, so that the users do not have to do this with editor.
Is everybody happy with this version?
If so, will merge to 'next'.
* et/pretty-format-c-auto (2016-05-27) 1 commit
(merged to 'next' on 2016-05-31 at 1e9c920)
+ format_commit_message: honor `color=auto` for `%C(auto)`
%C(auto) in a custom format string that commands in `git log`
family takes unconditionally turned the color on, ignoring
--no-color or --color=auto with output not connected to a tty;
this was corrected to make the format truly behave as "auto".
Will merge to 'master'.
* ew/daemon-socket-keepalive (2016-05-25) 1 commit
(merged to 'next' on 2016-05-31 at c32acf1)
+ daemon: enable SO_KEEPALIVE for all sockets
When "git daemon" is run without --[init-]timeout specified, a
connection from a client that silently goes offline can hang around
for a long time, wasting resources. The socket-level KEEPALIVE has
been enabled to allow the OS to notice such failed connections.
Will merge to 'master'.
* jk/upload-pack-hook (2016-06-02) 7 commits
- upload-pack: provide a hook for running pack-objects
- t1308: do not get fooled by symbolic links to the source tree
- config: add a notion of "scope"
- config: return configset value for current_config_ functions
- config: set up config_source for command-line config
- git_config_parse_parameter: refactor cleanup code
- git_config_with_options: drop "found" counting
Allow a custom "git upload-pack" replacement to respond to
"fetch/clone" request.
Still under discussion???
($gmane/295705).
* rs/xdiff-hunk-with-func-line (2016-06-09) 9 commits
(merged to 'next' on 2016-06-10 at 9ff9ba8)
+ xdiff: fix merging of appended hunk with -W
(merged to 'next' on 2016-06-02 at 0c2e335)
+ grep: -W: don't extend context to trailing empty lines
+ t7810: add test for grep -W and trailing empty context lines
+ xdiff: don't trim common tail with -W
+ xdiff: -W: don't include common trailing empty lines in context
+ xdiff: ignore empty lines before added functions with -W
+ xdiff: handle appended chunks better with -W
+ xdiff: factor out match_func_rec()
+ t4051: rewrite, add more tests
"git show -W" (extend hunks to cover the entire function, delimited
by lines that match the "funcname" pattern) used to show the entire
file when a change added an entire function at the end of the file,
which has been fixed.
Will merge to 'master'.
* sb/submodule-misc-cleanups (2016-05-25) 1 commit
(merged to 'next' on 2016-05-31 at 0d07b9c)
+ submodule update: make use of the existing fetch_in_submodule function
Minor simplification.
Will merge to 'master'.
* sb/submodule-default-paths (2016-06-14) 8 commits
- completion: clone can recurse into submodules
- clone: add --init-submodule=<pathspec> switch
- submodule update: add `--init-default-path` switch
- Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
- Merge branch 'jc/attr' into sb/submodule-default-paths
- Merge branch 'sb/clone-shallow-passthru' into sb/submodule-default-paths
- Merge branch 'sb/submodule-deinit-all' into sb/submodule-default-paths
- Merge branch 'sb/submodule-parallel-update' into sb/submodule-default-paths
(this branch uses jc/attr and sb/pathspec-label; is tangled with jc/attr-more.)
Will hold.
* ah/no-verify-signature-with-pull-rebase (2016-05-20) 1 commit
(merged to 'next' on 2016-05-31 at 30add83)
+ pull: warn on --verify-signatures with --rebase
"git pull --rebase --verify-signature" learned to warn the user
that "--verify-signature" is a no-op.
Will merge to 'master'.
* 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.
Will merge to 'next'.
* jc/attr (2016-05-25) 18 commits
(merged to 'next' on 2016-05-31 at 5b2f08b)
+ attr: support quoting pathname patterns in C style
+ attr: expose validity check for attribute names
+ attr: add counted string version of git_attr()
+ attr: add counted string version of git_check_attr()
+ attr: retire git_check_attrs() API
+ attr: convert git_check_attrs() callers to use the new API
+ attr: convert git_all_attrs() to use "struct git_attr_check"
+ attr: (re)introduce git_check_attr() and struct git_attr_check
+ attr: rename function and struct related to checking attributes
+ attr.c: plug small leak in parse_attr_line()
+ attr.c: tighten constness around "git_attr" structure
+ attr.c: simplify macroexpand_one()
+ attr.c: mark where #if DEBUG ends more clearly
+ attr.c: complete a sentence in a comment
+ attr.c: explain the lack of attr-name syntax check in parse_attr()
+ attr.c: update a stale comment on "struct match_attr"
+ attr.c: use strchrnul() to scan for one line
+ commit.c: use strchrnul() to scan for one line
(this branch is used by jc/attr-more, sb/pathspec-label and sb/submodule-default-paths.)
The attributes API has been updated so that it can later be
optimized using the knowledge of which attributes are queried.
Will eject from 'next'.
The updated API needs further rethinking.
* cc/apply-introduce-state (2016-06-06) 50 commits
(merged to 'next' on 2016-06-06 at 9f6bdcb)
+ builtin/apply: remove misleading comment on lock_file field
(merged to 'next' on 2016-06-03 at 1ab0cf9)
+ builtin/apply: move 'newfd' global into 'struct apply_state'
+ builtin/apply: add 'lock_file' pointer into 'struct apply_state'
+ builtin/apply: move applying patches into apply_all_patches()
+ builtin/apply: move 'state' check into check_apply_state()
+ builtin/apply: move 'symlink_changes' global into 'struct apply_state'
+ builtin/apply: move 'fn_table' global into 'struct apply_state'
+ builtin/apply: move 'state_linenr' global into 'struct apply_state'
+ builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
+ builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
+ builtin/apply: move 'ws_error_action' into 'struct apply_state'
+ builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
+ builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
+ builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
+ builtin/apply: move 'whitespace_option' into 'struct apply_state'
+ builtin/apply: move 'whitespace_error' global into 'struct apply_state'
+ builtin/apply: move 'root' global into 'struct apply_state'
+ builtin/apply: move 'p_value_known' global into 'struct apply_state'
+ builtin/apply: move 'p_value' global into 'struct apply_state'
+ builtin/apply: move 'has_include' global into 'struct apply_state'
+ builtin/apply: move 'limit_by_name' global into 'struct apply_state'
+ builtin/apply: move 'patch_input_file' global into 'struct apply_state'
+ builtin/apply: move 'apply' global into 'struct apply_state'
+ builtin/apply: move 'p_context' global into 'struct apply_state'
+ builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
+ builtin/apply: move 'line_termination' global into 'struct apply_state'
+ builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
+ builtin/apply: move 'no_add' global into 'struct apply_state'
+ builtin/apply: move 'threeway' global into 'struct apply_state'
+ builtin/apply: move 'summary' global into 'struct apply_state'
+ builtin/apply: move 'numstat' global into 'struct apply_state'
+ builtin/apply: move 'diffstat' global into 'struct apply_state'
+ builtin/apply: move 'cached' global into 'struct apply_state'
+ builtin/apply: move 'allow_overlap' global into 'struct apply_state'
+ builtin/apply: move 'update_index' global into 'struct apply_state'
+ builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
+ builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
+ builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
+ builtin/apply: move 'check_index' global into 'struct apply_state'
+ builtin/apply: move 'check' global into 'struct apply_state'
+ builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
+ builtin/apply: move 'state' init into init_apply_state()
+ builtin/apply: introduce 'struct apply_state' to start libifying
+ builtin/apply: move 'read_stdin' global into cmd_apply()
+ builtin/apply: move 'options' variable into cmd_apply()
+ builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
+ builtin/apply: avoid local variable shadowing 'len' parameter
+ builtin/apply: avoid parameter shadowing 'linenr' global
+ builtin/apply: avoid parameter shadowing 'p_value' global
+ builtin/apply: make gitdiff_verify_name() return void
The "git apply" standalone program is being libified; this is the
first step to move many state variables into a structure that can
be explicitly (re)initialized to make the machinery callable more
than once.
The next step that moves some remaining state variables into the
structure and turns die()s into an error return that propagates up
to the caller is not queued yet but in flight. It would be good to
review the above first and give the remainder of the series a solid
base to build on.
Will hold.
* pb/bisect (2016-05-24) 3 commits
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Beginning of GSoC "git bisect" project.
I know another topic is getting rerolled many times on top of this;
are people happy with these three patches? If so, will merge to
'next'.
* sb/pathspec-label (2016-06-03) 6 commits
(merged to 'next' on 2016-06-03 at 362f097)
+ pathspec: disable preload-index when attribute pathspec magic is in use
+ pathspec: allow escaped query values
(merged to 'next' on 2016-05-31 at e72b604)
+ pathspec: allow querying for attributes
+ pathspec: move prefix check out of the inner loop
+ pathspec: move long magic parsing out of prefix_pathspec
+ Documentation: fix a typo
(this branch is used by sb/submodule-default-paths; uses jc/attr; is tangled with jc/attr-more.)
The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
to limit paths that match $pattern further by attribute settings.
The preload-index mechanism is disabled when the new pathspec magic
is in use (at least for now), because the attribute subsystem is
not thread-ready.
Will eject from 'next'.
The jc/attr topic that this depends on needs to be redone.
* 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.
Will merge to 'next'.
* mh/split-under-lock (2016-05-13) 33 commits
(merged to 'next' on 2016-06-03 at 2e71330)
+ lock_ref_sha1_basic(): only handle REF_NODEREF mode
+ commit_ref_update(): remove the flags parameter
+ lock_ref_for_update(): don't resolve symrefs
+ lock_ref_for_update(): don't re-read non-symbolic references
+ refs: resolve symbolic refs first
+ ref_transaction_update(): check refname_is_safe() at a minimum
+ unlock_ref(): move definition higher in the file
+ lock_ref_for_update(): new function
+ add_update(): initialize the whole ref_update
+ verify_refname_available(): adjust constness in declaration
+ refs: don't dereference on rename
+ refs: allow log-only updates
+ delete_branches(): use resolve_refdup()
+ ref_transaction_commit(): correctly report close_ref() failure
+ ref_transaction_create(): disallow recursive pruning
+ refs: make error messages more consistent
+ lock_ref_sha1_basic(): remove unneeded local variable
+ read_raw_ref(): move docstring to header file
+ read_raw_ref(): improve docstring
+ read_raw_ref(): rename symref argument to referent
+ read_raw_ref(): clear *type at start of function
+ read_raw_ref(): rename flags argument to type
+ ref_transaction_commit(): remove local variable n
+ rename_ref(): remove unneeded local variable
+ commit_ref_update(): write error message to *err, not stderr
+ refname_is_safe(): insist that the refname already be normalized
+ refname_is_safe(): don't allow the empty string
+ refname_is_safe(): use skip_prefix()
+ remove_dir_recursively(): add docstring
+ safe_create_leading_directories(): improve docstring
+ read_raw_ref(): don't get confused by an empty directory
+ commit_ref(): if there is an empty dir in the way, delete it
+ t1404: demonstrate a bug resolving references
(this branch is used by mh/ref-iterators, mh/ref-store and mh/update-ref-errors.)
Further preparatory work on the refs API before the pluggable
backend series can land.
Will merge to 'master'.
* ew/fast-import-unpack-limit (2016-05-29) 2 commits
(merged to 'next' on 2016-05-29 at af32aba)
+ fast-import: invalidate pack_id references after loosening
(merged to 'next' on 2016-05-11 at ffd4efb)
+ fast-import: implement unpack limit
"git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
Will merge to 'master'.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Will merge to 'next'.
Perhaps people will enhance it more once it gains more visibility.
* kn/ref-filter-branch-list (2016-05-17) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Rerolled.
This also really needs review.
* dt/index-helper (2016-05-20) 20 commits
- index-helper: indexhelper.exitafter config
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: support watchman to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: log warnings
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- pkt-line: add gentle version of packet_write
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
A new "index-helper" daemon has been introduced to give newly
spawned Git process a quicker access to the data in the index, and
optionally interface with the watchman daemon to further reduce the
refresh cost.
Are people happy with this version? If so will merge to 'next'.
($gmane/295106).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
While I think it would make it easier for people to experiment and
build on if the topic is merged to 'next', I am at the same time a
bit reluctant to merge an unproven new topic that introduces a new
file format, which we may end up having to support til the end of
time. Comments?
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
--------------------------------------------------
[Discarded]
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
. am: make a direct call to merge_recursive
. merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
Has a lot of conflict when merged to 'pu' these days, so let's
eject it from our tree for now.
Will discard.
($gmane/292205)
* 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.
Retracted.
Will discard.
($gmane/297362)
* jc/merge-impossible-no-commit (2016-04-26) 2 commits
. merge: warn --no-commit merge when no new commit is created
. merge: do not contaminate option_commit with --squash
"git merge --no-commit" silently succeeded when there is no need to
create any commit, either when you are more recent than the commit
you tried to merge, or you can fast-forward to the commit you tried
to merge. The command gives a warning message in such cases.
Just tying loose ends in a discussion. Unless somebody else
champions this topic, I'll drop it.
Will discard.
* bc/cocci-object-id (2016-06-06) 8 commits
. merge-recursive: convert merge_recursive_generic to object_id
. merge-recursive: convert leaf functions to use struct object_id
. merge-recursive: convert struct merge_file_info to object_id
. merge-recursive: convert struct stage_data to use object_id
. Rename struct diff_filespec's sha1_valid member.
. Convert struct diff_filespec to struct object_id
. Apply standard object_id Coccinelle transformations.
. Add basic Coccinelle transforms.
Move from "unsigned char [20]" to "struct object_id" continues,
with help from an automated tool.
Will discard.
($gmane/296749)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Retracted.
($gmane/296722)
^ permalink raw reply [relevance 3%]
* Re: What's cooking in git.git (Jun 2016, #04; Tue, 14)
2016-06-14 22:08 3% What's cooking in git.git (Jun 2016, #04; Tue, 14) Junio C Hamano
2016-06-15 2:36 0% ` Mike Hommey
@ 2016-06-15 7:35 0% ` Elia Pinto
1 sibling, 0 replies; 22+ results
From: Elia Pinto @ 2016-06-15 7:35 UTC (permalink / raw
To: Junio C Hamano, Eric Sunshine, Jeff King, Ramsay Jones,
Torsten Bögershausen
Cc: git@vger.kernel.org
2016-06-15 0:08 GMT+02:00 Junio C Hamano <gitster@pobox.com>:
> 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 arguments when appropriate
> - bisect: replace clear_distance() by unique markers
> - bisect: use struct node_data array instead of int array
> - bisect: get rid of recursion in count_distance()
> - bisect: make algorithm behavior independent of DEBUG_BISECT
> - bisect: make bisect compile if DEBUG_BISECT is set
> - bisect: plug the biggest memory leak
> - bisect: add test for the bisect algorithm
> - t6030: generalize test to not rely on current implementation
> - t: use test_cmp_rev() where appropriate
> - t/test-lib-functions.sh: generalize test_cmp_rev
> - bisect: allow 'bisect run' if no good commit is known
> - bisect: write about `bisect next` in documentation
>
> The internal algorithm used in "git bisect" to find the next commit
> to check has been optimized greatly.
>
> Expecting a reroll.
> ($gmane/291163)
>
>
> * sg/completion-updates (2016-02-28) 21 commits
> . completion: cache the path to the repository
> . completion: extract repository discovery from __gitdir()
> . completion: don't guard git executions with __gitdir()
> . completion: consolidate silencing errors from git commands
> . completion: don't use __gitdir() for git commands
> . completion: respect 'git -C <path>'
> . completion: fix completion after 'git -C <path>'
> . completion: don't offer commands when 'git --opt' needs an argument
> . rev-parse: add '--absolute-git-dir' option
> . completion: list short refs from a remote given as a URL
> . completion: don't list 'HEAD' when trying refs completion outside of a repo
> . completion: list refs from remote when remote's name matches a directory
> . completion: respect 'git --git-dir=<path>' when listing remote refs
> . completion: fix most spots not respecting 'git --git-dir=<path>'
> . completion: ensure that the repository path given on the command line exists
> . completion tests: add tests for the __git_refs() helper function
> . completion tests: check __gitdir()'s output in the error cases
> . completion tests: consolidate getting path of current working directory
> . completion tests: make the $cur variable local to the test helper functions
> . completion tests: don't add test cruft to the test repository
> . completion: improve __git_refs()'s in-code documentation
>
> Will be rerolled.
> ($gmane/287839)
>
>
> * az/p4-bare-no-rebase (2016-02-19) 1 commit
> - git-p4.py: Don't try to rebase on submit from bare repository
>
> "git p4 submit" attempts to do a rebase, which would fail if done
> in a bare repository. Not doing this rebase would paper over the
> failure, which is what this patch does, but it is unclear what the
> side effect of not rebasing is.
>
> Needs a better explanation.
>
>
> * nd/icase (2016-02-15) 12 commits
> - grep.c: reuse "icase" variable
> - diffcore-pickaxe: support case insensitive match on non-ascii
> - diffcore-pickaxe: "share" regex error handling code
> - grep/pcre: support utf-8
> - gettext: add is_utf8_locale()
> - grep/pcre: prepare locale-dependent tables for icase matching
> - grep/icase: avoid kwsset when -F is specified
> - grep/icase: avoid kwsset on literal non-ascii strings
> - test-regex: expose full regcomp() to the command line
> - test-regex: isolate the bug test code
> - grep: break down an "if" stmt in preparation for next changes
> - grep: allow -F -i combination
>
> "git grep -i" has been taught to fold case in non-ascii locales.
>
> Needs review.
> ($gmane/286137)
>
>
> * ec/annotate-deleted (2015-11-20) 1 commit
> - annotate: skip checking working tree if a revision is provided
>
> Usability fix for annotate-specific "<file> <rev>" syntax with deleted
> files.
>
> Waiting for review.
>
>
> * dg/subtree-rebase-test (2016-01-19) 1 commit
> - contrib/subtree: Add a test for subtree rebase that loses commits
>
> Reviewed up to v5.
> Will be rerolled.
> ($gmane/284426)
>
>
> * js/am-3-merge-recursive-direct (2015-10-12) 2 commits
> - am: make a direct call to merge_recursive
> - merge_recursive_options: introduce the "gently" flag
>
> The merge_recursive_generic() function has been made a bit safer to
> call from inside a process. "git am -3" was taught to make a direct
> call to the function when falling back to three-way merge.
>
> Being able to make a direct call would be good in general, but as a
> performance thing, the change needs to be backed up by numbers.
>
> I haven't gone through the "gently" change with fine toothed comb;
> I can see that the change avoids calling die(), but I haven't made
> sure that the program states (e.g. what's in the in-core index) are
> adjusted sensibly when it returns to the caller instead of dying,
> or the codepaths that used to die() are free of resource leaks.
> The original code certainly did not care the program states at the
> point of dying exactly because it knew it is going to exit, but now
> they have to care, and they need to be audited.
>
> Will be rerolled.
> ($gmane/292205)
>
>
> * dk/gc-more-wo-pack (2016-01-13) 4 commits
> - gc: clean garbage .bitmap files from pack dir
> - t5304: ensure non-garbage files are not deleted
> - t5304: test .bitmap garbage files
> - prepare_packed_git(): find more garbage
>
> Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
> .bitmap and .keep files.
>
> Waiting for a reroll.
> ($gmane/284368).
>
>
> * jc/diff-b-m (2015-02-23) 5 commits
> . WIPWIP
> . WIP: diff-b-m
> - diffcore-rename: allow easier debugging
> - diffcore-rename.c: add locate_rename_src()
> - diffcore-break: allow debugging
>
> "git diff -B -M" produced incorrect patch when the postimage of a
> completely rewritten file is similar to the preimage of a removed
> file; such a resulting file must not be expressed as a rename from
> other place.
>
> The fix in this patch is broken, unfortunately.
> Will discard.
>
>
> * jc/merge-impossible-no-commit (2016-04-26) 2 commits
> - merge: warn --no-commit merge when no new commit is created
> - merge: do not contaminate option_commit with --squash
>
> "git merge --no-commit" silently succeeded when there is no need to
> create any commit, either when you are more recent than the commit
> you tried to merge, or you can fast-forward to the commit you tried
> to merge. The command gives a warning message in such cases.
>
> Just tying loose ends in a discussion. Unless somebody else
> champions this topic, I'll drop it.
>
> Will discard.
>
> --------------------------------------------------
> [Cooking]
>
> * nd/shallow-deepen (2016-06-13) 27 commits
> - fetch, upload-pack: --deepen=N extends shallow boundary by N commits
> - upload-pack: add get_reachable_list()
> - upload-pack: split check_unreachable() in two, prep for get_reachable_list()
> - t5500, t5539: tests for shallow depth excluding a ref
> - clone: define shallow clone boundary with --shallow-exclude
> - fetch: define shallow boundary with --shallow-exclude
> - upload-pack: support define shallow boundary by excluding revisions
> - refs: add expand_ref()
> - t5500, t5539: tests for shallow depth since a specific date
> - clone: define shallow clone boundary based on time with --shallow-since
> - fetch: define shallow boundary with --shallow-since
> - upload-pack: add deepen-since to cut shallow repos based on time
> - shallow.c: implement a generic shallow boundary finder based on rev-list
> - fetch-pack: use a separate flag for fetch in deepening mode
> - fetch-pack.c: mark strings for translating
> - fetch-pack: use a common function for verbose printing
> - fetch-pack: use skip_prefix() instead of starts_with()
> - upload-pack: move rev-list code out of check_non_tip()
> - upload-pack: make check_non_tip() clean things up on error
> - upload-pack: tighten number parsing at "deepen" lines
> - upload-pack: use skip_prefix() instead of starts_with()
> - upload-pack: move "unshallow" sending code out of deepen()
> - upload-pack: remove unused variable "backup"
> - upload-pack: move "shallow" sending code out of deepen()
> - upload-pack: move shallow deepen code out of receive_needs()
> - transport-helper.c: refactor set_helper_option()
> - remote-curl.c: convert fetch_git() to use argv_array
>
> The existing "git fetch --depth=<n>" option was hard to use
> correctly when making the history of an existing shallow clone
> deeper. A new option, "--deepen=<n>", has been added to make this
> easier to use. "git clone" also learned "--shallow-since=<date>"
> and "--shallow-exclude=<tag>" options to make it easier to specify
> "I am interested only in the recent N months worth of history" and
> "Give me only the history since that version".
>
> Rerolled.
>
>
> * jk/avoid-unbounded-alloca (2016-06-07) 1 commit
> - tree-diff: avoid alloca for large allocations
>
> Will merge to 'next'.
>
>
> * jk/send-pack-stdio (2016-06-10) 2 commits
> - write_or_die: remove the unused write_or_whine() function
> - send-pack: use buffered I/O to talk to pack-objects
>
> Code clean-up.
>
> Will merge to 'next'.
>
>
> * pb/commit-editmsg-path (2016-06-09) 1 commit
> - builtin/commit.c: memoize git-path for COMMIT_EDITMSG
>
> Code clean-up.
>
> Will merge to 'next'.
>
>
> * wd/userdiff-css (2016-06-03) 1 commit
> (merged to 'next' on 2016-06-06 at 536102f)
> + userdiff: add built-in pattern for CSS
>
> Update the funcname definition to support css files.
>
> Will merge to 'master' after 2.9 final.
>
>
> * jc/attr-more (2016-06-09) 8 commits
> - attr.c: outline the future plans by heavily commenting
> - attr.c: always pass check[] to collect_some_attrs()
> - attr.c: introduce empty_attr_check_elems()
> - attr.c: correct ugly hack for git_all_attrs()
> - attr.c: rename a local variable check
> - fixup! d5ad6c13
> - attr.c: pass struct git_attr_check down the callchain
> - attr.c: add push_stack() helper
> (this branch uses jc/attr; is tangled with sb/pathspec-label and sb/submodule-default-paths.)
>
> The beginning of long and tortuous journey to clean-up attribute
> subsystem implementation.
>
>
> * jk/rev-list-count-with-bitmap (2016-06-03) 2 commits
> (merged to 'next' on 2016-06-06 at dd9b30f)
> + rev-list: disable bitmaps when "-n" is used with listing objects
> + rev-list: "adjust" results of "--count --use-bitmap-index -n"
>
> "git rev-list --count" whose walk-length is limited with "-n"
> option did not work well with the counting optimized to look at the
> bitmap index.
>
> Will merge to 'master' after 2.9 final.
>
>
> * mh/ref-iterators (2016-06-03) 13 commits
> (merged to 'next' on 2016-06-06 at c8e79dc)
> + for_each_reflog(): reimplement using iterators
> + dir_iterator: new API for iterating over a directory tree
> + for_each_reflog(): don't abort for bad references
> + do_for_each_ref(): reimplement using reference iteration
> + refs: introduce an iterator interface
> + ref_resolves_to_object(): new function
> + entry_resolves_to_object(): rename function from ref_resolves_to_object()
> + get_ref_cache(): only create an instance if there is a submodule
> + remote rm: handle symbolic refs correctly
> + delete_refs(): add a flags argument
> + refs: use name "prefix" consistently
> + do_for_each_ref(): move docstring to the header file
> + refs: remove unnecessary "extern" keywords
> (this branch is used by mh/ref-store; uses mh/split-under-lock; is tangled with mh/update-ref-errors.)
>
> The API to iterate over all the refs (i.e. for_each_ref(), etc.)
> has been revamped.
>
> Will merge to 'master' after 2.9 final.
>
>
> * ew/mboxrd-format-am (2016-06-06) 3 commits
> - am: support --patch-format=mboxrd
> - mailsplit: support unescaping mboxrd messages
> - pretty: support "mboxrd" output format
>
> Teach format-patch and mailsplit (hence "am") how a line that
> happens to begin with "From " in the e-mail message is quoted with
> ">", so that these lines can be restored to their original shape.
>
>
> * lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit
> - receive-pack: send auto-gc output over sideband 2
>
> Allow messages that are generated by auto gc during "git push" on
> the receiving end to be explicitly passed back to the sending end
> over sideband, so that they are shown with "remote: " prefix to
> avoid confusing the users.
>
>
> * mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit
> - cherry-pick: allow to pick to unborn branches
>
> "git cherry-pick A" worked on an unborn branch, but "git
> cherry-pick A..B" didn't.
>
>
> * mj/log-show-signature-conf (2016-06-06) 2 commits
> - log: "--no-show-signature" commmand-line option
> - log: add "log.showsignature" configuration variable
>
> "git log" learns log.showSignature configuration variable, and a
> command line option "--no-show-signature" to countermand it.
>
> The order of the commits in the topic need to be reversed.
>
>
> * 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.
>
>
> * sg/reflog-past-root (2016-06-06) 1 commit
> - reflog: continue walking the reflog past root commits
>
> "git reflog" stopped upon seeing an entry that denotes a branch
> creation event (aka "unborn"), which made it appear as if the
> reflog was truncated.
>
>
> * tb/complete-status (2016-06-10) 3 commits
> - completion: add git status
> - completion: add __git_get_option_value helper
> - completion: factor out untracked file modes into a variable
>
> The completion script (in contrib/) learned to complete "git
> status" options.
>
>
> * tr/doc-tt (2016-06-08) 4 commits
> - doc: change configuration variables format
> - doc: more consistency in environment variables format
> - doc: change environment variables format
> - doc: clearer rule about formatting literals
>
> The documentation set has been updated so that literal commands,
> configuration variables and environment variables are consistently
> typeset in fixed-width font and bold in manpages.
>
> Will merge to 'next'.
>
>
> * vs/prompt-avoid-unset-variable (2016-06-06) 1 commit
> - git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
>
> The git-prompt scriptlet (in contrib/) was not friendly with those
> who uses "set -u", which has been fixed.
>
>
> * rj/compat-regex-size-max-fix (2016-06-06) 1 commit
> - regex: fix a SIZE_MAX macro redefinition warning
>
> A compilation fix.
>
> Will merge to 'next'.
>
>
> * bc/cocci-object-id (2016-06-06) 8 commits
> - merge-recursive: convert merge_recursive_generic to object_id
> - merge-recursive: convert leaf functions to use struct object_id
> - merge-recursive: convert struct merge_file_info to object_id
> - merge-recursive: convert struct stage_data to use object_id
> - Rename struct diff_filespec's sha1_valid member.
> - Convert struct diff_filespec to struct object_id
> - Apply standard object_id Coccinelle transformations.
> - Add basic Coccinelle transforms.
>
> Move from "unsigned char [20]" to "struct object_id" continues,
> with help from an automated tool.
>
>
> * et/add-chmod-x (2016-06-07) 1 commit
> - add: add --chmod=+x / --chmod=-x options
>
> "git update-index --add --chmod=+x file" may be usable as an escape
> hatch, but not a friendly thing to force for people who do need to
> use it regularly. "git add --chmod=+x file" can be used instead.
>
> Will merge to 'next'.
>
>
> * mh/connect (2016-06-06) 10 commits
> - connect: [host:port] is legacy for ssh
> - connect: move ssh command line preparation to a separate function
> - connect: actively reject git:// urls with a user part
> - connect: change the --diag-url output to separate user and host
> - connect: make parse_connect_url() return the user part of the url as a separate value
> - connect: group CONNECT_DIAG_URL handling code
> - connect: make parse_connect_url() return separated host and port
> - connect: re-derive a host:port string from the separate host and port variables
> - connect: call get_host_and_port() earlier
> - connect: document why we sometimes call get_port after get_host_and_port
>
> Ok, folks, is everybody happy with this version?
>
>
> * aq/upload-pack-use-parse-options (2016-05-31) 1 commit
> (merged to 'next' on 2016-06-06 at 505f1ee)
> + upload-pack.c: use parse-options API
>
> "git upload-pack" command has been updated to use the parse-options
> API.
>
> Will merge to 'master' after 2.9 final.
>
>
> * jc/clear-pathspec (2016-06-02) 1 commit
> (merged to 'next' on 2016-06-06 at 9e7e291)
> + pathspec: rename free_pathspec() to clear_pathspec()
>
> We usually call a function that clears the contents a data
> structure X without freeing the structure itself clear_X(), and
> call a function that does clear_X() and also frees it free_X().
> free_pathspec() function has been renamed to clear_pathspec()
> to avoid confusion.
>
> Will merge to 'master' after 2.9 final.
>
>
> * sb/submodule-recommend-shallowness (2016-05-27) 2 commits
> (merged to 'next' on 2016-05-31 at 1ee161c)
> + submodule update: learn `--[no-]recommend-shallow` option
> + submodule-config: keep shallow recommendation around
> (this branch is used by sb/submodule-clone-retry.)
>
> An upstream project can make a recommendation to make only a
> shallow clone for some submodules in the .gitmodules file it ship.
>
> Will merge to 'master' after 2.9 final.
>
>
> * tb/convert-peek-in-index (2016-06-07) 3 commits
> - correct ce_compare_data() in a middle of a merge
> - read-cache: factor out get_sha1_from_index() helper
> - convert: unify the "auto" handling of CRLF
>
> Needs review.
>
>
> * va/i18n-even-more (2016-06-07) 38 commits
> - i18n: branch: mark comment when editing branch description for translation
> - i18n: unmark die messages for translation
> - i18n: submodule: escape shell variables inside eval_gettext
> - i18n: submodule: join strings marked for translation
> - i18n: init-db: join message pieces
> - i18n: remote: allow translations to reorder message
> - i18n: remote: mark URL fallback text for translation
> - i18n: standardise messages
> - i18n: sequencer: add period to error message
> - i18n: merge: change command option help to lowercase
> - i18n: merge: mark messages for translation
> - i18n: notes: mark options for translation
> - i18n: notes: mark strings for translation
> - i18n: transport-helper.c: change N_() call to _()
> - i18n: bisect: mark strings for translation
> - t5523: use test_i18ngrep for negation
> - t4153: fix negated test_i18ngrep call
> - t9003: become resilient to GETTEXT_POISON
> - tests: unpack-trees: update to use test_i18n* functions
> - tests: use test_i18n* functions to suppress false positives
> - i18n: setup: mark strings for translation
> - i18n: rebase-interactive: mark comments of squash for translation
> - i18n: rebase-interactive: mark here-doc strings for translation
> - i18n: rebase-interactive: mark strings for translation
> - i18n: git-sh-setup.sh: mark strings for translation
> - t6030: update to use test_i18ncmp
> - i18n: bisect: simplify error message for i18n
> - i18n: rebase: mark placeholder for translation
> - i18n: rebase: fix marked string to use eval_gettext variant
> - merge-octupus: use die shell function from git-sh-setup.sh
> - i18n: merge-octopus: mark messages for translation
> - i18n: sequencer: mark string for translation
> - i18n: sequencer: mark entire sentences for translation
> - i18n: transport: mark strings for translation
> - i18n: advice: internationalize message for conflicts
> - i18n: advice: mark string about detached head for translation
> - i18n: builtin/remote.c: fix mark for translation
> - Merge branch 'jc/t2300-setup' into HEAD
>
> More markings of messages for i18n, with updates to various tests
> to pass GETTEXT_POISON tests.
>
> One patch from the original submission dropped due to conflicts
> with other topics in flight.
>
>
> * jg/dash-is-last-branch-in-worktree-add (2016-05-31) 1 commit
> (merged to 'next' on 2016-06-02 at 3959ef6)
> + worktree: allow "-" short-hand for @{-1} in add command
>
> "git worktree add" learned that '-' can be used as a short-hand for
> "@{-1}", the previous branch.
>
> Will merge to 'master' after 2.9 final.
>
>
> * dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
> - blame: require 0 context lines while finding moved lines with -M
>
> "git blame -M" missed a single line that was moved within the file.
>
> We may want to squash a test or two to this commit. Volunteers?
>
>
> * nd/worktree-lock (2016-06-13) 6 commits
> - worktree.c: find_worktree() search by path suffix
> - worktree: add "unlock" command
> - worktree: add "lock" command
> - worktree.c: add is_worktree_locked()
> - worktree.c: add is_main_worktree()
> - worktree.c: add find_worktree()
> (this branch uses nd/worktree-cleanup-post-head-protection.)
>
> "git worktree prune" protected worktrees that are marked as
> "locked" by creating a file in a known location. "git worktree"
> command learned a dedicated command pair to create and remoev such
> a file, so that the users do not have to do this with editor.
>
> Ok, folks, is everybody happy with this version?
>
>
> * et/pretty-format-c-auto (2016-05-27) 1 commit
> (merged to 'next' on 2016-05-31 at 1e9c920)
> + format_commit_message: honor `color=auto` for `%C(auto)`
>
> %C(auto) in a custom format string that commands in `git log`
> family takes unconditionally turned the color on, ignoring
> --no-color or --color=auto with output not connected to a tty;
> this was corrected to make the format truly behave as "auto".
>
> Will merge to 'master' after 2.9 final.
>
>
> * ew/daemon-socket-keepalive (2016-05-25) 1 commit
> (merged to 'next' on 2016-05-31 at c32acf1)
> + daemon: enable SO_KEEPALIVE for all sockets
>
> When "git daemon" is run without --[init-]timeout specified, a
> connection from a client that silently goes offline can hang around
> for a long time, wasting resources. The socket-level KEEPALIVE has
> been enabled to allow the OS to notice such failed connections.
>
> Will merge to 'master' after 2.9 final.
>
>
> * jk/upload-pack-hook (2016-06-02) 7 commits
> - upload-pack: provide a hook for running pack-objects
> - t1308: do not get fooled by symbolic links to the source tree
> - config: add a notion of "scope"
> - config: return configset value for current_config_ functions
> - config: set up config_source for command-line config
> - git_config_parse_parameter: refactor cleanup code
> - git_config_with_options: drop "found" counting
>
> Allow a custom "git upload-pack" replacement to respond to
> "fetch/clone" request.
>
> Still under discussion.
> ($gmane/295705).
>
>
> * rs/xdiff-hunk-with-func-line (2016-06-09) 9 commits
> (merged to 'next' on 2016-06-10 at 9ff9ba8)
> + xdiff: fix merging of appended hunk with -W
> (merged to 'next' on 2016-06-02 at 0c2e335)
> + grep: -W: don't extend context to trailing empty lines
> + t7810: add test for grep -W and trailing empty context lines
> + xdiff: don't trim common tail with -W
> + xdiff: -W: don't include common trailing empty lines in context
> + xdiff: ignore empty lines before added functions with -W
> + xdiff: handle appended chunks better with -W
> + xdiff: factor out match_func_rec()
> + t4051: rewrite, add more tests
>
> "git show -W" (extend hunks to cover the entire function, delimited
> by lines that match the "funcname" pattern) used to show the entire
> file when a change added an entire function at the end of the file,
> which has been fixed.
>
> Will merge to 'master' after 2.9 final.
>
>
> * sb/submodule-misc-cleanups (2016-05-25) 1 commit
> (merged to 'next' on 2016-05-31 at 0d07b9c)
> + submodule update: make use of the existing fetch_in_submodule function
>
> Minor simplification.
>
> Will merge to 'master' after 2.9 final.
>
>
> * sb/submodule-default-paths (2016-06-14) 8 commits
> - completion: clone can recurse into submodules
> - clone: add --init-submodule=<pathspec> switch
> - submodule update: add `--init-default-path` switch
> - Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
> - Merge branch 'jc/attr' into sb/submodule-default-paths
> - Merge branch 'sb/clone-shallow-passthru' into sb/submodule-default-paths
> - Merge branch 'sb/submodule-deinit-all' into sb/submodule-default-paths
> - Merge branch 'sb/submodule-parallel-update' into sb/submodule-default-paths
> (this branch uses jc/attr and sb/pathspec-label; is tangled with jc/attr-more.)
>
> Will hold.
>
>
> * ah/no-verify-signature-with-pull-rebase (2016-05-20) 1 commit
> (merged to 'next' on 2016-05-31 at 30add83)
> + pull: warn on --verify-signatures with --rebase
>
> "git pull --rebase --verify-signature" learned to warn the user
> that "--verify-signature" is a no-op.
>
> Will merge to 'master' after 2.9 final.
>
>
> * 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
>
> * jc/attr (2016-05-25) 18 commits
> (merged to 'next' on 2016-05-31 at 5b2f08b)
> + attr: support quoting pathname patterns in C style
> + attr: expose validity check for attribute names
> + attr: add counted string version of git_attr()
> + attr: add counted string version of git_check_attr()
> + attr: retire git_check_attrs() API
> + attr: convert git_check_attrs() callers to use the new API
> + attr: convert git_all_attrs() to use "struct git_attr_check"
> + attr: (re)introduce git_check_attr() and struct git_attr_check
> + attr: rename function and struct related to checking attributes
> + attr.c: plug small leak in parse_attr_line()
> + attr.c: tighten constness around "git_attr" structure
> + attr.c: simplify macroexpand_one()
> + attr.c: mark where #if DEBUG ends more clearly
> + attr.c: complete a sentence in a comment
> + attr.c: explain the lack of attr-name syntax check in parse_attr()
> + attr.c: update a stale comment on "struct match_attr"
> + attr.c: use strchrnul() to scan for one line
> + commit.c: use strchrnul() to scan for one line
> (this branch is used by jc/attr-more, sb/pathspec-label and sb/submodule-default-paths.)
>
> The attributes API has been updated so that it can later be
> optimized using the knowledge of which attributes are queried.
>
>
> * cc/apply-introduce-state (2016-06-06) 50 commits
> (merged to 'next' on 2016-06-06 at 9f6bdcb)
> + builtin/apply: remove misleading comment on lock_file field
> (merged to 'next' on 2016-06-03 at 1ab0cf9)
> + builtin/apply: move 'newfd' global into 'struct apply_state'
> + builtin/apply: add 'lock_file' pointer into 'struct apply_state'
> + builtin/apply: move applying patches into apply_all_patches()
> + builtin/apply: move 'state' check into check_apply_state()
> + builtin/apply: move 'symlink_changes' global into 'struct apply_state'
> + builtin/apply: move 'fn_table' global into 'struct apply_state'
> + builtin/apply: move 'state_linenr' global into 'struct apply_state'
> + builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
> + builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
> + builtin/apply: move 'ws_error_action' into 'struct apply_state'
> + builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
> + builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
> + builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
> + builtin/apply: move 'whitespace_option' into 'struct apply_state'
> + builtin/apply: move 'whitespace_error' global into 'struct apply_state'
> + builtin/apply: move 'root' global into 'struct apply_state'
> + builtin/apply: move 'p_value_known' global into 'struct apply_state'
> + builtin/apply: move 'p_value' global into 'struct apply_state'
> + builtin/apply: move 'has_include' global into 'struct apply_state'
> + builtin/apply: move 'limit_by_name' global into 'struct apply_state'
> + builtin/apply: move 'patch_input_file' global into 'struct apply_state'
> + builtin/apply: move 'apply' global into 'struct apply_state'
> + builtin/apply: move 'p_context' global into 'struct apply_state'
> + builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
> + builtin/apply: move 'line_termination' global into 'struct apply_state'
> + builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
> + builtin/apply: move 'no_add' global into 'struct apply_state'
> + builtin/apply: move 'threeway' global into 'struct apply_state'
> + builtin/apply: move 'summary' global into 'struct apply_state'
> + builtin/apply: move 'numstat' global into 'struct apply_state'
> + builtin/apply: move 'diffstat' global into 'struct apply_state'
> + builtin/apply: move 'cached' global into 'struct apply_state'
> + builtin/apply: move 'allow_overlap' global into 'struct apply_state'
> + builtin/apply: move 'update_index' global into 'struct apply_state'
> + builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
> + builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
> + builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
> + builtin/apply: move 'check_index' global into 'struct apply_state'
> + builtin/apply: move 'check' global into 'struct apply_state'
> + builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
> + builtin/apply: move 'state' init into init_apply_state()
> + builtin/apply: introduce 'struct apply_state' to start libifying
> + builtin/apply: move 'read_stdin' global into cmd_apply()
> + builtin/apply: move 'options' variable into cmd_apply()
> + builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
> + builtin/apply: avoid local variable shadowing 'len' parameter
> + builtin/apply: avoid parameter shadowing 'linenr' global
> + builtin/apply: avoid parameter shadowing 'p_value' global
> + builtin/apply: make gitdiff_verify_name() return void
>
> The "git apply" standalone program is being libified; this is the
> first step to move many state variables into a structure that can
> be explicitly (re)initialized to make the machinery callable more
> than once.
>
> The next step that moves some remaining state variables into the
> structure and turns die()s into an error return that propagates up
> to the caller is not queued yet but in flight. It would be good to
> review the above first and give the remainder of the series a solid
> base to build on.
>
> Will hold.
>
>
> * pb/bisect (2016-05-24) 3 commits
> - bisect--helper: `write_terms` shell function in C
> - bisect: rewrite `check_term_format` shell function in C
> - bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
>
> Beginning of GSoC "git bisect" project.
>
>
> * sb/pathspec-label (2016-06-03) 6 commits
> (merged to 'next' on 2016-06-03 at 362f097)
> + pathspec: disable preload-index when attribute pathspec magic is in use
> + pathspec: allow escaped query values
> (merged to 'next' on 2016-05-31 at e72b604)
> + pathspec: allow querying for attributes
> + pathspec: move prefix check out of the inner loop
> + pathspec: move long magic parsing out of prefix_pathspec
> + Documentation: fix a typo
> (this branch is used by sb/submodule-default-paths; uses jc/attr; is tangled with jc/attr-more.)
>
> The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
> to limit paths that match $pattern further by attribute settings.
> The preload-index mechanism is disabled when the new pathspec magic
> is in use (at least for now), because the attribute subsystem is
> not thread-ready.
>
> Will hold.
>
>
> * 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.)
>
>
> * mh/split-under-lock (2016-05-13) 33 commits
> (merged to 'next' on 2016-06-03 at 2e71330)
> + lock_ref_sha1_basic(): only handle REF_NODEREF mode
> + commit_ref_update(): remove the flags parameter
> + lock_ref_for_update(): don't resolve symrefs
> + lock_ref_for_update(): don't re-read non-symbolic references
> + refs: resolve symbolic refs first
> + ref_transaction_update(): check refname_is_safe() at a minimum
> + unlock_ref(): move definition higher in the file
> + lock_ref_for_update(): new function
> + add_update(): initialize the whole ref_update
> + verify_refname_available(): adjust constness in declaration
> + refs: don't dereference on rename
> + refs: allow log-only updates
> + delete_branches(): use resolve_refdup()
> + ref_transaction_commit(): correctly report close_ref() failure
> + ref_transaction_create(): disallow recursive pruning
> + refs: make error messages more consistent
> + lock_ref_sha1_basic(): remove unneeded local variable
> + read_raw_ref(): move docstring to header file
> + read_raw_ref(): improve docstring
> + read_raw_ref(): rename symref argument to referent
> + read_raw_ref(): clear *type at start of function
> + read_raw_ref(): rename flags argument to type
> + ref_transaction_commit(): remove local variable n
> + rename_ref(): remove unneeded local variable
> + commit_ref_update(): write error message to *err, not stderr
> + refname_is_safe(): insist that the refname already be normalized
> + refname_is_safe(): don't allow the empty string
> + refname_is_safe(): use skip_prefix()
> + remove_dir_recursively(): add docstring
> + safe_create_leading_directories(): improve docstring
> + read_raw_ref(): don't get confused by an empty directory
> + commit_ref(): if there is an empty dir in the way, delete it
> + t1404: demonstrate a bug resolving references
> (this branch is used by mh/ref-iterators, mh/ref-store and mh/update-ref-errors.)
>
> Further preparatory work on the refs API before the pluggable
> backend series can land.
>
> Will merge to 'master' after 2.9 final.
>
>
> * ew/fast-import-unpack-limit (2016-05-29) 2 commits
> (merged to 'next' on 2016-05-29 at af32aba)
> + fast-import: invalidate pack_id references after loosening
> (merged to 'next' on 2016-05-11 at ffd4efb)
> + fast-import: implement unpack limit
>
> "git fast-import" learned the same performance trick to avoid
> creating too small a packfile as "git fetch" and "git push" have,
> using *.unpackLimit configuration.
>
> Will hold.
>
>
> * jc/send-email-skip-backup (2016-04-12) 1 commit
> - send-email: detect and offer to skip backup files
>
> A careless invocation of "git send-email directory/" after editing
> 0001-change.patch with an editor often ends up sending both
> 0001-change.patch and its backup file, 0001-change.patch~, causing
> embarrassment and a minor confusion. Detect such an input and
> offer to skip the backup files when sending the patches out.
>
> Needs review.
>
>
> * kn/ref-filter-branch-list (2016-05-17) 17 commits
> - branch: implement '--format' option
> - branch: use ref-filter printing APIs
> - branch, tag: use porcelain output
> - ref-filter: allow porcelain to translate messages in the output
> - ref-filter: add `:dir` and `:base` options for ref printing atoms
> - ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
> - ref-filter: introduce symref_atom_parser() and refname_atom_parser()
> - ref-filter: introduce refname_atom_parser_internal()
> - ref-filter: make "%(symref)" atom work with the ':short' modifier
> - ref-filter: add support for %(upstream:track,nobracket)
> - ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
> - ref-filter: introduce format_ref_array_item()
> - ref-filter: move get_head_description() from branch.c
> - ref-filter: modify "%(objectname:short)" to take length
> - ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
> - ref-filter: include reference to 'used_atom' within 'atom_value'
> - ref-filter: implement %(if), %(then), and %(else) atoms
>
> The code to list branches in "git branch" has been consolidated
> with the more generic ref-filter API.
>
> Rerolled.
> Needs review.
>
>
> * dt/index-helper (2016-05-20) 20 commits
> - index-helper: indexhelper.exitafter config
> - trace: measure where the time is spent in the index-heavy operations
> - index-helper: optionally automatically run
> - index-helper: autorun mode
> - index-helper: don't run if already running
> - index-helper: kill mode
> - watchman: add a config option to enable the extension
> - unpack-trees: preserve index extensions
> - update-index: enable/disable watchman support
> - index-helper: use watchman to avoid refreshing index with lstat()
> - watchman: support watchman to reduce index refresh cost
> - read-cache: add watchman 'WAMA' extension
> - index-helper: log warnings
> - index-helper: add --detach
> - daemonize(): set a flag before exiting the main process
> - index-helper: add --strict
> - index-helper: new daemon for caching index and related stuff
> - pkt-line: add gentle version of packet_write
> - read-cache: allow to keep mmap'd memory after reading
> - read-cache.c: fix constness of verify_hdr()
>
> A new "index-helper" daemon has been introduced to give newly
> spawned Git process a quicker access to the data in the index, and
> optionally interface with the watchman daemon to further reduce the
> refresh cost.
>
> Rerolled.
> ($gmane/295106).
>
>
> * jc/bundle (2016-03-03) 6 commits
> - index-pack: --clone-bundle option
> - Merge branch 'jc/index-pack' into jc/bundle
> - bundle v3: the beginning
> - bundle: keep a copy of bundle file name in the in-core bundle header
> - bundle: plug resource leak
> - bundle doc: 'verify' is not about verifying the bundle
>
> The beginning of "split bundle", which could be one of the
> ingredients to allow "git clone" traffic off of the core server
> network to CDN.
>
>
> * jc/merge-drop-old-syntax (2015-04-29) 1 commit
> - merge: drop 'git merge <message> HEAD <commit>' syntax
>
> Stop supporting "git merge <message> HEAD <commit>" syntax that has
> been deprecated since October 2007, and issues a deprecation
> warning message since v2.5.0.
>
> It has been reported that git-gui still uses the deprecated syntax,
> which needs to be fixed before this final step can proceed.
> ($gmane/282594)
>
> --------------------------------------------------
> [Discarded]
>
> * mh/connect-leak (2016-04-28) 1 commit
> . git_connect(): fix memory leak with CONNECT_DIAG_URL
>
> Is already made obsolete with a patch in flight under discussion.
> ($gmane/292962)
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [relevance 0%]
* Re: What's cooking in git.git (Jun 2016, #04; Tue, 14)
2016-06-14 22:08 3% What's cooking in git.git (Jun 2016, #04; Tue, 14) Junio C Hamano
@ 2016-06-15 2:36 0% ` Mike Hommey
2016-06-15 7:35 0% ` Elia Pinto
1 sibling, 0 replies; 22+ results
From: Mike Hommey @ 2016-06-15 2:36 UTC (permalink / raw
To: Junio C Hamano; +Cc: git
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()
> - 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 arguments when appropriate
> - bisect: replace clear_distance() by unique markers
> - bisect: use struct node_data array instead of int array
> - bisect: get rid of recursion in count_distance()
> - bisect: make algorithm behavior independent of DEBUG_BISECT
> - bisect: make bisect compile if DEBUG_BISECT is set
> - bisect: plug the biggest memory leak
> - bisect: add test for the bisect algorithm
> - t6030: generalize test to not rely on current implementation
> - t: use test_cmp_rev() where appropriate
> - t/test-lib-functions.sh: generalize test_cmp_rev
> - bisect: allow 'bisect run' if no good commit is known
> - bisect: write about `bisect next` in documentation
>
> The internal algorithm used in "git bisect" to find the next commit
> to check has been optimized greatly.
>
> Expecting a reroll.
> ($gmane/291163)
>
>
> * sg/completion-updates (2016-02-28) 21 commits
> . completion: cache the path to the repository
> . completion: extract repository discovery from __gitdir()
> . completion: don't guard git executions with __gitdir()
> . completion: consolidate silencing errors from git commands
> . completion: don't use __gitdir() for git commands
> . completion: respect 'git -C <path>'
> . completion: fix completion after 'git -C <path>'
> . completion: don't offer commands when 'git --opt' needs an argument
> . rev-parse: add '--absolute-git-dir' option
> . completion: list short refs from a remote given as a URL
> . completion: don't list 'HEAD' when trying refs completion outside of a repo
> . completion: list refs from remote when remote's name matches a directory
> . completion: respect 'git --git-dir=<path>' when listing remote refs
> . completion: fix most spots not respecting 'git --git-dir=<path>'
> . completion: ensure that the repository path given on the command line exists
> . completion tests: add tests for the __git_refs() helper function
> . completion tests: check __gitdir()'s output in the error cases
> . completion tests: consolidate getting path of current working directory
> . completion tests: make the $cur variable local to the test helper functions
> . completion tests: don't add test cruft to the test repository
> . completion: improve __git_refs()'s in-code documentation
>
> Will be rerolled.
> ($gmane/287839)
>
>
> * az/p4-bare-no-rebase (2016-02-19) 1 commit
> - git-p4.py: Don't try to rebase on submit from bare repository
>
> "git p4 submit" attempts to do a rebase, which would fail if done
> in a bare repository. Not doing this rebase would paper over the
> failure, which is what this patch does, but it is unclear what the
> side effect of not rebasing is.
>
> Needs a better explanation.
>
>
> * nd/icase (2016-02-15) 12 commits
> - grep.c: reuse "icase" variable
> - diffcore-pickaxe: support case insensitive match on non-ascii
> - diffcore-pickaxe: "share" regex error handling code
> - grep/pcre: support utf-8
> - gettext: add is_utf8_locale()
> - grep/pcre: prepare locale-dependent tables for icase matching
> - grep/icase: avoid kwsset when -F is specified
> - grep/icase: avoid kwsset on literal non-ascii strings
> - test-regex: expose full regcomp() to the command line
> - test-regex: isolate the bug test code
> - grep: break down an "if" stmt in preparation for next changes
> - grep: allow -F -i combination
>
> "git grep -i" has been taught to fold case in non-ascii locales.
>
> Needs review.
> ($gmane/286137)
>
>
> * ec/annotate-deleted (2015-11-20) 1 commit
> - annotate: skip checking working tree if a revision is provided
>
> Usability fix for annotate-specific "<file> <rev>" syntax with deleted
> files.
>
> Waiting for review.
>
>
> * dg/subtree-rebase-test (2016-01-19) 1 commit
> - contrib/subtree: Add a test for subtree rebase that loses commits
>
> Reviewed up to v5.
> Will be rerolled.
> ($gmane/284426)
>
>
> * js/am-3-merge-recursive-direct (2015-10-12) 2 commits
> - am: make a direct call to merge_recursive
> - merge_recursive_options: introduce the "gently" flag
>
> The merge_recursive_generic() function has been made a bit safer to
> call from inside a process. "git am -3" was taught to make a direct
> call to the function when falling back to three-way merge.
>
> Being able to make a direct call would be good in general, but as a
> performance thing, the change needs to be backed up by numbers.
>
> I haven't gone through the "gently" change with fine toothed comb;
> I can see that the change avoids calling die(), but I haven't made
> sure that the program states (e.g. what's in the in-core index) are
> adjusted sensibly when it returns to the caller instead of dying,
> or the codepaths that used to die() are free of resource leaks.
> The original code certainly did not care the program states at the
> point of dying exactly because it knew it is going to exit, but now
> they have to care, and they need to be audited.
>
> Will be rerolled.
> ($gmane/292205)
>
>
> * dk/gc-more-wo-pack (2016-01-13) 4 commits
> - gc: clean garbage .bitmap files from pack dir
> - t5304: ensure non-garbage files are not deleted
> - t5304: test .bitmap garbage files
> - prepare_packed_git(): find more garbage
>
> Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
> .bitmap and .keep files.
>
> Waiting for a reroll.
> ($gmane/284368).
>
>
> * jc/diff-b-m (2015-02-23) 5 commits
> . WIPWIP
> . WIP: diff-b-m
> - diffcore-rename: allow easier debugging
> - diffcore-rename.c: add locate_rename_src()
> - diffcore-break: allow debugging
>
> "git diff -B -M" produced incorrect patch when the postimage of a
> completely rewritten file is similar to the preimage of a removed
> file; such a resulting file must not be expressed as a rename from
> other place.
>
> The fix in this patch is broken, unfortunately.
> Will discard.
>
>
> * jc/merge-impossible-no-commit (2016-04-26) 2 commits
> - merge: warn --no-commit merge when no new commit is created
> - merge: do not contaminate option_commit with --squash
>
> "git merge --no-commit" silently succeeded when there is no need to
> create any commit, either when you are more recent than the commit
> you tried to merge, or you can fast-forward to the commit you tried
> to merge. The command gives a warning message in such cases.
>
> Just tying loose ends in a discussion. Unless somebody else
> champions this topic, I'll drop it.
>
> Will discard.
>
> --------------------------------------------------
> [Cooking]
>
> * nd/shallow-deepen (2016-06-13) 27 commits
> - fetch, upload-pack: --deepen=N extends shallow boundary by N commits
> - upload-pack: add get_reachable_list()
> - upload-pack: split check_unreachable() in two, prep for get_reachable_list()
> - t5500, t5539: tests for shallow depth excluding a ref
> - clone: define shallow clone boundary with --shallow-exclude
> - fetch: define shallow boundary with --shallow-exclude
> - upload-pack: support define shallow boundary by excluding revisions
> - refs: add expand_ref()
> - t5500, t5539: tests for shallow depth since a specific date
> - clone: define shallow clone boundary based on time with --shallow-since
> - fetch: define shallow boundary with --shallow-since
> - upload-pack: add deepen-since to cut shallow repos based on time
> - shallow.c: implement a generic shallow boundary finder based on rev-list
> - fetch-pack: use a separate flag for fetch in deepening mode
> - fetch-pack.c: mark strings for translating
> - fetch-pack: use a common function for verbose printing
> - fetch-pack: use skip_prefix() instead of starts_with()
> - upload-pack: move rev-list code out of check_non_tip()
> - upload-pack: make check_non_tip() clean things up on error
> - upload-pack: tighten number parsing at "deepen" lines
> - upload-pack: use skip_prefix() instead of starts_with()
> - upload-pack: move "unshallow" sending code out of deepen()
> - upload-pack: remove unused variable "backup"
> - upload-pack: move "shallow" sending code out of deepen()
> - upload-pack: move shallow deepen code out of receive_needs()
> - transport-helper.c: refactor set_helper_option()
> - remote-curl.c: convert fetch_git() to use argv_array
>
> The existing "git fetch --depth=<n>" option was hard to use
> correctly when making the history of an existing shallow clone
> deeper. A new option, "--deepen=<n>", has been added to make this
> easier to use. "git clone" also learned "--shallow-since=<date>"
> and "--shallow-exclude=<tag>" options to make it easier to specify
> "I am interested only in the recent N months worth of history" and
> "Give me only the history since that version".
>
> Rerolled.
>
>
> * jk/avoid-unbounded-alloca (2016-06-07) 1 commit
> - tree-diff: avoid alloca for large allocations
>
> Will merge to 'next'.
>
>
> * jk/send-pack-stdio (2016-06-10) 2 commits
> - write_or_die: remove the unused write_or_whine() function
> - send-pack: use buffered I/O to talk to pack-objects
>
> Code clean-up.
>
> Will merge to 'next'.
>
>
> * pb/commit-editmsg-path (2016-06-09) 1 commit
> - builtin/commit.c: memoize git-path for COMMIT_EDITMSG
>
> Code clean-up.
>
> Will merge to 'next'.
>
>
> * wd/userdiff-css (2016-06-03) 1 commit
> (merged to 'next' on 2016-06-06 at 536102f)
> + userdiff: add built-in pattern for CSS
>
> Update the funcname definition to support css files.
>
> Will merge to 'master' after 2.9 final.
>
>
> * jc/attr-more (2016-06-09) 8 commits
> - attr.c: outline the future plans by heavily commenting
> - attr.c: always pass check[] to collect_some_attrs()
> - attr.c: introduce empty_attr_check_elems()
> - attr.c: correct ugly hack for git_all_attrs()
> - attr.c: rename a local variable check
> - fixup! d5ad6c13
> - attr.c: pass struct git_attr_check down the callchain
> - attr.c: add push_stack() helper
> (this branch uses jc/attr; is tangled with sb/pathspec-label and sb/submodule-default-paths.)
>
> The beginning of long and tortuous journey to clean-up attribute
> subsystem implementation.
>
>
> * jk/rev-list-count-with-bitmap (2016-06-03) 2 commits
> (merged to 'next' on 2016-06-06 at dd9b30f)
> + rev-list: disable bitmaps when "-n" is used with listing objects
> + rev-list: "adjust" results of "--count --use-bitmap-index -n"
>
> "git rev-list --count" whose walk-length is limited with "-n"
> option did not work well with the counting optimized to look at the
> bitmap index.
>
> Will merge to 'master' after 2.9 final.
>
>
> * mh/ref-iterators (2016-06-03) 13 commits
> (merged to 'next' on 2016-06-06 at c8e79dc)
> + for_each_reflog(): reimplement using iterators
> + dir_iterator: new API for iterating over a directory tree
> + for_each_reflog(): don't abort for bad references
> + do_for_each_ref(): reimplement using reference iteration
> + refs: introduce an iterator interface
> + ref_resolves_to_object(): new function
> + entry_resolves_to_object(): rename function from ref_resolves_to_object()
> + get_ref_cache(): only create an instance if there is a submodule
> + remote rm: handle symbolic refs correctly
> + delete_refs(): add a flags argument
> + refs: use name "prefix" consistently
> + do_for_each_ref(): move docstring to the header file
> + refs: remove unnecessary "extern" keywords
> (this branch is used by mh/ref-store; uses mh/split-under-lock; is tangled with mh/update-ref-errors.)
>
> The API to iterate over all the refs (i.e. for_each_ref(), etc.)
> has been revamped.
>
> Will merge to 'master' after 2.9 final.
>
>
> * ew/mboxrd-format-am (2016-06-06) 3 commits
> - am: support --patch-format=mboxrd
> - mailsplit: support unescaping mboxrd messages
> - pretty: support "mboxrd" output format
>
> Teach format-patch and mailsplit (hence "am") how a line that
> happens to begin with "From " in the e-mail message is quoted with
> ">", so that these lines can be restored to their original shape.
>
>
> * lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit
> - receive-pack: send auto-gc output over sideband 2
>
> Allow messages that are generated by auto gc during "git push" on
> the receiving end to be explicitly passed back to the sending end
> over sideband, so that they are shown with "remote: " prefix to
> avoid confusing the users.
>
>
> * mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit
> - cherry-pick: allow to pick to unborn branches
>
> "git cherry-pick A" worked on an unborn branch, but "git
> cherry-pick A..B" didn't.
>
>
> * mj/log-show-signature-conf (2016-06-06) 2 commits
> - log: "--no-show-signature" commmand-line option
> - log: add "log.showsignature" configuration variable
>
> "git log" learns log.showSignature configuration variable, and a
> command line option "--no-show-signature" to countermand it.
>
> The order of the commits in the topic need to be reversed.
>
>
> * 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.
>
>
> * sg/reflog-past-root (2016-06-06) 1 commit
> - reflog: continue walking the reflog past root commits
>
> "git reflog" stopped upon seeing an entry that denotes a branch
> creation event (aka "unborn"), which made it appear as if the
> reflog was truncated.
>
>
> * tb/complete-status (2016-06-10) 3 commits
> - completion: add git status
> - completion: add __git_get_option_value helper
> - completion: factor out untracked file modes into a variable
>
> The completion script (in contrib/) learned to complete "git
> status" options.
>
>
> * tr/doc-tt (2016-06-08) 4 commits
> - doc: change configuration variables format
> - doc: more consistency in environment variables format
> - doc: change environment variables format
> - doc: clearer rule about formatting literals
>
> The documentation set has been updated so that literal commands,
> configuration variables and environment variables are consistently
> typeset in fixed-width font and bold in manpages.
>
> Will merge to 'next'.
>
>
> * vs/prompt-avoid-unset-variable (2016-06-06) 1 commit
> - git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
>
> The git-prompt scriptlet (in contrib/) was not friendly with those
> who uses "set -u", which has been fixed.
>
>
> * rj/compat-regex-size-max-fix (2016-06-06) 1 commit
> - regex: fix a SIZE_MAX macro redefinition warning
>
> A compilation fix.
>
> Will merge to 'next'.
>
>
> * bc/cocci-object-id (2016-06-06) 8 commits
> - merge-recursive: convert merge_recursive_generic to object_id
> - merge-recursive: convert leaf functions to use struct object_id
> - merge-recursive: convert struct merge_file_info to object_id
> - merge-recursive: convert struct stage_data to use object_id
> - Rename struct diff_filespec's sha1_valid member.
> - Convert struct diff_filespec to struct object_id
> - Apply standard object_id Coccinelle transformations.
> - Add basic Coccinelle transforms.
>
> Move from "unsigned char [20]" to "struct object_id" continues,
> with help from an automated tool.
>
>
> * et/add-chmod-x (2016-06-07) 1 commit
> - add: add --chmod=+x / --chmod=-x options
>
> "git update-index --add --chmod=+x file" may be usable as an escape
> hatch, but not a friendly thing to force for people who do need to
> use it regularly. "git add --chmod=+x file" can be used instead.
>
> Will merge to 'next'.
>
>
> * mh/connect (2016-06-06) 10 commits
> - connect: [host:port] is legacy for ssh
> - connect: move ssh command line preparation to a separate function
> - connect: actively reject git:// urls with a user part
> - connect: change the --diag-url output to separate user and host
> - connect: make parse_connect_url() return the user part of the url as a separate value
> - connect: group CONNECT_DIAG_URL handling code
> - connect: make parse_connect_url() return separated host and port
> - connect: re-derive a host:port string from the separate host and port variables
> - connect: call get_host_and_port() earlier
> - 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
Mike
^ permalink raw reply [relevance 0%]
* What's cooking in git.git (Jun 2016, #04; Tue, 14)
@ 2016-06-14 22:08 3% Junio C Hamano
2016-06-15 2:36 0% ` Mike Hommey
2016-06-15 7:35 0% ` Elia Pinto
0 siblings, 2 replies; 22+ results
From: Junio C Hamano @ 2016-06-14 22:08 UTC (permalink / raw
To: git
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 arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* sg/completion-updates (2016-02-28) 21 commits
. completion: cache the path to the repository
. completion: extract repository discovery from __gitdir()
. completion: don't guard git executions with __gitdir()
. completion: consolidate silencing errors from git commands
. completion: don't use __gitdir() for git commands
. completion: respect 'git -C <path>'
. completion: fix completion after 'git -C <path>'
. completion: don't offer commands when 'git --opt' needs an argument
. rev-parse: add '--absolute-git-dir' option
. completion: list short refs from a remote given as a URL
. completion: don't list 'HEAD' when trying refs completion outside of a repo
. completion: list refs from remote when remote's name matches a directory
. completion: respect 'git --git-dir=<path>' when listing remote refs
. completion: fix most spots not respecting 'git --git-dir=<path>'
. completion: ensure that the repository path given on the command line exists
. completion tests: add tests for the __git_refs() helper function
. completion tests: check __gitdir()'s output in the error cases
. completion tests: consolidate getting path of current working directory
. completion tests: make the $cur variable local to the test helper functions
. completion tests: don't add test cruft to the test repository
. completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
Will be rerolled.
($gmane/292205)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
* jc/merge-impossible-no-commit (2016-04-26) 2 commits
- merge: warn --no-commit merge when no new commit is created
- merge: do not contaminate option_commit with --squash
"git merge --no-commit" silently succeeded when there is no need to
create any commit, either when you are more recent than the commit
you tried to merge, or you can fast-forward to the commit you tried
to merge. The command gives a warning message in such cases.
Just tying loose ends in a discussion. Unless somebody else
champions this topic, I'll drop it.
Will discard.
--------------------------------------------------
[Cooking]
* nd/shallow-deepen (2016-06-13) 27 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: make check_non_tip() clean things up on error
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Rerolled.
* jk/avoid-unbounded-alloca (2016-06-07) 1 commit
- tree-diff: avoid alloca for large allocations
Will merge to 'next'.
* jk/send-pack-stdio (2016-06-10) 2 commits
- write_or_die: remove the unused write_or_whine() function
- send-pack: use buffered I/O to talk to pack-objects
Code clean-up.
Will merge to 'next'.
* pb/commit-editmsg-path (2016-06-09) 1 commit
- builtin/commit.c: memoize git-path for COMMIT_EDITMSG
Code clean-up.
Will merge to 'next'.
* wd/userdiff-css (2016-06-03) 1 commit
(merged to 'next' on 2016-06-06 at 536102f)
+ userdiff: add built-in pattern for CSS
Update the funcname definition to support css files.
Will merge to 'master' after 2.9 final.
* jc/attr-more (2016-06-09) 8 commits
- attr.c: outline the future plans by heavily commenting
- attr.c: always pass check[] to collect_some_attrs()
- attr.c: introduce empty_attr_check_elems()
- attr.c: correct ugly hack for git_all_attrs()
- attr.c: rename a local variable check
- fixup! d5ad6c13
- attr.c: pass struct git_attr_check down the callchain
- attr.c: add push_stack() helper
(this branch uses jc/attr; is tangled with sb/pathspec-label and sb/submodule-default-paths.)
The beginning of long and tortuous journey to clean-up attribute
subsystem implementation.
* jk/rev-list-count-with-bitmap (2016-06-03) 2 commits
(merged to 'next' on 2016-06-06 at dd9b30f)
+ rev-list: disable bitmaps when "-n" is used with listing objects
+ rev-list: "adjust" results of "--count --use-bitmap-index -n"
"git rev-list --count" whose walk-length is limited with "-n"
option did not work well with the counting optimized to look at the
bitmap index.
Will merge to 'master' after 2.9 final.
* mh/ref-iterators (2016-06-03) 13 commits
(merged to 'next' on 2016-06-06 at c8e79dc)
+ for_each_reflog(): reimplement using iterators
+ dir_iterator: new API for iterating over a directory tree
+ for_each_reflog(): don't abort for bad references
+ do_for_each_ref(): reimplement using reference iteration
+ refs: introduce an iterator interface
+ ref_resolves_to_object(): new function
+ entry_resolves_to_object(): rename function from ref_resolves_to_object()
+ get_ref_cache(): only create an instance if there is a submodule
+ remote rm: handle symbolic refs correctly
+ delete_refs(): add a flags argument
+ refs: use name "prefix" consistently
+ do_for_each_ref(): move docstring to the header file
+ refs: remove unnecessary "extern" keywords
(this branch is used by mh/ref-store; uses mh/split-under-lock; is tangled with mh/update-ref-errors.)
The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
Will merge to 'master' after 2.9 final.
* ew/mboxrd-format-am (2016-06-06) 3 commits
- am: support --patch-format=mboxrd
- mailsplit: support unescaping mboxrd messages
- pretty: support "mboxrd" output format
Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
* lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit
- receive-pack: send auto-gc output over sideband 2
Allow messages that are generated by auto gc during "git push" on
the receiving end to be explicitly passed back to the sending end
over sideband, so that they are shown with "remote: " prefix to
avoid confusing the users.
* mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit
- cherry-pick: allow to pick to unborn branches
"git cherry-pick A" worked on an unborn branch, but "git
cherry-pick A..B" didn't.
* mj/log-show-signature-conf (2016-06-06) 2 commits
- log: "--no-show-signature" commmand-line option
- log: add "log.showsignature" configuration variable
"git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
The order of the commits in the topic need to be reversed.
* 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.
* sg/reflog-past-root (2016-06-06) 1 commit
- reflog: continue walking the reflog past root commits
"git reflog" stopped upon seeing an entry that denotes a branch
creation event (aka "unborn"), which made it appear as if the
reflog was truncated.
* tb/complete-status (2016-06-10) 3 commits
- completion: add git status
- completion: add __git_get_option_value helper
- completion: factor out untracked file modes into a variable
The completion script (in contrib/) learned to complete "git
status" options.
* tr/doc-tt (2016-06-08) 4 commits
- doc: change configuration variables format
- doc: more consistency in environment variables format
- doc: change environment variables format
- doc: clearer rule about formatting literals
The documentation set has been updated so that literal commands,
configuration variables and environment variables are consistently
typeset in fixed-width font and bold in manpages.
Will merge to 'next'.
* vs/prompt-avoid-unset-variable (2016-06-06) 1 commit
- git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
The git-prompt scriptlet (in contrib/) was not friendly with those
who uses "set -u", which has been fixed.
* rj/compat-regex-size-max-fix (2016-06-06) 1 commit
- regex: fix a SIZE_MAX macro redefinition warning
A compilation fix.
Will merge to 'next'.
* bc/cocci-object-id (2016-06-06) 8 commits
- merge-recursive: convert merge_recursive_generic to object_id
- merge-recursive: convert leaf functions to use struct object_id
- merge-recursive: convert struct merge_file_info to object_id
- merge-recursive: convert struct stage_data to use object_id
- Rename struct diff_filespec's sha1_valid member.
- Convert struct diff_filespec to struct object_id
- Apply standard object_id Coccinelle transformations.
- Add basic Coccinelle transforms.
Move from "unsigned char [20]" to "struct object_id" continues,
with help from an automated tool.
* et/add-chmod-x (2016-06-07) 1 commit
- add: add --chmod=+x / --chmod=-x options
"git update-index --add --chmod=+x file" may be usable as an escape
hatch, but not a friendly thing to force for people who do need to
use it regularly. "git add --chmod=+x file" can be used instead.
Will merge to 'next'.
* mh/connect (2016-06-06) 10 commits
- connect: [host:port] is legacy for ssh
- connect: move ssh command line preparation to a separate function
- connect: actively reject git:// urls with a user part
- connect: change the --diag-url output to separate user and host
- connect: make parse_connect_url() return the user part of the url as a separate value
- connect: group CONNECT_DIAG_URL handling code
- connect: make parse_connect_url() return separated host and port
- connect: re-derive a host:port string from the separate host and port variables
- connect: call get_host_and_port() earlier
- connect: document why we sometimes call get_port after get_host_and_port
Ok, folks, is everybody happy with this version?
* aq/upload-pack-use-parse-options (2016-05-31) 1 commit
(merged to 'next' on 2016-06-06 at 505f1ee)
+ upload-pack.c: use parse-options API
"git upload-pack" command has been updated to use the parse-options
API.
Will merge to 'master' after 2.9 final.
* jc/clear-pathspec (2016-06-02) 1 commit
(merged to 'next' on 2016-06-06 at 9e7e291)
+ pathspec: rename free_pathspec() to clear_pathspec()
We usually call a function that clears the contents a data
structure X without freeing the structure itself clear_X(), and
call a function that does clear_X() and also frees it free_X().
free_pathspec() function has been renamed to clear_pathspec()
to avoid confusion.
Will merge to 'master' after 2.9 final.
* sb/submodule-recommend-shallowness (2016-05-27) 2 commits
(merged to 'next' on 2016-05-31 at 1ee161c)
+ submodule update: learn `--[no-]recommend-shallow` option
+ submodule-config: keep shallow recommendation around
(this branch is used by sb/submodule-clone-retry.)
An upstream project can make a recommendation to make only a
shallow clone for some submodules in the .gitmodules file it ship.
Will merge to 'master' after 2.9 final.
* tb/convert-peek-in-index (2016-06-07) 3 commits
- correct ce_compare_data() in a middle of a merge
- read-cache: factor out get_sha1_from_index() helper
- convert: unify the "auto" handling of CRLF
Needs review.
* va/i18n-even-more (2016-06-07) 38 commits
- i18n: branch: mark comment when editing branch description for translation
- i18n: unmark die messages for translation
- i18n: submodule: escape shell variables inside eval_gettext
- i18n: submodule: join strings marked for translation
- i18n: init-db: join message pieces
- i18n: remote: allow translations to reorder message
- i18n: remote: mark URL fallback text for translation
- i18n: standardise messages
- i18n: sequencer: add period to error message
- i18n: merge: change command option help to lowercase
- i18n: merge: mark messages for translation
- i18n: notes: mark options for translation
- i18n: notes: mark strings for translation
- i18n: transport-helper.c: change N_() call to _()
- i18n: bisect: mark strings for translation
- t5523: use test_i18ngrep for negation
- t4153: fix negated test_i18ngrep call
- t9003: become resilient to GETTEXT_POISON
- tests: unpack-trees: update to use test_i18n* functions
- tests: use test_i18n* functions to suppress false positives
- i18n: setup: mark strings for translation
- i18n: rebase-interactive: mark comments of squash for translation
- i18n: rebase-interactive: mark here-doc strings for translation
- i18n: rebase-interactive: mark strings for translation
- i18n: git-sh-setup.sh: mark strings for translation
- t6030: update to use test_i18ncmp
- i18n: bisect: simplify error message for i18n
- i18n: rebase: mark placeholder for translation
- i18n: rebase: fix marked string to use eval_gettext variant
- merge-octupus: use die shell function from git-sh-setup.sh
- i18n: merge-octopus: mark messages for translation
- i18n: sequencer: mark string for translation
- i18n: sequencer: mark entire sentences for translation
- i18n: transport: mark strings for translation
- i18n: advice: internationalize message for conflicts
- i18n: advice: mark string about detached head for translation
- i18n: builtin/remote.c: fix mark for translation
- Merge branch 'jc/t2300-setup' into HEAD
More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
One patch from the original submission dropped due to conflicts
with other topics in flight.
* jg/dash-is-last-branch-in-worktree-add (2016-05-31) 1 commit
(merged to 'next' on 2016-06-02 at 3959ef6)
+ worktree: allow "-" short-hand for @{-1} in add command
"git worktree add" learned that '-' can be used as a short-hand for
"@{-1}", the previous branch.
Will merge to 'master' after 2.9 final.
* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
- blame: require 0 context lines while finding moved lines with -M
"git blame -M" missed a single line that was moved within the file.
We may want to squash a test or two to this commit. Volunteers?
* nd/worktree-lock (2016-06-13) 6 commits
- worktree.c: find_worktree() search by path suffix
- worktree: add "unlock" command
- worktree: add "lock" command
- worktree.c: add is_worktree_locked()
- worktree.c: add is_main_worktree()
- worktree.c: add find_worktree()
(this branch uses nd/worktree-cleanup-post-head-protection.)
"git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location. "git worktree"
command learned a dedicated command pair to create and remoev such
a file, so that the users do not have to do this with editor.
Ok, folks, is everybody happy with this version?
* et/pretty-format-c-auto (2016-05-27) 1 commit
(merged to 'next' on 2016-05-31 at 1e9c920)
+ format_commit_message: honor `color=auto` for `%C(auto)`
%C(auto) in a custom format string that commands in `git log`
family takes unconditionally turned the color on, ignoring
--no-color or --color=auto with output not connected to a tty;
this was corrected to make the format truly behave as "auto".
Will merge to 'master' after 2.9 final.
* ew/daemon-socket-keepalive (2016-05-25) 1 commit
(merged to 'next' on 2016-05-31 at c32acf1)
+ daemon: enable SO_KEEPALIVE for all sockets
When "git daemon" is run without --[init-]timeout specified, a
connection from a client that silently goes offline can hang around
for a long time, wasting resources. The socket-level KEEPALIVE has
been enabled to allow the OS to notice such failed connections.
Will merge to 'master' after 2.9 final.
* jk/upload-pack-hook (2016-06-02) 7 commits
- upload-pack: provide a hook for running pack-objects
- t1308: do not get fooled by symbolic links to the source tree
- config: add a notion of "scope"
- config: return configset value for current_config_ functions
- config: set up config_source for command-line config
- git_config_parse_parameter: refactor cleanup code
- git_config_with_options: drop "found" counting
Allow a custom "git upload-pack" replacement to respond to
"fetch/clone" request.
Still under discussion.
($gmane/295705).
* rs/xdiff-hunk-with-func-line (2016-06-09) 9 commits
(merged to 'next' on 2016-06-10 at 9ff9ba8)
+ xdiff: fix merging of appended hunk with -W
(merged to 'next' on 2016-06-02 at 0c2e335)
+ grep: -W: don't extend context to trailing empty lines
+ t7810: add test for grep -W and trailing empty context lines
+ xdiff: don't trim common tail with -W
+ xdiff: -W: don't include common trailing empty lines in context
+ xdiff: ignore empty lines before added functions with -W
+ xdiff: handle appended chunks better with -W
+ xdiff: factor out match_func_rec()
+ t4051: rewrite, add more tests
"git show -W" (extend hunks to cover the entire function, delimited
by lines that match the "funcname" pattern) used to show the entire
file when a change added an entire function at the end of the file,
which has been fixed.
Will merge to 'master' after 2.9 final.
* sb/submodule-misc-cleanups (2016-05-25) 1 commit
(merged to 'next' on 2016-05-31 at 0d07b9c)
+ submodule update: make use of the existing fetch_in_submodule function
Minor simplification.
Will merge to 'master' after 2.9 final.
* sb/submodule-default-paths (2016-06-14) 8 commits
- completion: clone can recurse into submodules
- clone: add --init-submodule=<pathspec> switch
- submodule update: add `--init-default-path` switch
- Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
- Merge branch 'jc/attr' into sb/submodule-default-paths
- Merge branch 'sb/clone-shallow-passthru' into sb/submodule-default-paths
- Merge branch 'sb/submodule-deinit-all' into sb/submodule-default-paths
- Merge branch 'sb/submodule-parallel-update' into sb/submodule-default-paths
(this branch uses jc/attr and sb/pathspec-label; is tangled with jc/attr-more.)
Will hold.
* ah/no-verify-signature-with-pull-rebase (2016-05-20) 1 commit
(merged to 'next' on 2016-05-31 at 30add83)
+ pull: warn on --verify-signatures with --rebase
"git pull --rebase --verify-signature" learned to warn the user
that "--verify-signature" is a no-op.
Will merge to 'master' after 2.9 final.
* 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?
* jc/attr (2016-05-25) 18 commits
(merged to 'next' on 2016-05-31 at 5b2f08b)
+ attr: support quoting pathname patterns in C style
+ attr: expose validity check for attribute names
+ attr: add counted string version of git_attr()
+ attr: add counted string version of git_check_attr()
+ attr: retire git_check_attrs() API
+ attr: convert git_check_attrs() callers to use the new API
+ attr: convert git_all_attrs() to use "struct git_attr_check"
+ attr: (re)introduce git_check_attr() and struct git_attr_check
+ attr: rename function and struct related to checking attributes
+ attr.c: plug small leak in parse_attr_line()
+ attr.c: tighten constness around "git_attr" structure
+ attr.c: simplify macroexpand_one()
+ attr.c: mark where #if DEBUG ends more clearly
+ attr.c: complete a sentence in a comment
+ attr.c: explain the lack of attr-name syntax check in parse_attr()
+ attr.c: update a stale comment on "struct match_attr"
+ attr.c: use strchrnul() to scan for one line
+ commit.c: use strchrnul() to scan for one line
(this branch is used by jc/attr-more, sb/pathspec-label and sb/submodule-default-paths.)
The attributes API has been updated so that it can later be
optimized using the knowledge of which attributes are queried.
* cc/apply-introduce-state (2016-06-06) 50 commits
(merged to 'next' on 2016-06-06 at 9f6bdcb)
+ builtin/apply: remove misleading comment on lock_file field
(merged to 'next' on 2016-06-03 at 1ab0cf9)
+ builtin/apply: move 'newfd' global into 'struct apply_state'
+ builtin/apply: add 'lock_file' pointer into 'struct apply_state'
+ builtin/apply: move applying patches into apply_all_patches()
+ builtin/apply: move 'state' check into check_apply_state()
+ builtin/apply: move 'symlink_changes' global into 'struct apply_state'
+ builtin/apply: move 'fn_table' global into 'struct apply_state'
+ builtin/apply: move 'state_linenr' global into 'struct apply_state'
+ builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
+ builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
+ builtin/apply: move 'ws_error_action' into 'struct apply_state'
+ builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
+ builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
+ builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
+ builtin/apply: move 'whitespace_option' into 'struct apply_state'
+ builtin/apply: move 'whitespace_error' global into 'struct apply_state'
+ builtin/apply: move 'root' global into 'struct apply_state'
+ builtin/apply: move 'p_value_known' global into 'struct apply_state'
+ builtin/apply: move 'p_value' global into 'struct apply_state'
+ builtin/apply: move 'has_include' global into 'struct apply_state'
+ builtin/apply: move 'limit_by_name' global into 'struct apply_state'
+ builtin/apply: move 'patch_input_file' global into 'struct apply_state'
+ builtin/apply: move 'apply' global into 'struct apply_state'
+ builtin/apply: move 'p_context' global into 'struct apply_state'
+ builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
+ builtin/apply: move 'line_termination' global into 'struct apply_state'
+ builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
+ builtin/apply: move 'no_add' global into 'struct apply_state'
+ builtin/apply: move 'threeway' global into 'struct apply_state'
+ builtin/apply: move 'summary' global into 'struct apply_state'
+ builtin/apply: move 'numstat' global into 'struct apply_state'
+ builtin/apply: move 'diffstat' global into 'struct apply_state'
+ builtin/apply: move 'cached' global into 'struct apply_state'
+ builtin/apply: move 'allow_overlap' global into 'struct apply_state'
+ builtin/apply: move 'update_index' global into 'struct apply_state'
+ builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
+ builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
+ builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
+ builtin/apply: move 'check_index' global into 'struct apply_state'
+ builtin/apply: move 'check' global into 'struct apply_state'
+ builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
+ builtin/apply: move 'state' init into init_apply_state()
+ builtin/apply: introduce 'struct apply_state' to start libifying
+ builtin/apply: move 'read_stdin' global into cmd_apply()
+ builtin/apply: move 'options' variable into cmd_apply()
+ builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
+ builtin/apply: avoid local variable shadowing 'len' parameter
+ builtin/apply: avoid parameter shadowing 'linenr' global
+ builtin/apply: avoid parameter shadowing 'p_value' global
+ builtin/apply: make gitdiff_verify_name() return void
The "git apply" standalone program is being libified; this is the
first step to move many state variables into a structure that can
be explicitly (re)initialized to make the machinery callable more
than once.
The next step that moves some remaining state variables into the
structure and turns die()s into an error return that propagates up
to the caller is not queued yet but in flight. It would be good to
review the above first and give the remainder of the series a solid
base to build on.
Will hold.
* pb/bisect (2016-05-24) 3 commits
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Beginning of GSoC "git bisect" project.
* sb/pathspec-label (2016-06-03) 6 commits
(merged to 'next' on 2016-06-03 at 362f097)
+ pathspec: disable preload-index when attribute pathspec magic is in use
+ pathspec: allow escaped query values
(merged to 'next' on 2016-05-31 at e72b604)
+ pathspec: allow querying for attributes
+ pathspec: move prefix check out of the inner loop
+ pathspec: move long magic parsing out of prefix_pathspec
+ Documentation: fix a typo
(this branch is used by sb/submodule-default-paths; uses jc/attr; is tangled with jc/attr-more.)
The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
to limit paths that match $pattern further by attribute settings.
The preload-index mechanism is disabled when the new pathspec magic
is in use (at least for now), because the attribute subsystem is
not thread-ready.
Will hold.
* 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.)
* mh/split-under-lock (2016-05-13) 33 commits
(merged to 'next' on 2016-06-03 at 2e71330)
+ lock_ref_sha1_basic(): only handle REF_NODEREF mode
+ commit_ref_update(): remove the flags parameter
+ lock_ref_for_update(): don't resolve symrefs
+ lock_ref_for_update(): don't re-read non-symbolic references
+ refs: resolve symbolic refs first
+ ref_transaction_update(): check refname_is_safe() at a minimum
+ unlock_ref(): move definition higher in the file
+ lock_ref_for_update(): new function
+ add_update(): initialize the whole ref_update
+ verify_refname_available(): adjust constness in declaration
+ refs: don't dereference on rename
+ refs: allow log-only updates
+ delete_branches(): use resolve_refdup()
+ ref_transaction_commit(): correctly report close_ref() failure
+ ref_transaction_create(): disallow recursive pruning
+ refs: make error messages more consistent
+ lock_ref_sha1_basic(): remove unneeded local variable
+ read_raw_ref(): move docstring to header file
+ read_raw_ref(): improve docstring
+ read_raw_ref(): rename symref argument to referent
+ read_raw_ref(): clear *type at start of function
+ read_raw_ref(): rename flags argument to type
+ ref_transaction_commit(): remove local variable n
+ rename_ref(): remove unneeded local variable
+ commit_ref_update(): write error message to *err, not stderr
+ refname_is_safe(): insist that the refname already be normalized
+ refname_is_safe(): don't allow the empty string
+ refname_is_safe(): use skip_prefix()
+ remove_dir_recursively(): add docstring
+ safe_create_leading_directories(): improve docstring
+ read_raw_ref(): don't get confused by an empty directory
+ commit_ref(): if there is an empty dir in the way, delete it
+ t1404: demonstrate a bug resolving references
(this branch is used by mh/ref-iterators, mh/ref-store and mh/update-ref-errors.)
Further preparatory work on the refs API before the pluggable
backend series can land.
Will merge to 'master' after 2.9 final.
* ew/fast-import-unpack-limit (2016-05-29) 2 commits
(merged to 'next' on 2016-05-29 at af32aba)
+ fast-import: invalidate pack_id references after loosening
(merged to 'next' on 2016-05-11 at ffd4efb)
+ fast-import: implement unpack limit
"git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
Will hold.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Needs review.
* kn/ref-filter-branch-list (2016-05-17) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Rerolled.
Needs review.
* dt/index-helper (2016-05-20) 20 commits
- index-helper: indexhelper.exitafter config
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: support watchman to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: log warnings
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- pkt-line: add gentle version of packet_write
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
A new "index-helper" daemon has been introduced to give newly
spawned Git process a quicker access to the data in the index, and
optionally interface with the watchman daemon to further reduce the
refresh cost.
Rerolled.
($gmane/295106).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
--------------------------------------------------
[Discarded]
* mh/connect-leak (2016-04-28) 1 commit
. git_connect(): fix memory leak with CONNECT_DIAG_URL
Is already made obsolete with a patch in flight under discussion.
($gmane/292962)
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Jun 2016, #03; Thu, 9)
@ 2016-06-09 17:21 3% Junio C Hamano
0 siblings, 0 replies; 22+ results
From: Junio C Hamano @ 2016-06-09 17:21 UTC (permalink / raw
To: git
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.
The tip of 'pu' is not expected to pass its own test suite, due to
multiple broken topics queued near its tip. Earlier there was a talk
about automatically bisecting breakage on 'pu', but tonight's
pushout is a good illustration why that would not be very useful.
What would be useful is (1) enumeration of commits on the first
parent chain on master..pu, (2) test of the second parent of each of
the commits found in (1), and (3) bisection between the broken
commits in (2) and 'master', which would highlight broken topics and
the commit(s) that might be responsible for each broken topic.
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
--------------------------------------------------
[New Topics]
* jk/avoid-unbounded-alloca (2016-06-07) 1 commit
- tree-diff: avoid alloca for large allocations
Will merge to 'next'.
* jk/send-pack-stdio (2016-06-08) 1 commit
- send-pack: use buffered I/O to talk to pack-objects
Code clean-up.
Will merge to 'next'.
* pb/commit-editmsg-path (2016-06-09) 1 commit
- builtin/commit.c: memoize git-path for COMMIT_EDITMSG
Code clean-up.
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 arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* nd/shallow-deepen (2016-04-13) 26 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* sg/completion-updates (2016-02-28) 21 commits
. completion: cache the path to the repository
. completion: extract repository discovery from __gitdir()
. completion: don't guard git executions with __gitdir()
. completion: consolidate silencing errors from git commands
. completion: don't use __gitdir() for git commands
. completion: respect 'git -C <path>'
. completion: fix completion after 'git -C <path>'
. completion: don't offer commands when 'git --opt' needs an argument
. rev-parse: add '--absolute-git-dir' option
. completion: list short refs from a remote given as a URL
. completion: don't list 'HEAD' when trying refs completion outside of a repo
. completion: list refs from remote when remote's name matches a directory
. completion: respect 'git --git-dir=<path>' when listing remote refs
. completion: fix most spots not respecting 'git --git-dir=<path>'
. completion: ensure that the repository path given on the command line exists
. completion tests: add tests for the __git_refs() helper function
. completion tests: check __gitdir()'s output in the error cases
. completion tests: consolidate getting path of current working directory
. completion tests: make the $cur variable local to the test helper functions
. completion tests: don't add test cruft to the test repository
. completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
Will be rerolled.
($gmane/292205)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
* jc/merge-impossible-no-commit (2016-04-26) 2 commits
- merge: warn --no-commit merge when no new commit is created
- merge: do not contaminate option_commit with --squash
"git merge --no-commit" silently succeeded when there is no need to
create any commit, either when you are more recent than the commit
you tried to merge, or you can fast-forward to the commit you tried
to merge. The command gives a warning message in such cases.
Just tying loose ends in a discussion. Unless somebody else
champions this topic, I'll drop it.
Will discard.
--------------------------------------------------
[Cooking]
* wd/userdiff-css (2016-06-03) 1 commit
(merged to 'next' on 2016-06-06 at 536102f)
+ userdiff: add built-in pattern for CSS
Update the funcname definition to support css files.
Will merge to 'master' after 2.9 final.
* jc/attr-more (2016-06-08) 5 commits
- attr.c: always pass check[] to collect_some_attrs()
- attr.c: correct ugly hack for git_all_attrs()
- fixup! d5ad6c13
- attr.c: pass struct git_attr_check down the callchain
- attr.c: add push_stack() helper
(this branch uses jc/attr; is tangled with sb/pathspec-label and sb/submodule-default-paths.)
The beginning of long and tortuous journey to clean-up attribute
subsystem implementation.
* jk/rev-list-count-with-bitmap (2016-06-03) 2 commits
(merged to 'next' on 2016-06-06 at dd9b30f)
+ rev-list: disable bitmaps when "-n" is used with listing objects
+ rev-list: "adjust" results of "--count --use-bitmap-index -n"
"git rev-list --count" whose walk-length is limited with "-n"
option did not work well with the counting optimized to look at the
bitmap index.
Will merge to 'master' after 2.9 final.
* mh/ref-iterators (2016-06-03) 13 commits
(merged to 'next' on 2016-06-06 at c8e79dc)
+ for_each_reflog(): reimplement using iterators
+ dir_iterator: new API for iterating over a directory tree
+ for_each_reflog(): don't abort for bad references
+ do_for_each_ref(): reimplement using reference iteration
+ refs: introduce an iterator interface
+ ref_resolves_to_object(): new function
+ entry_resolves_to_object(): rename function from ref_resolves_to_object()
+ get_ref_cache(): only create an instance if there is a submodule
+ remote rm: handle symbolic refs correctly
+ delete_refs(): add a flags argument
+ refs: use name "prefix" consistently
+ do_for_each_ref(): move docstring to the header file
+ refs: remove unnecessary "extern" keywords
(this branch is used by mh/ref-store; uses mh/split-under-lock; is tangled with mh/update-ref-errors.)
The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
Will merge to 'master' after 2.9 final.
* ew/mboxrd-format-am (2016-06-06) 3 commits
- am: support --patch-format=mboxrd
- mailsplit: support unescaping mboxrd messages
- pretty: support "mboxrd" output format
Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
* lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit
- receive-pack: send auto-gc output over sideband 2
Allow messages that are generated by auto gc during "git push" on
the receiving end to be explicitly passed back to the sending end
over sideband, so that they are shown with "remote: " prefix to
avoid confusing the users.
* mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit
- cherry-pick: allow to pick to unborn branches
"git cherry-pick A" worked on an unborn branch, but "git
cherry-pick A..B" didn't.
* mj/log-show-signature-conf (2016-06-06) 2 commits
- log: "--no-show-signature" commmand-line option
- log: add "log.showsignature" configuration variable
"git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
The order of the commits in the topic need to be reversed.
* 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.
* sg/reflog-past-root (2016-06-06) 1 commit
- reflog: continue walking the reflog past root commits
"git reflog" stopped upon seeing an entry that denotes a branch
creation event (aka "unborn"), which made it appear as if the
reflog was truncated.
* tb/complete-status (2016-06-06) 3 commits
- completion: add git status
- completion: add __git_get_option_value helper
- completion: factor out untracked file modes into a variable
The completion script (in contrib/) learned to complete "git
status" options.
Breaks t9902.
* tr/doc-tt (2016-06-08) 4 commits
- doc: change configuration variables format
- doc: more consistency in environment variables format
- doc: change environment variables format
- doc: clearer rule about formatting literals
The documentation set has been updated so that literal commands,
configuration variables and environment variables are consistently
typeset in fixed-width font and bold in manpages.
Will merge to 'next'.
* vs/prompt-avoid-unset-variable (2016-06-06) 1 commit
- git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
The git-prompt scriptlet (in contrib/) was not friendly with those
who uses "set -u", which has been fixed.
* rj/compat-regex-size-max-fix (2016-06-06) 1 commit
- regex: fix a SIZE_MAX macro redefinition warning
A compilation fix.
Will merge to 'next'.
* bc/cocci-object-id (2016-06-06) 8 commits
- merge-recursive: convert merge_recursive_generic to object_id
- merge-recursive: convert leaf functions to use struct object_id
- merge-recursive: convert struct merge_file_info to object_id
- merge-recursive: convert struct stage_data to use object_id
- Rename struct diff_filespec's sha1_valid member.
- Convert struct diff_filespec to struct object_id
- Apply standard object_id Coccinelle transformations.
- Add basic Coccinelle transforms.
Move from "unsigned char [20]" to "struct object_id" continues,
with help from an automated tool.
* et/add-chmod-x (2016-06-07) 1 commit
- add: add --chmod=+x / --chmod=-x options
"git update-index --add --chmod=+x file" may be usable as an escape
hatch, but not a friendly thing to force for people who do need to
use it regularly. "git add --chmod=+x file" can be used instead.
Will merge to 'next'.
* 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.
Will merge to 'master'.
* 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.
Will merge to 'master'.
* mh/connect (2016-06-06) 10 commits
- connect: [host:port] is legacy for ssh
- connect: move ssh command line preparation to a separate function
- connect: actively reject git:// urls with a user part
- connect: change the --diag-url output to separate user and host
- connect: make parse_connect_url() return the user part of the url as a separate value
- connect: group CONNECT_DIAG_URL handling code
- connect: make parse_connect_url() return separated host and port
- connect: re-derive a host:port string from the separate host and port variables
- connect: call get_host_and_port() earlier
- connect: document why we sometimes call get_port after get_host_and_port
Ok, folks, is everybody happy with this version?
* aq/upload-pack-use-parse-options (2016-05-31) 1 commit
(merged to 'next' on 2016-06-06 at 505f1ee)
+ upload-pack.c: use parse-options API
"git upload-pack" command has been updated to use the parse-options
API.
Will merge to 'master' after 2.9 final.
* jc/clear-pathspec (2016-06-02) 1 commit
(merged to 'next' on 2016-06-06 at 9e7e291)
+ pathspec: rename free_pathspec() to clear_pathspec()
We usually call a function that clears the contents a data
structure X without freeing the structure itself clear_X(), and
call a function that does clear_X() and also frees it free_X().
free_pathspec() function has been renamed to clear_pathspec()
to avoid confusion.
Will merge to 'master' after 2.9 final.
* sb/submodule-recommend-shallowness (2016-05-27) 2 commits
(merged to 'next' on 2016-05-31 at 1ee161c)
+ submodule update: learn `--[no-]recommend-shallow` option
+ submodule-config: keep shallow recommendation around
An upstream project can make a recommendation to make only a
shallow clone for some submodules in the .gitmodules file it ship.
Will merge to 'master' after 2.9 final.
* tb/convert-peek-in-index (2016-06-07) 3 commits
- correct ce_compare_data() in a middle of a merge
- read-cache: factor out get_sha1_from_index() helper
- convert: unify the "auto" handling of CRLF
Needs review.
* va/i18n-even-more (2016-06-07) 38 commits
- i18n: branch: mark comment when editing branch description for translation
- i18n: unmark die messages for translation
- i18n: submodule: escape shell variables inside eval_gettext
- i18n: submodule: join strings marked for translation
- i18n: init-db: join message pieces
- i18n: remote: allow translations to reorder message
- i18n: remote: mark URL fallback text for translation
- i18n: standardise messages
- i18n: sequencer: add period to error message
- i18n: merge: change command option help to lowercase
- i18n: merge: mark messages for translation
- i18n: notes: mark options for translation
- i18n: notes: mark strings for translation
- i18n: transport-helper.c: change N_() call to _()
- i18n: bisect: mark strings for translation
- t5523: use test_i18ngrep for negation
- t4153: fix negated test_i18ngrep call
- t9003: become resilient to GETTEXT_POISON
- tests: unpack-trees: update to use test_i18n* functions
- tests: use test_i18n* functions to suppress false positives
- i18n: setup: mark strings for translation
- i18n: rebase-interactive: mark comments of squash for translation
- i18n: rebase-interactive: mark here-doc strings for translation
- i18n: rebase-interactive: mark strings for translation
- i18n: git-sh-setup.sh: mark strings for translation
- t6030: update to use test_i18ncmp
- i18n: bisect: simplify error message for i18n
- i18n: rebase: mark placeholder for translation
- i18n: rebase: fix marked string to use eval_gettext variant
- merge-octupus: use die shell function from git-sh-setup.sh
- i18n: merge-octopus: mark messages for translation
- i18n: sequencer: mark string for translation
- i18n: sequencer: mark entire sentences for translation
- i18n: transport: mark strings for translation
- i18n: advice: internationalize message for conflicts
- i18n: advice: mark string about detached head for translation
- i18n: builtin/remote.c: fix mark for translation
- Merge branch 'jc/t2300-setup' into HEAD
(this branch uses jc/t2300-setup.)
More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
One patch from the original submission dropped due to conflicts
with other topics in flight.
* jg/dash-is-last-branch-in-worktree-add (2016-05-31) 1 commit
(merged to 'next' on 2016-06-02 at 3959ef6)
+ worktree: allow "-" short-hand for @{-1} in add command
"git worktree add" learned that '-' can be used as a short-hand for
"@{-1}", the previous branch.
Will merge to 'master' after 2.9 final.
* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
- blame: require 0 context lines while finding moved lines with -M
"git blame -M" missed a single line that was moved within the file.
We may want to squash a test or two to this commit. Volunteers?
* nd/worktree-lock (2016-06-03) 6 commits
- worktree.c: find_worktree() search by path suffix
- worktree: add "unlock" command
- worktree: add "lock" command
- worktree.c: add is_worktree_locked()
- worktree.c: add is_main_worktree()
- worktree.c: add find_worktree()
(this branch uses nd/worktree-cleanup-post-head-protection.)
"git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location. "git worktree"
command learned a dedicated command pair to create and remoev such
a file, so that the users do not have to do this with editor.
Ok, folks, is everybody happy with this version?
* et/pretty-format-c-auto (2016-05-27) 1 commit
(merged to 'next' on 2016-05-31 at 1e9c920)
+ format_commit_message: honor `color=auto` for `%C(auto)`
%C(auto) in a custom format string that commands in `git log`
family takes unconditionally turned the color on, ignoring
--no-color or --color=auto with output not connected to a tty;
this was corrected to make the format truly behave as "auto".
Will merge to 'master' after 2.9 final.
* ew/daemon-socket-keepalive (2016-05-25) 1 commit
(merged to 'next' on 2016-05-31 at c32acf1)
+ daemon: enable SO_KEEPALIVE for all sockets
When "git daemon" is run without --[init-]timeout specified, a
connection from a client that silently goes offline can hang around
for a long time, wasting resources. The socket-level KEEPALIVE has
been enabled to allow the OS to notice such failed connections.
Will merge to 'master' after 2.9 final.
* jk/upload-pack-hook (2016-06-02) 7 commits
- upload-pack: provide a hook for running pack-objects
- t1308: do not get fooled by symbolic links to the source tree
- config: add a notion of "scope"
- config: return configset value for current_config_ functions
- config: set up config_source for command-line config
- git_config_parse_parameter: refactor cleanup code
- git_config_with_options: drop "found" counting
Allow a custom "git upload-pack" replacement to respond to
"fetch/clone" request.
Still under discussion.
($gmane/295705).
* rs/xdiff-hunk-with-func-line (2016-05-31) 8 commits
(merged to 'next' on 2016-06-02 at 0c2e335)
+ grep: -W: don't extend context to trailing empty lines
+ t7810: add test for grep -W and trailing empty context lines
+ xdiff: don't trim common tail with -W
+ xdiff: -W: don't include common trailing empty lines in context
+ xdiff: ignore empty lines before added functions with -W
+ xdiff: handle appended chunks better with -W
+ xdiff: factor out match_func_rec()
+ t4051: rewrite, add more tests
"git show -W" (extend hunks to cover the entire function, delimited
by lines that match the "funcname" pattern) used to show the entire
file when a change added an entire function at the end of the file,
which has been fixed.
Will merge to 'master' after 2.9 final.
* sb/submodule-misc-cleanups (2016-05-25) 1 commit
(merged to 'next' on 2016-05-31 at 0d07b9c)
+ submodule update: make use of the existing fetch_in_submodule function
Minor simplification.
Will merge to 'master' after 2.9 final.
* sb/submodule-default-paths (2016-05-26) 11 commits
- clone: add --init-submodule=<pathspec> switch
- submodule update: add `--init-default-path` switch
- Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
- Merge branch 'jc/attr' into sb/submodule-default-paths
- Merge branch 'sb/clone-shallow-passthru' into sb/submodule-default-paths
- Merge branch 'sb/submodule-deinit-all' into sb/submodule-default-paths
- Merge branch 'sb/submodule-parallel-update' into sb/submodule-default-paths
(merged to 'next' on 2016-05-31 at e72b604)
+ pathspec: allow querying for attributes
+ pathspec: move prefix check out of the inner loop
+ pathspec: move long magic parsing out of prefix_pathspec
+ Documentation: fix a typo
(this branch uses jc/attr; is tangled with jc/attr-more and sb/pathspec-label.)
Will hold.
* ah/no-verify-signature-with-pull-rebase (2016-05-20) 1 commit
(merged to 'next' on 2016-05-31 at 30add83)
+ pull: warn on --verify-signatures with --rebase
"git pull --rebase --verify-signature" learned to warn the user
that "--verify-signature" is a no-op.
Will merge to 'master' after 2.9 final.
* 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?
* jc/attr (2016-05-25) 18 commits
(merged to 'next' on 2016-05-31 at 5b2f08b)
+ attr: support quoting pathname patterns in C style
+ attr: expose validity check for attribute names
+ attr: add counted string version of git_attr()
+ attr: add counted string version of git_check_attr()
+ attr: retire git_check_attrs() API
+ attr: convert git_check_attrs() callers to use the new API
+ attr: convert git_all_attrs() to use "struct git_attr_check"
+ attr: (re)introduce git_check_attr() and struct git_attr_check
+ attr: rename function and struct related to checking attributes
+ attr.c: plug small leak in parse_attr_line()
+ attr.c: tighten constness around "git_attr" structure
+ attr.c: simplify macroexpand_one()
+ attr.c: mark where #if DEBUG ends more clearly
+ attr.c: complete a sentence in a comment
+ attr.c: explain the lack of attr-name syntax check in parse_attr()
+ attr.c: update a stale comment on "struct match_attr"
+ attr.c: use strchrnul() to scan for one line
+ commit.c: use strchrnul() to scan for one line
(this branch is used by jc/attr-more, sb/pathspec-label and sb/submodule-default-paths.)
The attributes API has been updated so that it can later be
optimized using the knowledge of which attributes are queried.
* cc/apply-introduce-state (2016-06-06) 50 commits
(merged to 'next' on 2016-06-06 at 9f6bdcb)
+ builtin/apply: remove misleading comment on lock_file field
(merged to 'next' on 2016-06-03 at 1ab0cf9)
+ builtin/apply: move 'newfd' global into 'struct apply_state'
+ builtin/apply: add 'lock_file' pointer into 'struct apply_state'
+ builtin/apply: move applying patches into apply_all_patches()
+ builtin/apply: move 'state' check into check_apply_state()
+ builtin/apply: move 'symlink_changes' global into 'struct apply_state'
+ builtin/apply: move 'fn_table' global into 'struct apply_state'
+ builtin/apply: move 'state_linenr' global into 'struct apply_state'
+ builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
+ builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
+ builtin/apply: move 'ws_error_action' into 'struct apply_state'
+ builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
+ builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
+ builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
+ builtin/apply: move 'whitespace_option' into 'struct apply_state'
+ builtin/apply: move 'whitespace_error' global into 'struct apply_state'
+ builtin/apply: move 'root' global into 'struct apply_state'
+ builtin/apply: move 'p_value_known' global into 'struct apply_state'
+ builtin/apply: move 'p_value' global into 'struct apply_state'
+ builtin/apply: move 'has_include' global into 'struct apply_state'
+ builtin/apply: move 'limit_by_name' global into 'struct apply_state'
+ builtin/apply: move 'patch_input_file' global into 'struct apply_state'
+ builtin/apply: move 'apply' global into 'struct apply_state'
+ builtin/apply: move 'p_context' global into 'struct apply_state'
+ builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
+ builtin/apply: move 'line_termination' global into 'struct apply_state'
+ builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
+ builtin/apply: move 'no_add' global into 'struct apply_state'
+ builtin/apply: move 'threeway' global into 'struct apply_state'
+ builtin/apply: move 'summary' global into 'struct apply_state'
+ builtin/apply: move 'numstat' global into 'struct apply_state'
+ builtin/apply: move 'diffstat' global into 'struct apply_state'
+ builtin/apply: move 'cached' global into 'struct apply_state'
+ builtin/apply: move 'allow_overlap' global into 'struct apply_state'
+ builtin/apply: move 'update_index' global into 'struct apply_state'
+ builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
+ builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
+ builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
+ builtin/apply: move 'check_index' global into 'struct apply_state'
+ builtin/apply: move 'check' global into 'struct apply_state'
+ builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
+ builtin/apply: move 'state' init into init_apply_state()
+ builtin/apply: introduce 'struct apply_state' to start libifying
+ builtin/apply: move 'read_stdin' global into cmd_apply()
+ builtin/apply: move 'options' variable into cmd_apply()
+ builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
+ builtin/apply: avoid local variable shadowing 'len' parameter
+ builtin/apply: avoid parameter shadowing 'linenr' global
+ builtin/apply: avoid parameter shadowing 'p_value' global
+ builtin/apply: make gitdiff_verify_name() return void
The "git apply" standalone program is being libified; this is the
first step to move many state variables into a structure that can
be explicitly (re)initialized to make the machinery callable more
than once.
The next step that moves some remaining state variables into the
structure and turns die()s into an error return that propagates up
to the caller is not queued yet but in flight. It would be good to
review the above first and give the remainder of the series a solid
base to build on.
Will hold.
* pb/bisect (2016-05-24) 3 commits
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Beginning of GSoC "git bisect" project.
* sb/pathspec-label (2016-06-03) 6 commits
(merged to 'next' on 2016-06-03 at 362f097)
+ pathspec: disable preload-index when attribute pathspec magic is in use
+ pathspec: allow escaped query values
(merged to 'next' on 2016-05-31 at e72b604)
+ pathspec: allow querying for attributes
+ pathspec: move prefix check out of the inner loop
+ pathspec: move long magic parsing out of prefix_pathspec
+ Documentation: fix a typo
(this branch uses jc/attr; is tangled with jc/attr-more and sb/submodule-default-paths.)
The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
to limit paths that match $pattern further by attribute settings.
The preload-index mechanism is disabled when the new pathspec magic
is in use (at least for now), because the attribute subsystem is
not thread-ready.
Will hold.
* 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.)
* mh/split-under-lock (2016-05-13) 33 commits
(merged to 'next' on 2016-06-03 at 2e71330)
+ lock_ref_sha1_basic(): only handle REF_NODEREF mode
+ commit_ref_update(): remove the flags parameter
+ lock_ref_for_update(): don't resolve symrefs
+ lock_ref_for_update(): don't re-read non-symbolic references
+ refs: resolve symbolic refs first
+ ref_transaction_update(): check refname_is_safe() at a minimum
+ unlock_ref(): move definition higher in the file
+ lock_ref_for_update(): new function
+ add_update(): initialize the whole ref_update
+ verify_refname_available(): adjust constness in declaration
+ refs: don't dereference on rename
+ refs: allow log-only updates
+ delete_branches(): use resolve_refdup()
+ ref_transaction_commit(): correctly report close_ref() failure
+ ref_transaction_create(): disallow recursive pruning
+ refs: make error messages more consistent
+ lock_ref_sha1_basic(): remove unneeded local variable
+ read_raw_ref(): move docstring to header file
+ read_raw_ref(): improve docstring
+ read_raw_ref(): rename symref argument to referent
+ read_raw_ref(): clear *type at start of function
+ read_raw_ref(): rename flags argument to type
+ ref_transaction_commit(): remove local variable n
+ rename_ref(): remove unneeded local variable
+ commit_ref_update(): write error message to *err, not stderr
+ refname_is_safe(): insist that the refname already be normalized
+ refname_is_safe(): don't allow the empty string
+ refname_is_safe(): use skip_prefix()
+ remove_dir_recursively(): add docstring
+ safe_create_leading_directories(): improve docstring
+ read_raw_ref(): don't get confused by an empty directory
+ commit_ref(): if there is an empty dir in the way, delete it
+ t1404: demonstrate a bug resolving references
(this branch is used by mh/ref-iterators, mh/ref-store and mh/update-ref-errors.)
Further preparatory work on the refs API before the pluggable
backend series can land.
Will merge to 'master' after 2.9 final.
* ew/fast-import-unpack-limit (2016-05-29) 2 commits
(merged to 'next' on 2016-05-29 at af32aba)
+ fast-import: invalidate pack_id references after loosening
(merged to 'next' on 2016-05-11 at ffd4efb)
+ fast-import: implement unpack limit
"git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
Will hold.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Needs review.
* kn/ref-filter-branch-list (2016-05-17) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Rerolled.
Needs review.
* dt/index-helper (2016-05-20) 20 commits
- index-helper: indexhelper.exitafter config
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: support watchman to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: log warnings
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- pkt-line: add gentle version of packet_write
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
A new "index-helper" daemon has been introduced to give newly
spawned Git process a quicker access to the data in the index, and
optionally interface with the watchman daemon to further reduce the
refresh cost.
Rerolled.
($gmane/295106).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
--------------------------------------------------
[Discarded]
* mh/connect-leak (2016-04-28) 1 commit
. git_connect(): fix memory leak with CONNECT_DIAG_URL
Is already made obsolete with a patch in flight under discussion.
($gmane/292962)
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Jun 2016, #02; Mon, 6)
@ 2016-06-07 5:58 3% Junio C Hamano
0 siblings, 0 replies; 22+ results
From: Junio C Hamano @ 2016-06-07 5:58 UTC (permalink / raw
To: git
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.
The hopefully final release candidate 2.9-rc2 together with 2.8.4
has been pushed out.
By the way, the tip of 'pu' is not expected to pass its own test
suite, due to multiple broken topics queued near its tip. Earlier
there was a talk about automatically bisecting breakage on 'pu', but
tonight's pushout is a good illustration why that would not be very
useful. What would be useful is (1) enumeration of commits on the
first parent chain on master..pu, (2) test of the second parent of
each of the commits found in (1), and (3) bisection between the
broken commits in (2) and 'master', which would highlight broken
topics and the commit(s) that might be responsible for each broken
topic.
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"]
* bd/readme.markdown-more (2016-05-31) 1 commit
(merged to 'next' on 2016-06-02 at 1de7554)
+ README.md: format CLI commands with code syntax
The mark-up in the top-level README.md file has been updated to
typeset CLI command names differently from the body text.
* em/man-bold-literal (2016-05-31) 1 commit
(merged to 'next' on 2016-06-02 at efb4156)
+ Documentation: bold literals in man
The manpage output of our documentation did not render well in
terminal; typeset literals in bold by default to make them stand
out more.
* js/perf-rebase-i (2016-05-31) 1 commit
(merged to 'next' on 2016-05-31 at 39d8dc8)
+ perf: make the tests work without a worktree
The one in 'master' has a brown-paper-bag bug that breaks the perf
test when used inside a usual Git repository with a working tree.
* js/rebase-i-dedup-call-to-rerere (2016-05-31) 1 commit
(merged to 'next' on 2016-05-31 at db1f9e3)
+ rebase -i: remove an unnecessary 'rerere' invocation
"git rebase -i", after it fails to auto-resolve the conflict, had
an unnecessary call to "git rerere" from its very early days, which
was spotted recently; the call has been removed.
* mm/makefile-developer-can-be-in-config-mak (2016-06-01) 2 commits
(merged to 'next' on 2016-06-02 at f3a0678)
+ Makefile: add $(DEVELOPER_CFLAGS) variable
+ Makefile: move 'ifdef DEVELOPER' after config.mak* inclusion
"make DEVELOPER=1" worked as expected; setting DEVELOPER=1 in
config.mak didn't.
* mr/send-email-doc-gmail-2fa (2016-06-01) 1 commit
(merged to 'next' on 2016-06-02 at cd2ade8)
+ Documentation/git-send-email: fix typo in gmail 2FA section
Typofix.
* pa/cherry-pick-doc-typo (2016-05-29) 1 commit
(merged to 'next' on 2016-06-02 at e2c2457)
+ git-cherry-pick.txt: correct a small typo
"git cherry-pick --help" had three instances of word "behavior",
one of which was spelled "behaviour", which is updated to match the
other two.
* rs/apply-name-terminate (2016-05-29) 1 commit
(merged to 'next' on 2016-06-02 at 8df9332)
+ apply: remove unused parameters from name_terminate()
Code clean-up.
* rs/patch-id-use-skip-prefix (2016-05-29) 1 commit
(merged to 'next' on 2016-06-02 at c993de3)
+ patch-id: use starts_with() and skip_prefix()
Code clean-up.
* sb/submodule-helper-list-signal-unmatch-via-exit-status (2016-06-01) 1 commit
(merged to 'next' on 2016-06-02 at 29064a2)
+ submodule--helper: offer a consistent API
(this branch is used by sb/submodule-helper-relative-path.)
The way how "submodule--helper list" signals unmatch error to its
callers has been updated.
* sb/submodule-helper-relative-path (2016-06-01) 1 commit
(merged to 'next' on 2016-06-02 at 8a191e1)
+ submodule: remove bashism from shell script
(this branch uses sb/submodule-helper-list-signal-unmatch-via-exit-status.)
A bash-ism "local" has been removed from "git submodule" scripted
Porcelain.
--------------------------------------------------
[New Topics]
* wd/userdiff-css (2016-06-03) 1 commit
(merged to 'next' on 2016-06-06 at 536102f)
+ userdiff: add built-in pattern for CSS
Update the funcname definition to support css files.
Will merge to 'master' after 2.9 final.
* jc/attr-more (2016-06-03) 2 commits
- attr.c: pass struct git_attr_check down the callchain
- attr.c: add push_stack() helper
(this branch uses jc/attr; is tangled with sb/pathspec-label and sb/submodule-default-paths.)
The beginning of long and tortuous journey to clean-up attribute
subsystem implementation.
* jk/rev-list-count-with-bitmap (2016-06-03) 2 commits
(merged to 'next' on 2016-06-06 at dd9b30f)
+ rev-list: disable bitmaps when "-n" is used with listing objects
+ rev-list: "adjust" results of "--count --use-bitmap-index -n"
"git rev-list --count" whose walk-length is limited with "-n"
option did not work well with the counting optimized to look at the
bitmap index.
Will merge to 'master' after 2.9 final.
* mh/ref-iterators (2016-06-03) 13 commits
(merged to 'next' on 2016-06-06 at c8e79dc)
+ for_each_reflog(): reimplement using iterators
+ dir_iterator: new API for iterating over a directory tree
+ for_each_reflog(): don't abort for bad references
+ do_for_each_ref(): reimplement using reference iteration
+ refs: introduce an iterator interface
+ ref_resolves_to_object(): new function
+ entry_resolves_to_object(): rename function from ref_resolves_to_object()
+ get_ref_cache(): only create an instance if there is a submodule
+ remote rm: handle symbolic refs correctly
+ delete_refs(): add a flags argument
+ refs: use name "prefix" consistently
+ do_for_each_ref(): move docstring to the header file
+ refs: remove unnecessary "extern" keywords
(this branch uses mh/split-under-lock.)
The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
Will merge to 'master' after 2.9 final.
* ew/mboxrd-format-am (2016-06-06) 3 commits
- am: support --patch-format=mboxrd
- mailsplit: support unescaping mboxrd messages
- pretty: support "mboxrd" output format
Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
* lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit
- receive-pack: send auto-gc output over sideband 2
Allow messages that are generated by auto gc during "git push" on
the receiving end to be explicitly passed back to the sending end
over sideband, so that they are shown with "remote: " prefix to
avoid confusing the users.
* mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit
- cherry-pick: allow to pick to unborn branches
"git cherry-pick A" worked on an unborn branch, but "git
cherry-pick A..B" didn't.
* mj/log-show-signature-conf (2016-06-06) 2 commits
- log: "--no-show-signature" commmand-line option
- log: add "log.showsignature" configuration variable
"git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
The order of the commits in the topic need to be reversed.
* 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
* sg/reflog-past-root (2016-06-06) 1 commit
- reflog: continue walking the reflog past root commits
"git reflog" stopped upon seeing an entry that denotes a branch
creation event (aka "unborn"), which made it appear as if the
reflog was truncated.
* tb/complete-status (2016-06-06) 3 commits
- completion: add git status
- completion: add __git_get_option_value helper
- completion: factor out untracked file modes into a variable
The completion script (in contrib/) learned to complete "git
status" options.
* tr/doc-tt (2016-06-06) 3 commits
- doc: change configuration variables format
- doc: change environment variables format
- doc: clearer rule about formatting literals
The documentation set has been updated so that literal commands,
configuration variables and environment variables are consistently
typeset in fixed-width font and bold in manpages.
* vs/prompt-avoid-unset-variable (2016-06-06) 1 commit
- git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
The git-prompt scriptlet (in contrib/) was not friendly with those
who uses "set -u", which has been fixed.
* rj/compat-regex-size-max-fix (2016-06-06) 1 commit
- regex: fix a SIZE_MAX macro redefinition warning
A compilation fix.
Will merge to 'next'.
* bc/cocci-object-id (2016-06-06) 8 commits
- merge-recursive: convert merge_recursive_generic to object_id
- merge-recursive: convert leaf functions to use struct object_id
- merge-recursive: convert struct merge_file_info to object_id
- merge-recursive: convert struct stage_data to use object_id
- Rename struct diff_filespec's sha1_valid member.
- Convert struct diff_filespec to struct object_id
- Apply standard object_id Coccinelle transformations.
- Add basic Coccinelle transforms.
Move from "unsigned char [20]" to "struct object_id" continues,
with help from an automated tool.
--------------------------------------------------
[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 arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* nd/shallow-deepen (2016-04-13) 26 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* sg/completion-updates (2016-02-28) 21 commits
. completion: cache the path to the repository
. completion: extract repository discovery from __gitdir()
. completion: don't guard git executions with __gitdir()
. completion: consolidate silencing errors from git commands
. completion: don't use __gitdir() for git commands
. completion: respect 'git -C <path>'
. completion: fix completion after 'git -C <path>'
. completion: don't offer commands when 'git --opt' needs an argument
. rev-parse: add '--absolute-git-dir' option
. completion: list short refs from a remote given as a URL
. completion: don't list 'HEAD' when trying refs completion outside of a repo
. completion: list refs from remote when remote's name matches a directory
. completion: respect 'git --git-dir=<path>' when listing remote refs
. completion: fix most spots not respecting 'git --git-dir=<path>'
. completion: ensure that the repository path given on the command line exists
. completion tests: add tests for the __git_refs() helper function
. completion tests: check __gitdir()'s output in the error cases
. completion tests: consolidate getting path of current working directory
. completion tests: make the $cur variable local to the test helper functions
. completion tests: don't add test cruft to the test repository
. completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
Will be rerolled.
($gmane/292205)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
* jc/merge-impossible-no-commit (2016-04-26) 2 commits
- merge: warn --no-commit merge when no new commit is created
- merge: do not contaminate option_commit with --squash
"git merge --no-commit" silently succeeded when there is no need to
create any commit, either when you are more recent than the commit
you tried to merge, or you can fast-forward to the commit you tried
to merge. The command gives a warning message in such cases.
Just tying loose ends in a discussion. Unless somebody else
champions this topic, I'll drop it.
Will discard.
--------------------------------------------------
[Cooking]
* et/add-chmod-x (2016-06-01) 2 commits
- SQUASH??? add: add --chmod=+x / --chmod=-x options
- add: add --chmod=+x / --chmod=-x options
Waiting for a reroll (or ack for proposed fixup).
* 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
A test fix.
Will merge to 'master'.
* 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.
Will merge to 'master'.
* mh/connect (2016-06-06) 10 commits
- connect: [host:port] is legacy for ssh
- connect: move ssh command line preparation to a separate function
- connect: actively reject git:// urls with a user part
- connect: change the --diag-url output to separate user and host
- connect: make parse_connect_url() return the user part of the url as a separate value
- connect: group CONNECT_DIAG_URL handling code
- connect: make parse_connect_url() return separated host and port
- connect: re-derive a host:port string from the separate host and port variables
- connect: call get_host_and_port() earlier
- connect: document why we sometimes call get_port after get_host_and_port
Ok, folks, is everybody happy with this version?
* aq/upload-pack-use-parse-options (2016-05-31) 1 commit
(merged to 'next' on 2016-06-06 at 505f1ee)
+ upload-pack.c: use parse-options API
"git upload-pack" command has been updated to use the parse-options
API.
Will merge to 'master' after 2.9 final.
* jc/clear-pathspec (2016-06-02) 1 commit
(merged to 'next' on 2016-06-06 at 9e7e291)
+ pathspec: rename free_pathspec() to clear_pathspec()
We usually call a function that clears the contents a data
structure X without freeing the structure itself clear_X(), and
call a function that does clear_X() and also frees it free_X().
free_pathspec() function has been renamed to clear_pathspec()
to avoid confusion.
Will merge to 'master' after 2.9 final.
* sb/submodule-recommend-shallowness (2016-05-27) 2 commits
(merged to 'next' on 2016-05-31 at 1ee161c)
+ submodule update: learn `--[no-]recommend-shallow` option
+ submodule-config: keep shallow recommendation around
An upstream project can make a recommendation to make only a
shallow clone for some submodules in the .gitmodules file it ship.
Will merge to 'master' after 2.9 final.
* tb/convert-peek-in-index (2016-05-24) 2 commits
- convert: ce_compare_data() checks for a sha1 of a path
- read-cache: factor out get_sha1_from_index() helper
The motivation is rather iffy.
* va/i18n-even-more (2016-05-26) 22 commits
- t5523: use test_i18ngrep for negation
- t4153: fix negated test_i18ngrep call
- t9003: become resilient to GETTEXT_POISON
- tests: unpack-trees: update to use test_i18n* functions
- tests: use test_i18n* functions to suppress false positives
- i18n: setup: mark strings for translation
- i18n: rebase-interactive: mark comments of squash for translation
- i18n: rebase-interactive: mark here-doc strings for translation
- i18n: rebase-interactive: mark strings for translation
- i18n: git-sh-setup.sh: mark strings for translation
- t6030: update to use test_i18ncmp
- i18n: bisect: simplify error message for i18n
- i18n: rebase: mark placeholder for translation
- i18n: rebase: fix marked string to use eval_gettext variant
- merge-octupus: use die shell function from git-sh-setup.sh
- i18n: merge-octopus: mark messages for translation
- i18n: sequencer: mark string for translation
- i18n: sequencer: mark entire sentences for translation
- i18n: transport: mark strings for translation
- i18n: advice: internationalize message for conflicts
- i18n: advice: mark string about detached head for translation
- i18n: builtin/remote.c: fix mark for translation
More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
Is everybody happy with this version?
* jg/dash-is-last-branch-in-worktree-add (2016-05-31) 1 commit
(merged to 'next' on 2016-06-02 at 3959ef6)
+ worktree: allow "-" short-hand for @{-1} in add command
"git worktree add" learned that '-' can be used as a short-hand for
"@{-1}", the previous branch.
Will merge to 'master' after 2.9 final.
* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
- blame: require 0 context lines while finding moved lines with -M
"git blame -M" missed a single line that was moved within the file.
We may want to squash a test or two to this commit. Volunteers?
* nd/worktree-lock (2016-06-03) 6 commits
- worktree.c: find_worktree() search by path suffix
- worktree: add "unlock" command
- worktree: add "lock" command
- worktree.c: add is_worktree_locked()
- worktree.c: add is_main_worktree()
- worktree.c: add find_worktree()
(this branch uses nd/worktree-cleanup-post-head-protection.)
"git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location. "git worktree"
command learned a dedicated command pair to create and remoev such
a file, so that the users do not have to do this with editor.
Ok, folks, is everybody happy with this version?
* et/pretty-format-c-auto (2016-05-27) 1 commit
(merged to 'next' on 2016-05-31 at 1e9c920)
+ format_commit_message: honor `color=auto` for `%C(auto)`
%C(auto) in a custom format string that commands in `git log`
family takes unconditionally turned the color on, ignoring
--no-color or --color=auto with output not connected to a tty;
this was corrected to make the format truly behave as "auto".
Will merge to 'master' after 2.9 final.
* ew/daemon-socket-keepalive (2016-05-25) 1 commit
(merged to 'next' on 2016-05-31 at c32acf1)
+ daemon: enable SO_KEEPALIVE for all sockets
When "git daemon" is run without --[init-]timeout specified, a
connection from a client that silently goes offline can hang around
for a long time, wasting resources. The socket-level KEEPALIVE has
been enabled to allow the OS to notice such failed connections.
Will merge to 'master' after 2.9 final.
* jk/upload-pack-hook (2016-06-02) 7 commits
- upload-pack: provide a hook for running pack-objects
- t1308: do not get fooled by symbolic links to the source tree
- config: add a notion of "scope"
- config: return configset value for current_config_ functions
- config: set up config_source for command-line config
- git_config_parse_parameter: refactor cleanup code
- git_config_with_options: drop "found" counting
Allow a custom "git upload-pack" replacement to respond to
"fetch/clone" request.
Still under discussion.
($gmane/295705).
* rs/xdiff-hunk-with-func-line (2016-05-31) 8 commits
(merged to 'next' on 2016-06-02 at 0c2e335)
+ grep: -W: don't extend context to trailing empty lines
+ t7810: add test for grep -W and trailing empty context lines
+ xdiff: don't trim common tail with -W
+ xdiff: -W: don't include common trailing empty lines in context
+ xdiff: ignore empty lines before added functions with -W
+ xdiff: handle appended chunks better with -W
+ xdiff: factor out match_func_rec()
+ t4051: rewrite, add more tests
"git show -W" (extend hunks to cover the entire function, delimited
by lines that match the "funcname" pattern) used to show the entire
file when a change added an entire function at the end of the file,
which has been fixed.
Will merge to 'master' after 2.9 final.
* sb/submodule-misc-cleanups (2016-05-25) 1 commit
(merged to 'next' on 2016-05-31 at 0d07b9c)
+ submodule update: make use of the existing fetch_in_submodule function
Minor simplification.
Will merge to 'master' after 2.9 final.
* sb/submodule-default-paths (2016-05-26) 11 commits
- clone: add --init-submodule=<pathspec> switch
- submodule update: add `--init-default-path` switch
- Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
- Merge branch 'jc/attr' into sb/submodule-default-paths
- Merge branch 'sb/clone-shallow-passthru' into sb/submodule-default-paths
- Merge branch 'sb/submodule-deinit-all' into sb/submodule-default-paths
- Merge branch 'sb/submodule-parallel-update' into sb/submodule-default-paths
(merged to 'next' on 2016-05-31 at e72b604)
+ pathspec: allow querying for attributes
+ pathspec: move prefix check out of the inner loop
+ pathspec: move long magic parsing out of prefix_pathspec
+ Documentation: fix a typo
(this branch uses jc/attr; is tangled with jc/attr-more and sb/pathspec-label.)
Will hold.
* ah/no-verify-signature-with-pull-rebase (2016-05-20) 1 commit
(merged to 'next' on 2016-05-31 at 30add83)
+ pull: warn on --verify-signatures with --rebase
"git pull --rebase --verify-signature" learned to warn the user
that "--verify-signature" is a no-op.
Will merge to 'master' after 2.9 final.
* 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?
* jc/attr (2016-05-25) 18 commits
(merged to 'next' on 2016-05-31 at 5b2f08b)
+ attr: support quoting pathname patterns in C style
+ attr: expose validity check for attribute names
+ attr: add counted string version of git_attr()
+ attr: add counted string version of git_check_attr()
+ attr: retire git_check_attrs() API
+ attr: convert git_check_attrs() callers to use the new API
+ attr: convert git_all_attrs() to use "struct git_attr_check"
+ attr: (re)introduce git_check_attr() and struct git_attr_check
+ attr: rename function and struct related to checking attributes
+ attr.c: plug small leak in parse_attr_line()
+ attr.c: tighten constness around "git_attr" structure
+ attr.c: simplify macroexpand_one()
+ attr.c: mark where #if DEBUG ends more clearly
+ attr.c: complete a sentence in a comment
+ attr.c: explain the lack of attr-name syntax check in parse_attr()
+ attr.c: update a stale comment on "struct match_attr"
+ attr.c: use strchrnul() to scan for one line
+ commit.c: use strchrnul() to scan for one line
(this branch is used by jc/attr-more, sb/pathspec-label and sb/submodule-default-paths.)
The attributes API has been updated so that it can later be
optimized using the knowledge of which attributes are queried.
* cc/apply-introduce-state (2016-06-06) 50 commits
(merged to 'next' on 2016-06-06 at 9f6bdcb)
+ builtin/apply: remove misleading comment on lock_file field
(merged to 'next' on 2016-06-03 at 1ab0cf9)
+ builtin/apply: move 'newfd' global into 'struct apply_state'
+ builtin/apply: add 'lock_file' pointer into 'struct apply_state'
+ builtin/apply: move applying patches into apply_all_patches()
+ builtin/apply: move 'state' check into check_apply_state()
+ builtin/apply: move 'symlink_changes' global into 'struct apply_state'
+ builtin/apply: move 'fn_table' global into 'struct apply_state'
+ builtin/apply: move 'state_linenr' global into 'struct apply_state'
+ builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
+ builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
+ builtin/apply: move 'ws_error_action' into 'struct apply_state'
+ builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
+ builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
+ builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
+ builtin/apply: move 'whitespace_option' into 'struct apply_state'
+ builtin/apply: move 'whitespace_error' global into 'struct apply_state'
+ builtin/apply: move 'root' global into 'struct apply_state'
+ builtin/apply: move 'p_value_known' global into 'struct apply_state'
+ builtin/apply: move 'p_value' global into 'struct apply_state'
+ builtin/apply: move 'has_include' global into 'struct apply_state'
+ builtin/apply: move 'limit_by_name' global into 'struct apply_state'
+ builtin/apply: move 'patch_input_file' global into 'struct apply_state'
+ builtin/apply: move 'apply' global into 'struct apply_state'
+ builtin/apply: move 'p_context' global into 'struct apply_state'
+ builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
+ builtin/apply: move 'line_termination' global into 'struct apply_state'
+ builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
+ builtin/apply: move 'no_add' global into 'struct apply_state'
+ builtin/apply: move 'threeway' global into 'struct apply_state'
+ builtin/apply: move 'summary' global into 'struct apply_state'
+ builtin/apply: move 'numstat' global into 'struct apply_state'
+ builtin/apply: move 'diffstat' global into 'struct apply_state'
+ builtin/apply: move 'cached' global into 'struct apply_state'
+ builtin/apply: move 'allow_overlap' global into 'struct apply_state'
+ builtin/apply: move 'update_index' global into 'struct apply_state'
+ builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
+ builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
+ builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
+ builtin/apply: move 'check_index' global into 'struct apply_state'
+ builtin/apply: move 'check' global into 'struct apply_state'
+ builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
+ builtin/apply: move 'state' init into init_apply_state()
+ builtin/apply: introduce 'struct apply_state' to start libifying
+ builtin/apply: move 'read_stdin' global into cmd_apply()
+ builtin/apply: move 'options' variable into cmd_apply()
+ builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
+ builtin/apply: avoid local variable shadowing 'len' parameter
+ builtin/apply: avoid parameter shadowing 'linenr' global
+ builtin/apply: avoid parameter shadowing 'p_value' global
+ builtin/apply: make gitdiff_verify_name() return void
The "git apply" standalone program is being libified; this is the
first step to move many state variables into a structure that can
be explicitly (re)initialized to make the machinery callable more
than once.
The next step that moves some remaining state variables into the
structure and turns die()s into an error return that propagates up
to the caller is not queued yet but in flight. It would be good to
review the above first and give the remainder of the series a solid
base to build on.
Will hold.
* pb/bisect (2016-05-24) 3 commits
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Beginning of GSoC "git bisect" project.
* sb/pathspec-label (2016-06-03) 6 commits
(merged to 'next' on 2016-06-03 at 362f097)
+ pathspec: disable preload-index when attribute pathspec magic is in use
+ pathspec: allow escaped query values
(merged to 'next' on 2016-05-31 at e72b604)
+ pathspec: allow querying for attributes
+ pathspec: move prefix check out of the inner loop
+ pathspec: move long magic parsing out of prefix_pathspec
+ Documentation: fix a typo
(this branch uses jc/attr; is tangled with jc/attr-more and sb/submodule-default-paths.)
The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
to limit paths that match $pattern further by attribute settings.
The preload-index mechanism is disabled when the new pathspec magic
is in use (at least for now), because the attribute subsystem is
not thread-ready.
Will hold.
* 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.)
* mh/split-under-lock (2016-05-13) 33 commits
(merged to 'next' on 2016-06-03 at 2e71330)
+ lock_ref_sha1_basic(): only handle REF_NODEREF mode
+ commit_ref_update(): remove the flags parameter
+ lock_ref_for_update(): don't resolve symrefs
+ lock_ref_for_update(): don't re-read non-symbolic references
+ refs: resolve symbolic refs first
+ ref_transaction_update(): check refname_is_safe() at a minimum
+ unlock_ref(): move definition higher in the file
+ lock_ref_for_update(): new function
+ add_update(): initialize the whole ref_update
+ verify_refname_available(): adjust constness in declaration
+ refs: don't dereference on rename
+ refs: allow log-only updates
+ delete_branches(): use resolve_refdup()
+ ref_transaction_commit(): correctly report close_ref() failure
+ ref_transaction_create(): disallow recursive pruning
+ refs: make error messages more consistent
+ lock_ref_sha1_basic(): remove unneeded local variable
+ read_raw_ref(): move docstring to header file
+ read_raw_ref(): improve docstring
+ read_raw_ref(): rename symref argument to referent
+ read_raw_ref(): clear *type at start of function
+ read_raw_ref(): rename flags argument to type
+ ref_transaction_commit(): remove local variable n
+ rename_ref(): remove unneeded local variable
+ commit_ref_update(): write error message to *err, not stderr
+ refname_is_safe(): insist that the refname already be normalized
+ refname_is_safe(): don't allow the empty string
+ refname_is_safe(): use skip_prefix()
+ remove_dir_recursively(): add docstring
+ safe_create_leading_directories(): improve docstring
+ read_raw_ref(): don't get confused by an empty directory
+ commit_ref(): if there is an empty dir in the way, delete it
+ t1404: demonstrate a bug resolving references
(this branch is used by mh/ref-iterators.)
Further preparatory work on the refs API before the pluggable
backend series can land.
Will merge to 'master' after 2.9 final.
* ew/fast-import-unpack-limit (2016-05-29) 2 commits
(merged to 'next' on 2016-05-29 at af32aba)
+ fast-import: invalidate pack_id references after loosening
(merged to 'next' on 2016-05-11 at ffd4efb)
+ fast-import: implement unpack limit
"git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
Will hold.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Needs review.
* kn/ref-filter-branch-list (2016-05-17) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Rerolled.
Needs review.
* dt/index-helper (2016-05-20) 20 commits
- index-helper: indexhelper.exitafter config
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: support watchman to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: log warnings
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- pkt-line: add gentle version of packet_write
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
A new "index-helper" daemon has been introduced to give newly
spawned Git process a quicker access to the data in the index, and
optionally interface with the watchman daemon to further reduce the
refresh cost.
Rerolled.
($gmane/295106).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
--------------------------------------------------
[Discarded]
* mh/connect-leak (2016-04-28) 1 commit
. git_connect(): fix memory leak with CONNECT_DIAG_URL
Is already made obsolete with a patch in flight under discussion.
($gmane/292962)
^ permalink raw reply [relevance 3%]
* [PATCH v2 3/3] am: support --patch-format=mboxrd
2016-06-05 4:46 7% [PATCH v2 0/3] support mboxrd format Eric Wong
@ 2016-06-05 4:46 4% ` Eric Wong
0 siblings, 0 replies; 22+ results
From: Eric Wong @ 2016-06-05 4:46 UTC (permalink / raw
To: git; +Cc: Junio C Hamano, Eric Sunshine
Combined with "git format-patch --pretty=mboxrd", this should
allow us to round-trip commit messages with embedded mbox
"From " lines without corruption.
Signed-off-by: Eric Wong <e@80x24.org>
---
Documentation/git-am.txt | 3 ++-
builtin/am.c | 14 +++++++++++---
t/t4150-am.sh | 20 ++++++++++++++++++++
3 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 13cdd7f..6348c29 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -116,7 +116,8 @@ default. You can use `--no-utf8` to override this.
By default the command will try to detect the patch format
automatically. This option allows the user to bypass the automatic
detection and specify the patch format that the patch(es) should be
- interpreted as. Valid formats are mbox, stgit, stgit-series and hg.
+ interpreted as. Valid formats are mbox, mboxrd,
+ stgit, stgit-series and hg.
-i::
--interactive::
diff --git a/builtin/am.c b/builtin/am.c
index 3dfe70b..d5da5fe 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -70,7 +70,8 @@ enum patch_format {
PATCH_FORMAT_MBOX,
PATCH_FORMAT_STGIT,
PATCH_FORMAT_STGIT_SERIES,
- PATCH_FORMAT_HG
+ PATCH_FORMAT_HG,
+ PATCH_FORMAT_MBOXRD
};
enum keep_type {
@@ -712,7 +713,8 @@ done:
* Splits out individual email patches from `paths`, where each path is either
* a mbox file or a Maildir. Returns 0 on success, -1 on failure.
*/
-static int split_mail_mbox(struct am_state *state, const char **paths, int keep_cr)
+static int split_mail_mbox(struct am_state *state, const char **paths,
+ int keep_cr, int mboxrd)
{
struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf last = STRBUF_INIT;
@@ -724,6 +726,8 @@ static int split_mail_mbox(struct am_state *state, const char **paths, int keep_
argv_array_push(&cp.args, "-b");
if (keep_cr)
argv_array_push(&cp.args, "--keep-cr");
+ if (mboxrd)
+ argv_array_push(&cp.args, "--mboxrd");
argv_array_push(&cp.args, "--");
argv_array_pushv(&cp.args, paths);
@@ -965,13 +969,15 @@ static int split_mail(struct am_state *state, enum patch_format patch_format,
switch (patch_format) {
case PATCH_FORMAT_MBOX:
- return split_mail_mbox(state, paths, keep_cr);
+ return split_mail_mbox(state, paths, keep_cr, 0);
case PATCH_FORMAT_STGIT:
return split_mail_conv(stgit_patch_to_mail, state, paths, keep_cr);
case PATCH_FORMAT_STGIT_SERIES:
return split_mail_stgit_series(state, paths, keep_cr);
case PATCH_FORMAT_HG:
return split_mail_conv(hg_patch_to_mail, state, paths, keep_cr);
+ case PATCH_FORMAT_MBOXRD:
+ return split_mail_mbox(state, paths, keep_cr, 1);
default:
die("BUG: invalid patch_format");
}
@@ -2201,6 +2207,8 @@ static int parse_opt_patchformat(const struct option *opt, const char *arg, int
*opt_value = PATCH_FORMAT_STGIT_SERIES;
else if (!strcmp(arg, "hg"))
*opt_value = PATCH_FORMAT_HG;
+ else if (!strcmp(arg, "mboxrd"))
+ *opt_value = PATCH_FORMAT_MBOXRD;
else
return error(_("Invalid value for --patch-format: %s"), arg);
return 0;
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index b41bd17..9ce9424 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -957,4 +957,24 @@ test_expect_success 'am -s unexpected trailer block' '
test_cmp expect actual
'
+test_expect_success 'am --patch-format=mboxrd handles mboxrd' '
+ rm -fr .git/rebase-apply &&
+ git checkout -f first &&
+ echo mboxrd >>file &&
+ git add file &&
+ cat >msg <<-\INPUT_END &&
+ mboxrd should escape the body
+
+ From could trip up a loose mbox parser
+ >From extra escape for reversibility
+ INPUT_END
+ git commit -F msg &&
+ git format-patch --pretty=mboxrd --stdout -1 >mboxrd1 &&
+ grep "^>From could trip up a loose mbox parser" mboxrd1 &&
+ git checkout -f first &&
+ git am --patch-format=mboxrd mboxrd1 &&
+ git cat-file commit HEAD | tail -n4 >out &&
+ test_cmp msg out
+'
+
test_done
^ permalink raw reply related [relevance 4%]
* [PATCH v2 0/3] support mboxrd format
@ 2016-06-05 4:46 7% Eric Wong
2016-06-05 4:46 4% ` [PATCH v2 3/3] am: support --patch-format=mboxrd Eric Wong
0 siblings, 1 reply; 22+ results
From: Eric Wong @ 2016-06-05 4:46 UTC (permalink / raw
To: git; +Cc: Junio C Hamano, Eric Sunshine
Changes since v2:
* beef up tests, including accounting for the trailing whitespace
omission in pretty output but still accepting and preserving
trailing whitespace in mailsplit.
* indicate disabling variable interpolation in heredoc (but
using variable interpolation as needed for trailing space
in tests).
* use "git grep" for "-A<NUM>" for portability
* avoid the use of regexp for matching /^From / and /^>+From /
Thanks to Eric Sunshine and Junio for helping with the first round.
v1 started at http://mid.gmane.org/20160530232142.21098-1-e@80x24.org
The following changes since commit 6326f199252a1a5fbdea105473f8305d850cdd87:
Almost ready for 2.9-rc2 (2016-06-03 14:38:35 -0700)
are available in the git repository at:
git://bogomips.org/git-svn.git mboxrd-v2
for you to fetch changes up to 1ab223c4f7b8d6cc246f873795d89ac97da84ae1:
am: support --patch-format=mboxrd (2016-06-05 04:16:57 +0000)
----------------------------------------------------------------
Eric Wong (3):
pretty: support "mboxrd" output format
mailsplit: support unescaping mboxrd messages
am: support --patch-format=mboxrd
Documentation/git-am.txt | 3 ++-
Documentation/git-mailsplit.txt | 7 ++++++-
builtin/am.c | 14 +++++++++++---
builtin/log.c | 2 +-
builtin/mailsplit.c | 18 ++++++++++++++++++
commit.h | 6 ++++++
log-tree.c | 4 ++--
pretty.c | 33 +++++++++++++++++++++++++--------
t/t4014-format-patch.sh | 41 +++++++++++++++++++++++++++++++++++++++++
t/t4150-am.sh | 20 ++++++++++++++++++++
t/t5100-mailinfo.sh | 31 +++++++++++++++++++++++++++++++
t/t5100/0001mboxrd | 4 ++++
t/t5100/0002mboxrd | 5 +++++
t/t5100/sample.mboxrd | 19 +++++++++++++++++++
14 files changed, 191 insertions(+), 16 deletions(-)
create mode 100644 t/t5100/0001mboxrd
create mode 100644 t/t5100/0002mboxrd
create mode 100644 t/t5100/sample.mboxrd
^ permalink raw reply [relevance 7%]
* [PATCH 3/3] am: support --patch-format=mboxrd
2016-05-30 23:21 7% [RFC/PATCH 0/3] support mboxrd format Eric Wong
@ 2016-05-30 23:21 4% ` Eric Wong
0 siblings, 0 replies; 22+ results
From: Eric Wong @ 2016-05-30 23:21 UTC (permalink / raw
To: git; +Cc: Eric Wong
Combined with "git format-patch --pretty=mboxrd", this should
allow us to round-trip commit messages with embedded mbox
"From " lines without corruption.
Signed-off-by: Eric Wong <e@80x24.org>
---
Documentation/git-am.txt | 3 ++-
builtin/am.c | 14 +++++++++++---
t/t4150-am.sh | 20 ++++++++++++++++++++
3 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 13cdd7f..6348c29 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -116,7 +116,8 @@ default. You can use `--no-utf8` to override this.
By default the command will try to detect the patch format
automatically. This option allows the user to bypass the automatic
detection and specify the patch format that the patch(es) should be
- interpreted as. Valid formats are mbox, stgit, stgit-series and hg.
+ interpreted as. Valid formats are mbox, mboxrd,
+ stgit, stgit-series and hg.
-i::
--interactive::
diff --git a/builtin/am.c b/builtin/am.c
index 3dfe70b..d5da5fe 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -70,7 +70,8 @@ enum patch_format {
PATCH_FORMAT_MBOX,
PATCH_FORMAT_STGIT,
PATCH_FORMAT_STGIT_SERIES,
- PATCH_FORMAT_HG
+ PATCH_FORMAT_HG,
+ PATCH_FORMAT_MBOXRD
};
enum keep_type {
@@ -712,7 +713,8 @@ done:
* Splits out individual email patches from `paths`, where each path is either
* a mbox file or a Maildir. Returns 0 on success, -1 on failure.
*/
-static int split_mail_mbox(struct am_state *state, const char **paths, int keep_cr)
+static int split_mail_mbox(struct am_state *state, const char **paths,
+ int keep_cr, int mboxrd)
{
struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf last = STRBUF_INIT;
@@ -724,6 +726,8 @@ static int split_mail_mbox(struct am_state *state, const char **paths, int keep_
argv_array_push(&cp.args, "-b");
if (keep_cr)
argv_array_push(&cp.args, "--keep-cr");
+ if (mboxrd)
+ argv_array_push(&cp.args, "--mboxrd");
argv_array_push(&cp.args, "--");
argv_array_pushv(&cp.args, paths);
@@ -965,13 +969,15 @@ static int split_mail(struct am_state *state, enum patch_format patch_format,
switch (patch_format) {
case PATCH_FORMAT_MBOX:
- return split_mail_mbox(state, paths, keep_cr);
+ return split_mail_mbox(state, paths, keep_cr, 0);
case PATCH_FORMAT_STGIT:
return split_mail_conv(stgit_patch_to_mail, state, paths, keep_cr);
case PATCH_FORMAT_STGIT_SERIES:
return split_mail_stgit_series(state, paths, keep_cr);
case PATCH_FORMAT_HG:
return split_mail_conv(hg_patch_to_mail, state, paths, keep_cr);
+ case PATCH_FORMAT_MBOXRD:
+ return split_mail_mbox(state, paths, keep_cr, 1);
default:
die("BUG: invalid patch_format");
}
@@ -2201,6 +2207,8 @@ static int parse_opt_patchformat(const struct option *opt, const char *arg, int
*opt_value = PATCH_FORMAT_STGIT_SERIES;
else if (!strcmp(arg, "hg"))
*opt_value = PATCH_FORMAT_HG;
+ else if (!strcmp(arg, "mboxrd"))
+ *opt_value = PATCH_FORMAT_MBOXRD;
else
return error(_("Invalid value for --patch-format: %s"), arg);
return 0;
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index b41bd17..74e093d 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -957,4 +957,24 @@ test_expect_success 'am -s unexpected trailer block' '
test_cmp expect actual
'
+test_expect_success 'am --patch-format=mboxrd handles mboxrd' '
+ rm -fr .git/rebase-apply &&
+ git checkout -f first &&
+ echo mboxrd >>file &&
+ git add file &&
+ cat >msg <<-INPUT_END &&
+ mboxrd should escape the body
+
+ From could trip up a loose mbox parser
+ >From extra escape for reversibility
+ INPUT_END
+ git commit -F msg &&
+ git format-patch --pretty=mboxrd --stdout -1 >mboxrd1 &&
+ grep "^>From could trip up a loose mbox parser" mboxrd1 &&
+ git checkout -f first &&
+ git am --patch-format=mboxrd mboxrd1 &&
+ git cat-file commit HEAD | tail -n4 >out &&
+ test_cmp msg out
+'
+
test_done
^ permalink raw reply related [relevance 4%]
* [RFC/PATCH 0/3] support mboxrd format
@ 2016-05-30 23:21 7% Eric Wong
2016-05-30 23:21 4% ` [PATCH 3/3] am: support --patch-format=mboxrd Eric Wong
0 siblings, 1 reply; 22+ results
From: Eric Wong @ 2016-05-30 23:21 UTC (permalink / raw
To: git
Sometimes users will copy+paste an entire mbox into a
commit message, leading to bad splits when a patch is
output as an email.
Unlike other mbox-family formats, mboxrd allows reversible
round-tripping while avoiding bad splits for old "mboxo"
readers.
I'm also considering altering the current
"From ${COMMIT} Mon Sep 17 00:00:00 2001" line to something
else so mailsplit (or "am") can autodetect.
Maybe:
From ${COMMIT}@mboxrd Mon Sep 17 00:00:00 2001
?
We may also want to default to single escaping "From " in
commit messages for --pretty=email to avoid corruption when
somebody copy+pastes an mbox into the commit message.
This is a technically incompatible change, but I think it's
preferable to breaking splitting complete.
In other words, --pretty=email changes to output "mboxo"
for now.
Long term (possibly git 3.0?), maybe mboxrd can become the
default mail format. IMHO, it should've been since 2005.
ref: http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/mail-mbox-formats.html
Eric Wong (3):
pretty: support "mboxrd" output format
mailsplit: support unescaping mboxrd messages
am: support --patch-format=mboxrd
Documentation/git-am.txt | 3 ++-
Documentation/git-mailsplit.txt | 7 ++++++-
builtin/am.c | 14 ++++++++++---
builtin/log.c | 2 +-
builtin/mailsplit.c | 23 +++++++++++++++++++++
commit.h | 6 ++++++
log-tree.c | 4 ++--
pretty.c | 45 +++++++++++++++++++++++++++++++++--------
t/t4014-format-patch.sh | 27 +++++++++++++++++++++++++
t/t4150-am.sh | 20 ++++++++++++++++++
t/t5100-mailinfo.sh | 13 ++++++++++++
t/t5100/0001mboxrd | 4 ++++
t/t5100/0002mboxrd | 3 +++
t/t5100/sample.mboxrd | 17 ++++++++++++++++
14 files changed, 172 insertions(+), 16 deletions(-)
^ permalink raw reply [relevance 7%]
Results 1-22 of 22 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-05-30 23:21 7% [RFC/PATCH 0/3] support mboxrd format Eric Wong
2016-05-30 23:21 4% ` [PATCH 3/3] am: support --patch-format=mboxrd Eric Wong
2016-06-05 4:46 7% [PATCH v2 0/3] support mboxrd format Eric Wong
2016-06-05 4:46 4% ` [PATCH v2 3/3] am: support --patch-format=mboxrd Eric Wong
2016-06-07 5:58 3% What's cooking in git.git (Jun 2016, #02; Mon, 6) Junio C Hamano
2016-06-09 17:21 3% What's cooking in git.git (Jun 2016, #03; Thu, 9) Junio C Hamano
2016-06-14 22:08 3% What's cooking in git.git (Jun 2016, #04; Tue, 14) Junio C Hamano
2016-06-15 2:36 0% ` Mike Hommey
2016-06-15 7:35 0% ` Elia Pinto
2016-06-17 3:20 3% What's cooking in git.git (Jun 2016, #05; Thu, 16) Junio C Hamano
2016-06-19 22:46 3% What's cooking in git.git (Jun 2016, #06; Sun, 19) Junio C Hamano
2016-06-20 23:11 3% What's cooking in git.git (Jun 2016, #07; Mon, 20) Junio C Hamano
2016-06-23 22:37 3% What's cooking in git.git (Jun 2016, #08; Thu, 23) Junio C Hamano
2016-06-27 23:21 3% What's cooking in git.git (Jun 2016, #09; Mon, 27) Junio C Hamano
2016-06-28 23:36 3% preview: What's cooking in git.git (Jun 2016, #10; Tue, 28) Junio C Hamano
2016-06-29 23:22 3% What's cooking in git.git (Jun 2016, #10; Wed, 29) Junio C Hamano
2016-07-01 23:50 3% What's cooking in git.git (Jul 2016, #01; Fri, 1) Junio C Hamano
2016-07-06 21:39 3% What's cooking in git.git (Jul 2016, #02; Wed, 6) Junio C Hamano
2016-08-14 22:47 3% [ANNOUNCE] Git v2.10.0-rc0 Junio C Hamano
2016-08-19 23:10 3% [ANNOUNCE] Git v2.10.0-rc1 Junio C Hamano
2016-08-26 22:31 3% [ANNOUNCE] Git v2.10.0-rc2 Junio C Hamano
2016-09-03 2:17 3% [ANNOUNCE] Git v2.10.0 Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).