mirror of
https://github.com/git/git.git
synced 2026-08-09 09:34:14 +00:00
What's cooking (2016/04 #02)
This commit is contained in:
Junio C Hamano
@@ -1,10 +1,10 @@
|
||||
To: git@vger.kernel.org
|
||||
Bcc: lwn@lwn.net
|
||||
Subject: What's cooking in git.git (Apr 2016, #01; Fri, 1)
|
||||
X-master-at: 90f7b16b3adc78d4bbabbd426fb69aa78c714f71
|
||||
X-next-at: 9d4de1f0cb995171390ad99185bae1b0cbc1de70
|
||||
Subject: What's cooking in git.git (Apr 2016, #02; Mon, 4)
|
||||
X-master-at: 6a269e52a5d0c82567c5b39cc194cc90f9fa9156
|
||||
X-next-at: a49ec4a3520e76c257792c73d6347383649ee5c2
|
||||
|
||||
What's cooking in git.git (Apr 2016, #01; Fri, 1)
|
||||
What's cooking in git.git (Apr 2016, #02; Mon, 4)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with
|
||||
@@ -12,11 +12,13 @@ Here are the topics that have been cooking. 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.
|
||||
|
||||
There are quite a few topics that have been cooking in 'next' during
|
||||
the pre-2.8 freeze period that are ready to be merged to 'master';
|
||||
the first batch will be merged early next week, and then the tip of
|
||||
'next' will be rebuilt on top sometime mid next week. Let's start
|
||||
looking at new shiny toys after all that happens.
|
||||
The tip of 'next' has been rewound, the first maintenance release
|
||||
v2.8.1 that most everybody can safely ignore has been tagged, and
|
||||
the first batch of topics that have been cooking in 'next' during
|
||||
the pre-2.8 freeze period are now in 'master'.
|
||||
|
||||
There are a handful of topics that are stuck; they are marked as
|
||||
"Needs review", "Needs an Ack", etc. in the following list.
|
||||
|
||||
You can find the changes described here in the integration branches
|
||||
of the repositories listed at
|
||||
@@ -26,13 +28,258 @@ of the repositories listed at
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jn/mergetools-examdiff (2016-03-28) 2 commits
|
||||
* es/format-patch-doc-hide-no-patch (2016-04-04) 1 commit
|
||||
- git-format-patch.txt: don't show -s as shorthand for multiple options
|
||||
|
||||
"git format-patch --help" showed `-s` and `--no-patch` as if these
|
||||
are valid options to the command. We already hide `--patch` option
|
||||
from the documentation, because format-patch is about showing the
|
||||
diff, and the documentation now hides these options as well.
|
||||
|
||||
Will merge to next.
|
||||
|
||||
|
||||
* jk/branch-shortening-funny-symrefs (2016-04-04) 1 commit
|
||||
- branch: fix shortening of non-remote symrefs
|
||||
|
||||
A change back in version 2.7 to "git branch" broke display of a
|
||||
symbolic refs in a non-standard place in the refs/ hierarchy (we
|
||||
expect symbolic refs to appear in refs/remotes/*/HEAD to point at
|
||||
the primary branch the remote has, and as .git/HEAD to point at the
|
||||
branch we locally checked out).
|
||||
|
||||
Will merge to next.
|
||||
and later down to maint-2.7.
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* es/test-gpg-tags (2016-03-06) 4 commits
|
||||
(merged to 'next' on 2016-03-15 at 617119f)
|
||||
+ t6302: skip only signed tags rather than all tests when GPG is missing
|
||||
+ t6302: also test annotated in addition to signed tags
|
||||
+ t6302: normalize names and descriptions of signed tags
|
||||
+ lib-gpg: drop unnecessary "missing GPG" warning
|
||||
|
||||
A test for tags has been restructured so that more parts of it can
|
||||
easily be run on a platform without a working GnuPG.
|
||||
|
||||
|
||||
* gf/fetch-pack-direct-object-fetch (2016-03-05) 2 commits
|
||||
(merged to 'next' on 2016-03-06 at 5628860)
|
||||
+ fetch-pack: update the documentation for "<refs>..." arguments
|
||||
(merged to 'next' on 2016-03-04 at 49199e0)
|
||||
+ fetch-pack: fix object_id of exact sha1
|
||||
|
||||
Fetching of history by naming a commit object name directly didn't
|
||||
work across remote-curl transport.
|
||||
|
||||
|
||||
* jc/index-pack (2016-03-03) 2 commits
|
||||
(merged to 'next' on 2016-03-15 at 42efaa7)
|
||||
+ index-pack: add a helper function to derive .idx/.keep filename
|
||||
+ Merge branch 'jc/maint-index-pack-keep' into jc/index-pack
|
||||
(this branch is used by jc/bundle; uses jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)
|
||||
|
||||
Code clean-up.
|
||||
|
||||
|
||||
* jc/maint-index-pack-keep (2016-03-03) 1 commit
|
||||
(merged to 'next' on 2016-03-04 at bc1d37a)
|
||||
+ index-pack: correct --keep[=<msg>]
|
||||
(this branch is used by jc/bundle, jc/index-pack and jc/index-pack-clone-bundle.)
|
||||
|
||||
"git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.
|
||||
|
||||
|
||||
* jk/add-i-highlight (2016-02-28) 1 commit
|
||||
(merged to 'next' on 2016-03-04 at 4ac3aa1)
|
||||
+ add--interactive: allow custom diff highlighting programs
|
||||
|
||||
A new "interactive.diffFilter" configuration can be used to
|
||||
customize the diff shown in "git add -i" session.
|
||||
|
||||
|
||||
* jk/config-get-urlmatch (2016-02-28) 3 commits
|
||||
(merged to 'next' on 2016-03-04 at feeb192)
|
||||
+ Documentation/git-config: fix --get-all description
|
||||
+ Documentation/git-config: use bulleted list for exit codes
|
||||
+ config: fail if --get-urlmatch finds no value
|
||||
|
||||
"git config --get-urlmatch", unlike other variants of the "git
|
||||
config --get" family, did not signal error with its exit status
|
||||
when there was no matching configuration.
|
||||
|
||||
|
||||
* jk/credential-clear-config (2016-02-26) 1 commit
|
||||
(merged to 'next' on 2016-03-04 at f7b26b7)
|
||||
+ credential: let empty credential specs reset helper list
|
||||
|
||||
The credential.helper configuration variable is cumulative and
|
||||
there is no good way to override it from the command line. As
|
||||
a special case, giving an empty string as its value now serves
|
||||
as the signal to clear the values specified in various files.
|
||||
|
||||
|
||||
* jk/getwholeline-getdelim-empty (2016-03-05) 1 commit
|
||||
(merged to 'next' on 2016-03-15 at e70d4bd)
|
||||
+ strbuf_getwholeline: NUL-terminate getdelim buffer on error
|
||||
|
||||
strbuf_getwholeline() did not NUL-terminate the buffer on certain
|
||||
corner cases in its error codepath.
|
||||
|
||||
|
||||
* jk/rev-parse-local-env-vars (2016-02-29) 2 commits
|
||||
(merged to 'next' on 2016-03-04 at a0300d5)
|
||||
+ rev-parse: let some options run outside repository
|
||||
+ t1515: add tests for rev-parse out-of-repo helpers
|
||||
|
||||
The "--local-env-vars" and "--resolve-git-dir" options of "git
|
||||
rev-parse" failed to work outside a repository when the command's
|
||||
option parsing was rewritten in 1.8.5 era.
|
||||
|
||||
|
||||
* jk/startup-info (2016-03-07) 6 commits
|
||||
(merged to 'next' on 2016-03-15 at eb95e5f)
|
||||
+ use setup_git_directory() in test-* programs
|
||||
+ grep: turn off gitlink detection for --no-index
|
||||
+ mailmap: do not resolve blobs in a non-repository
|
||||
+ remote: don't resolve HEAD in non-repository
|
||||
+ setup: set startup_info->have_repository more reliably
|
||||
+ setup: make startup_info available everywhere
|
||||
|
||||
The startup_info data, which records if we are working inside a
|
||||
repository (among other things), are now uniformly available to Git
|
||||
subcommand implementations, and Git avoids attempting to touch
|
||||
references when we are not in a repository.
|
||||
|
||||
|
||||
* mm/diff-renames-default (2016-02-25) 5 commits
|
||||
(merged to 'next' on 2016-02-25 at 947c399)
|
||||
+ diff: activate diff.renames by default
|
||||
+ log: introduce init_log_defaults()
|
||||
+ t: add tests for diff.renames (true/false/unset)
|
||||
+ t4001-diff-rename: wrap file creations in a test
|
||||
+ Documentation/diff-config: fix description of diff.renames
|
||||
|
||||
The end-user facing Porcelain level commands like "diff" and "log"
|
||||
now enables the rename detection by default.
|
||||
|
||||
|
||||
* mm/lockfile-error-message (2016-03-01) 2 commits
|
||||
(merged to 'next' on 2016-03-04 at 04ed7e6)
|
||||
+ lockfile: improve error message when lockfile exists
|
||||
+ lockfile: mark strings for translation
|
||||
|
||||
|
||||
* mm/readme-markdown (2016-04-01) 2 commits
|
||||
- git.spec: use README.md, not README
|
||||
(merged to 'next' on 2016-03-01 at 81f3858)
|
||||
+ README.md: don't take 'commandname' literally
|
||||
|
||||
The top-level README file has been updated to be more appropriate
|
||||
for the sign on the front door to welcome new acquaintances to Git
|
||||
by toning down inside jokes and making it into MarkDown.
|
||||
|
||||
|
||||
* mp/upload-pack-use-embedded-args (2016-02-25) 1 commit
|
||||
(merged to 'next' on 2016-02-26 at f0a54e5)
|
||||
+ upload-pack: use argv_array for pack_objects
|
||||
|
||||
The embedded args argv-array in the child process is used to build
|
||||
the command line to run pack-objects instead of using a separate
|
||||
array of strings.
|
||||
|
||||
|
||||
* rj/xdiff-prepare-plug-leak-on-error-codepath (2016-03-04) 2 commits
|
||||
(merged to 'next' on 2016-03-15 at f72755e)
|
||||
+ xdiff/xprepare: fix a memory leak
|
||||
+ xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
|
||||
|
||||
A small memory leak in an error codepath has been plugged in xdiff
|
||||
code.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* 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.
|
||||
|
||||
Needs review.
|
||||
|
||||
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.
|
||||
|
||||
|
||||
* 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]
|
||||
|
||||
* jn/mergetools-examdiff (2016-04-04) 2 commits
|
||||
- mergetools: add support for ExamDiff
|
||||
- mergetools: create mergetool_find_win32_cmd() helper function for winmerge
|
||||
|
||||
"git mergetools" learned to drive ExamDiff.
|
||||
|
||||
Waiting for an Ack by the area expert.
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* kn/for-each-tag-branch (2016-03-30) 1 commit
|
||||
@@ -183,13 +430,13 @@ of the repositories listed at
|
||||
|
||||
|
||||
* tb/safe-crlf-output-fix (2016-04-01) 7 commits
|
||||
- convert.c: more safer crlf handling with text attribute
|
||||
- correct blame for files commited with CRLF
|
||||
- convert: unify the "auto" handling of CRLF
|
||||
- t0027: test cases for combined attributes
|
||||
- convert: allow core.autocrlf=input and core.eol=crlf
|
||||
- convert.c: stream and early out
|
||||
- read-cache: factor out get_sha1_from_index() helper
|
||||
. convert.c: more safer crlf handling with text attribute
|
||||
. correct blame for files commited with CRLF
|
||||
. convert: unify the "auto" handling of CRLF
|
||||
. t0027: test cases for combined attributes
|
||||
. convert: allow core.autocrlf=input and core.eol=crlf
|
||||
. convert.c: stream and early out
|
||||
. read-cache: factor out get_sha1_from_index() helper
|
||||
|
||||
The "safe CRLF" facility disables line-end conversion from CRLF to
|
||||
LF when checking in if the blob registered to the index already
|
||||
@@ -197,84 +444,10 @@ of the repositories listed at
|
||||
and instead assumed that only the configuration and attribute
|
||||
settings determined how the data from the working tree is converted.
|
||||
|
||||
Comments sent.
|
||||
($gmane/290548)
|
||||
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* 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)
|
||||
($gmane/290637)
|
||||
|
||||
|
||||
* 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.
|
||||
|
||||
Needs review.
|
||||
|
||||
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.
|
||||
|
||||
|
||||
* 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/use-hashmap-iter-first-in-submodule-config (2016-03-23) 1 commit
|
||||
- submodule-config: use hashmap_iter_first()
|
||||
|
||||
@@ -292,7 +465,7 @@ of the repositories listed at
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* ky/branch-m-worktree (2016-03-28) 2 commits
|
||||
* ky/branch-m-worktree (2016-04-04) 2 commits
|
||||
- branch -m: update all per-worktree HEADs
|
||||
- refs: add a new function set_worktree_head_symref
|
||||
|
||||
@@ -300,7 +473,7 @@ of the repositories listed at
|
||||
branch that is checked out in another worktree without adjusting
|
||||
the HEAD symbolic ref for the worktree.
|
||||
|
||||
Needs review by "refs" area experts.
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* nd/apply-doc (2016-03-24) 2 commits
|
||||
@@ -325,6 +498,8 @@ of the repositories listed at
|
||||
|
||||
Minor API documentation update.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* rt/completion-help (2016-03-24) 2 commits
|
||||
- completion: add 'revisions' and 'everyday' to 'git help'
|
||||
@@ -364,15 +539,16 @@ of the repositories listed at
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* mj/pull-rebase-autostash (2016-03-29) 7 commits
|
||||
* mj/pull-rebase-autostash (2016-04-04) 9 commits
|
||||
- t5520: test --[no-]autostash with pull.rebase=true
|
||||
- t5520: modify tests to reduce common code
|
||||
- t5520: use test_i18ngrep instead of test_cmp
|
||||
- t5520: explicitly unset rebase.autostash
|
||||
- t5520: reduce commom lines of code
|
||||
- t5520: factor out common "failing autostash" code
|
||||
- t5520: factor out common "successful autostash" code
|
||||
- t5520: use better test to check stderr output
|
||||
- t5520: ensure consistent test conditions
|
||||
- t5520: use consistent capitalization in test titles
|
||||
(merged to 'next' on 2016-03-23 at ebf1afa)
|
||||
+ pull --rebase: add --[no-]autostash flag
|
||||
+ git-pull.c: introduce git_pull_config()
|
||||
- pull --rebase: add --[no-]autostash flag
|
||||
- git-pull.c: introduce git_pull_config()
|
||||
|
||||
"git pull --rebase" learned "--[no-]autostash" option, so that
|
||||
the rebase.autostash configuration variable set to true can be
|
||||
@@ -393,19 +569,23 @@ of the repositories listed at
|
||||
|
||||
|
||||
* pb/t7502-drop-dup (2016-03-11) 1 commit
|
||||
(merged to 'next' on 2016-03-15 at 037c877)
|
||||
(merged to 'next' on 2016-04-04 at 4799cad)
|
||||
+ t/t7502 : drop duplicate test
|
||||
(this branch is used by pb/commit-verbose-config.)
|
||||
|
||||
Originally merged to 'next' on 2016-03-15
|
||||
|
||||
Code clean-up.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* ss/commit-squash-msg (2016-03-21) 1 commit
|
||||
(merged to 'next' on 2016-03-23 at 0b72631)
|
||||
(merged to 'next' on 2016-04-04 at d389f19)
|
||||
+ commit: do not lose SQUASH_MSG contents
|
||||
|
||||
Originally merged to 'next' on 2016-03-23
|
||||
|
||||
When "git merge --squash" stopped due to conflict, the concluding
|
||||
"git commit" failed to read in the SQUASH_MSG that shows the log
|
||||
messages from all the squashed commits.
|
||||
@@ -414,16 +594,23 @@ of the repositories listed at
|
||||
|
||||
|
||||
* ls/p4-map-user (2016-03-15) 1 commit
|
||||
(merged to 'next' on 2016-03-23 at 9e0a4f5)
|
||||
(merged to 'next' on 2016-04-04 at a56b011)
|
||||
+ git-p4: map a P4 user to Git author name and email address
|
||||
|
||||
Originally merged to 'next' on 2016-03-23
|
||||
|
||||
"git p4" now allows P4 author names to be mapped to Git author
|
||||
names.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* jc/merge-refuse-new-root (2016-03-23) 1 commit
|
||||
(merged to 'next' on 2016-03-23 at d7da4cf)
|
||||
(merged to 'next' on 2016-04-04 at cd70fd6)
|
||||
+ merge: refuse to create too cool a merge by default
|
||||
|
||||
Originally merged to 'next' on 2016-03-23
|
||||
|
||||
"git merge" used to allow merging two branches that have no common
|
||||
base by default, which led to a brand new history of an existing
|
||||
project created and then get pulled by an unsuspecting maintainer,
|
||||
@@ -437,23 +624,37 @@ of the repositories listed at
|
||||
|
||||
|
||||
* jk/credential-cache-comment-exit (2016-03-18) 1 commit
|
||||
(merged to 'next' on 2016-03-23 at d2b8cc7)
|
||||
(merged to 'next' on 2016-04-04 at 50427fe)
|
||||
+ credential-cache--daemon: clarify "exit" action semantics
|
||||
|
||||
Originally merged to 'next' on 2016-03-23
|
||||
|
||||
A code clarification.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* jk/send-email-rtrim-mailrc-alias (2016-03-18) 1 commit
|
||||
(merged to 'next' on 2016-03-23 at 74f1f44)
|
||||
(merged to 'next' on 2016-04-04 at 4d54956)
|
||||
+ send-email: ignore trailing whitespace in mailrc alias file
|
||||
|
||||
Originally merged to 'next' on 2016-03-23
|
||||
|
||||
"git send-email" had trouble parsing alias file in mailrc format
|
||||
when lines in it had trailing whitespaces on them.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* jk/test-httpd-config-nosystem (2016-03-18) 1 commit
|
||||
(merged to 'next' on 2016-03-23 at 245263b)
|
||||
(merged to 'next' on 2016-04-04 at 5fa6274)
|
||||
+ t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
|
||||
|
||||
Originally merged to 'next' on 2016-03-23
|
||||
|
||||
The tests that involve running httpd leaked the system-wide
|
||||
configuration in /etc/gitconfig to the tested environment.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
@@ -477,19 +678,23 @@ of the repositories listed at
|
||||
|
||||
|
||||
* sb/clone-t57-t56 (2016-03-16) 1 commit
|
||||
(merged to 'next' on 2016-03-23 at 5df850d)
|
||||
(merged to 'next' on 2016-04-04 at 5c20247)
|
||||
+ clone tests: rename t57* => t56*
|
||||
|
||||
Originally merged to 'next' on 2016-03-23
|
||||
|
||||
Rename bunch of tests on "git clone" for better organization.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* sb/rebase-x (2016-03-18) 2 commits
|
||||
(merged to 'next' on 2016-03-23 at ef8861b)
|
||||
(merged to 'next' on 2016-04-04 at feda620)
|
||||
+ t3404: cleanup double empty lines between tests
|
||||
+ rebase: decouple --exec from --interactive
|
||||
|
||||
Originally merged to 'next' on 2016-03-23
|
||||
|
||||
"git rebase -x" can be used without passing "-i" option.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
@@ -498,11 +703,10 @@ of the repositories listed at
|
||||
* cc/apply (2016-04-01) 4 commits
|
||||
- builtin/apply: free patch when parse_chunk() fails
|
||||
- builtin/apply: handle parse_binary() failure
|
||||
(merged to 'next' on 2016-03-24 at 70623f2)
|
||||
+ apply: remove unused call to free() in gitdiff_{old,new}name()
|
||||
+ builtin/apply: get rid of useless 'name' variable
|
||||
- apply: remove unused call to free() in gitdiff_{old,new}name()
|
||||
- builtin/apply: get rid of useless 'name' variable
|
||||
|
||||
Code clean-up.
|
||||
Minor code clean-up.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
@@ -529,9 +733,11 @@ of the repositories listed at
|
||||
|
||||
|
||||
* jv/merge-nothing-into-void (2016-03-23) 1 commit
|
||||
(merged to 'next' on 2016-03-23 at 40b905d)
|
||||
(merged to 'next' on 2016-04-04 at aa37405)
|
||||
+ merge: fix NULL pointer dereference when merging nothing into void
|
||||
|
||||
Originally merged to 'next' on 2016-03-23
|
||||
|
||||
"git merge FETCH_HEAD" dereferenced NULL pointer when merging
|
||||
nothing into an unborn history (which is arguably unusual usage,
|
||||
which perhaps was the reason why nobody noticed it).
|
||||
@@ -540,9 +746,11 @@ of the repositories listed at
|
||||
|
||||
|
||||
* la/tag-force-signing-annotated-tags (2016-03-22) 1 commit
|
||||
(merged to 'next' on 2016-03-24 at 424da3f)
|
||||
(merged to 'next' on 2016-04-04 at a49ec4a)
|
||||
+ tag: add the option to force signing of annotated tags
|
||||
|
||||
Originally merged to 'next' on 2016-03-24
|
||||
|
||||
"git tag" can create an annotated tag without explicitly given an
|
||||
"-a" (or "-s") option (i.e. when a tag message is given). A new
|
||||
configuration variable, tag.forceSignAnnotated, can be used to tell
|
||||
@@ -552,151 +760,29 @@ of the repositories listed at
|
||||
|
||||
|
||||
* cc/doc-recommend-performance-trace-to-file (2016-03-07) 1 commit
|
||||
(merged to 'next' on 2016-03-23 at 086b9f2)
|
||||
(merged to 'next' on 2016-04-04 at 26f94c0)
|
||||
+ Documentation: talk about pager in api-trace.txt
|
||||
|
||||
Originally merged to 'next' on 2016-03-23
|
||||
|
||||
A minor documentation update.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* da/mergetool-delete-delete-conflict (2016-03-10) 2 commits
|
||||
(merged to 'next' on 2016-03-15 at 281a81a)
|
||||
(merged to 'next' on 2016-04-04 at 34e645f)
|
||||
+ mergetool: honor tempfile configuration when resolving delete conflicts
|
||||
+ mergetool: support delete/delete conflicts
|
||||
|
||||
Originally merged to 'next' on 2016-03-15
|
||||
|
||||
"git mergetool" did not work well with conflicts that both sides
|
||||
deleted.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* es/test-gpg-tags (2016-03-06) 4 commits
|
||||
(merged to 'next' on 2016-03-15 at 617119f)
|
||||
+ t6302: skip only signed tags rather than all tests when GPG is missing
|
||||
+ t6302: also test annotated in addition to signed tags
|
||||
+ t6302: normalize names and descriptions of signed tags
|
||||
+ lib-gpg: drop unnecessary "missing GPG" warning
|
||||
|
||||
A test for tags has been restructured so that more parts of it can
|
||||
easily be run on a platform without a working GnuPG.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* jk/getwholeline-getdelim-empty (2016-03-05) 1 commit
|
||||
(merged to 'next' on 2016-03-15 at e70d4bd)
|
||||
+ strbuf_getwholeline: NUL-terminate getdelim buffer on error
|
||||
|
||||
strbuf_getwholeline() did not NUL-terminate the buffer on certain
|
||||
corner cases in its error codepath.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* jk/startup-info (2016-03-07) 6 commits
|
||||
(merged to 'next' on 2016-03-15 at eb95e5f)
|
||||
+ use setup_git_directory() in test-* programs
|
||||
+ grep: turn off gitlink detection for --no-index
|
||||
+ mailmap: do not resolve blobs in a non-repository
|
||||
+ remote: don't resolve HEAD in non-repository
|
||||
+ setup: set startup_info->have_repository more reliably
|
||||
+ setup: make startup_info available everywhere
|
||||
|
||||
The startup_info data, which records if we are working inside a
|
||||
repository (among other things), are now uniformly available to Git
|
||||
subcommand implementations, and Git avoids attempting to touch
|
||||
references when we are not in a repository.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* rj/xdiff-prepare-plug-leak-on-error-codepath (2016-03-04) 2 commits
|
||||
(merged to 'next' on 2016-03-15 at f72755e)
|
||||
+ xdiff/xprepare: fix a memory leak
|
||||
+ xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
|
||||
|
||||
A small memory leak in an error codepath has been plugged in xdiff
|
||||
code.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* jc/index-pack (2016-03-03) 2 commits
|
||||
(merged to 'next' on 2016-03-15 at 42efaa7)
|
||||
+ index-pack: add a helper function to derive .idx/.keep filename
|
||||
+ Merge branch 'jc/maint-index-pack-keep' into jc/index-pack
|
||||
(this branch is used by jc/bundle; uses jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)
|
||||
|
||||
Code clean-up.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* jc/maint-index-pack-keep (2016-03-03) 1 commit
|
||||
(merged to 'next' on 2016-03-04 at bc1d37a)
|
||||
+ index-pack: correct --keep[=<msg>]
|
||||
(this branch is used by jc/bundle, jc/index-pack and jc/index-pack-clone-bundle.)
|
||||
|
||||
"git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* mm/readme-markdown (2016-04-01) 2 commits
|
||||
- git.spec: use README.md, not README
|
||||
(merged to 'next' on 2016-03-01 at 81f3858)
|
||||
+ README.md: don't take 'commandname' literally
|
||||
|
||||
The top-level README file has been updated to be more appropriate
|
||||
for the sign on the front door to welcome new acquaintances to Git
|
||||
by toning down inside jokes and making it into MarkDown.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* gf/fetch-pack-direct-object-fetch (2016-03-05) 2 commits
|
||||
(merged to 'next' on 2016-03-06 at 5628860)
|
||||
+ fetch-pack: update the documentation for "<refs>..." arguments
|
||||
(merged to 'next' on 2016-03-04 at 49199e0)
|
||||
+ fetch-pack: fix object_id of exact sha1
|
||||
|
||||
Fetching of history by naming a commit object name directly didn't
|
||||
work across remote-curl transport.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* jk/add-i-highlight (2016-02-28) 1 commit
|
||||
(merged to 'next' on 2016-03-04 at 4ac3aa1)
|
||||
+ add--interactive: allow custom diff highlighting programs
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* jk/config-get-urlmatch (2016-02-28) 3 commits
|
||||
(merged to 'next' on 2016-03-04 at feeb192)
|
||||
+ Documentation/git-config: fix --get-all description
|
||||
+ Documentation/git-config: use bulleted list for exit codes
|
||||
+ config: fail if --get-urlmatch finds no value
|
||||
|
||||
"git config --get-urlmatch", unlike other variants of the "git
|
||||
config --get" family, did not signal error with its exit status
|
||||
when there was no matching configuration.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* jk/rev-parse-local-env-vars (2016-02-29) 2 commits
|
||||
(merged to 'next' on 2016-03-04 at a0300d5)
|
||||
+ rev-parse: let some options run outside repository
|
||||
+ t1515: add tests for rev-parse out-of-repo helpers
|
||||
|
||||
The "--local-env-vars" and "--resolve-git-dir" options of "git
|
||||
rev-parse" failed to work outside a repository when the command's
|
||||
option parsing was rewritten in 1.8.5 era.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* sg/completion-updates (2016-02-28) 21 commits
|
||||
- completion: cache the path to the repository
|
||||
- completion: extract repository discovery from __gitdir()
|
||||
@@ -724,18 +810,14 @@ of the repositories listed at
|
||||
($gmane/287839)
|
||||
|
||||
|
||||
* mm/lockfile-error-message (2016-03-01) 2 commits
|
||||
(merged to 'next' on 2016-03-04 at 04ed7e6)
|
||||
+ lockfile: improve error message when lockfile exists
|
||||
+ lockfile: mark strings for translation
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* ss/exc-flag-is-a-collection-of-bits (2016-03-01) 1 commit
|
||||
(merged to 'next' on 2016-03-04 at 5ea48c7)
|
||||
(merged to 'next' on 2016-04-04 at 9f0207e)
|
||||
+ dir: store EXC_FLAG_* values in unsigned integers
|
||||
|
||||
Originally merged to 'next' on 2016-03-04
|
||||
|
||||
Code clean-up.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
@@ -746,7 +828,6 @@ of the repositories listed at
|
||||
- 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
|
||||
(this branch uses jc/index-pack and jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)
|
||||
|
||||
The beginning of "split bundle", which could be one of the
|
||||
ingredients to allow "git clone" traffic off of the core server
|
||||
@@ -754,31 +835,20 @@ of the repositories listed at
|
||||
|
||||
|
||||
* ss/receive-pack-parse-options (2016-03-01) 1 commit
|
||||
(merged to 'next' on 2016-03-04 at c577ea7)
|
||||
(merged to 'next' on 2016-04-04 at fd6ab4c)
|
||||
+ builtin/receive-pack.c: use parse_options API
|
||||
|
||||
Originally merged to 'next' on 2016-03-04
|
||||
|
||||
The command line argument parser for "receive-pack" has been
|
||||
rewritten to use parse-options.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* jk/credential-clear-config (2016-02-26) 1 commit
|
||||
(merged to 'next' on 2016-03-04 at f7b26b7)
|
||||
+ credential: let empty credential specs reset helper list
|
||||
|
||||
The credential.helper configuration variable is cumulative and
|
||||
there is no good way to override it from the command line. As
|
||||
a special case, giving an empty string as its value now serves
|
||||
as the signal to clear the values specified in various files.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* jk/submodule-c-credential (2016-03-23) 7 commits
|
||||
(merged to 'next' on 2016-03-23 at 952367a)
|
||||
(merged to 'next' on 2016-04-04 at 8de8e8c)
|
||||
+ git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
|
||||
(merged to 'next' on 2016-03-15 at 81df5b1)
|
||||
+ git: submodule honor -c credential.* from command line
|
||||
+ quote: implement sq_quotef()
|
||||
+ submodule: fix segmentation fault in submodule--helper clone
|
||||
@@ -786,6 +856,8 @@ of the repositories listed at
|
||||
+ submodule: check argc count for git submodule--helper clone
|
||||
+ submodule: don't pass empty string arguments to submodule--helper clone
|
||||
|
||||
Originally merged to 'next' on 2016-03-23
|
||||
|
||||
"git -c credential.<var>=<value> submodule" can now be used to
|
||||
propagate configuration variables related to credential helper
|
||||
down to the submodules.
|
||||
@@ -831,31 +903,6 @@ of the repositories listed at
|
||||
Needs review.
|
||||
|
||||
|
||||
* mm/diff-renames-default (2016-02-25) 5 commits
|
||||
(merged to 'next' on 2016-02-25 at 947c399)
|
||||
+ diff: activate diff.renames by default
|
||||
+ log: introduce init_log_defaults()
|
||||
+ t: add tests for diff.renames (true/false/unset)
|
||||
+ t4001-diff-rename: wrap file creations in a test
|
||||
+ Documentation/diff-config: fix description of diff.renames
|
||||
|
||||
The end-user facing Porcelain level commands like "diff" and "log"
|
||||
now enables the rename detection by default.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* mp/upload-pack-use-embedded-args (2016-02-25) 1 commit
|
||||
(merged to 'next' on 2016-02-26 at f0a54e5)
|
||||
+ upload-pack: use argv_array for pack_objects
|
||||
|
||||
The embedded args argv-array in the child process is used to build
|
||||
the command line to run pack-objects instead of using a separate
|
||||
array of strings.
|
||||
|
||||
Will merge to 'master' after 2.8 final.
|
||||
|
||||
|
||||
* sb/submodule-init (2016-03-15) 2 commits
|
||||
. submodule: port init from shell to C
|
||||
. submodule: port resolve_relative_url from shell to C
|
||||
@@ -908,7 +955,7 @@ of the repositories listed at
|
||||
|
||||
|
||||
* sb/submodule-parallel-update (2016-03-01) 10 commits
|
||||
(merged to 'next' on 2016-03-15 at a8bf6c5)
|
||||
(merged to 'next' on 2016-04-04 at a0aea8d)
|
||||
+ clone: allow an explicit argument for parallel submodule clones
|
||||
+ submodule update: expose parallelism to the user
|
||||
+ submodule helper: remove double 'fatal: ' prefix
|
||||
@@ -921,6 +968,8 @@ of the repositories listed at
|
||||
+ submodule-config: keep update strategy around
|
||||
(this branch is used by sb/clone-shallow-passthru and sb/submodule-init.)
|
||||
|
||||
Originally merged to 'next' on 2016-03-15
|
||||
|
||||
A major part of "git submodule update" has been ported to C to take
|
||||
advantage of the recently added framework to run download tasks in
|
||||
parallel.
|
||||
|
||||
Reference in New Issue
Block a user