mirror of
https://github.com/git/git.git
synced 2026-08-10 17:15:14 +00:00
What's cooking (2013/06 #09)
This commit is contained in:
Junio C Hamano
@@ -1,16 +1,19 @@
|
||||
To: git@vger.kernel.org
|
||||
Bcc: lwn@lwn.net
|
||||
Subject: What's cooking in git.git (Jun 2013, #08; Tue, 25)
|
||||
X-master-at: 9832cb9d4dc969fbfacfd1f8940fcbdec18bb930
|
||||
X-next-at: 8b6e9d859f911784fc6d53d779196c2bb7a34181
|
||||
Subject: What's cooking in git.git (Jun 2013, #09; Thu, 27)
|
||||
X-master-at: ebeea528709abf5ee0a0f3e8ad706f7bacc36c05
|
||||
X-next-at: d7be87e40699fa4046df5713b92b993a842e1a38
|
||||
|
||||
What's cooking in git.git (Jun 2013, #08; Tue, 25)
|
||||
What's cooking in git.git (Jun 2013, #09; Thu, 27)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with
|
||||
'-' are only in 'pu' (proposed updates) while commits prefixed with
|
||||
'+' are in 'next'.
|
||||
|
||||
There are quite a few fixes already on 'master' that needed merging
|
||||
down to 'maint'; I'll be tagging 1.8.3.2 shortly.
|
||||
|
||||
You can find the changes described here in the integration branches
|
||||
of the repositories listed at
|
||||
|
||||
@@ -19,212 +22,96 @@ of the repositories listed at
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* bp/remote-mw-tests (2013-06-14) 1 commit
|
||||
(merged to 'next' on 2013-06-17 at 2891373)
|
||||
+ git-remote-mediawiki: remove hardcoded version number in the test suite
|
||||
* bc/checkout-tracking-name-plug-leak (2013-06-18) 2 commits
|
||||
(merged to 'next' on 2013-06-23 at 35f8f85)
|
||||
+ t/t9802: explicitly name the upstream branch to use as a base
|
||||
+ builtin/checkout.c: don't leak memory in check_tracking_name
|
||||
|
||||
Code cleanup.
|
||||
Plug a small leak in checkout.
|
||||
|
||||
|
||||
* cm/remote-mediawiki-perlcritique (2013-06-14) 31 commits
|
||||
(merged to 'next' on 2013-06-17 at a41a924)
|
||||
+ git-remote-mediawiki: make error message more precise
|
||||
+ git-remote-mediawiki: add a perlcritic rule in Makefile
|
||||
+ git-remote-mediawiki: add a .perlcriticrc file
|
||||
+ git-remote-mediawiki: clearly rewrite double dereference
|
||||
+ git-remote-mediawiki: fix a typo ("mediwiki" instead of "mediawiki")
|
||||
+ git-remote-mediawiki: put non-trivial numeric values in constants.
|
||||
+ git-remote-mediawiki: don't use quotes for empty strings
|
||||
+ git-remote-mediawiki: replace "unless" statements with negated "if" statements
|
||||
+ git-remote-mediawiki: brace file handles for print for more clarity
|
||||
+ git-remote-mediawiki: modify strings for a better coding-style
|
||||
+ git-remote-mediawiki: put long code into a subroutine
|
||||
+ git-remote-mediawiki: remove import of unused open2
|
||||
+ git-remote-mediawiki: check return value of open
|
||||
+ git-remote-mediawiki: assign a variable as undef and make proper indentation
|
||||
+ git-remote-mediawiki: rename a variable ($last) which has the name of a keyword
|
||||
+ git-remote-mediawiki: remove unused variable $entry
|
||||
+ git-remote-mediawiki: turn double-negated expressions into simple expressions
|
||||
+ git-remote-mediawiki: change the name of a variable
|
||||
+ git-remote-mediawiki: add newline in the end of die() error messages
|
||||
+ git-remote-mediawiki: change style in a regexp
|
||||
+ git-remote-mediawiki: change style in a regexp
|
||||
+ git-remote-mediawiki: change separator of some regexps
|
||||
+ git-remote-mediawiki: change the behaviour of a split
|
||||
+ git-remote-mediawiki: remove useless regexp modifier (m)
|
||||
+ git-remote-mediawiki: rewrite unclear line of instructions
|
||||
+ git-remote-mediawiki: change syntax of map calls
|
||||
+ git-remote-mediawiki: move a variable declaration at the top of the code
|
||||
+ git-remote-mediawiki: always end a subroutine with a return
|
||||
+ git-remote-mediawiki: replace :utf8 by :encoding(UTF-8)
|
||||
+ git-remote-mediawiki: move "use warnings;" before any instruction
|
||||
+ git-remote-mediawiki: make a regexp clearer
|
||||
* bc/http-keep-memory-given-to-curl (2013-06-19) 1 commit
|
||||
(merged to 'next' on 2013-06-23 at cf91828)
|
||||
+ http.c: don't rewrite the user:passwd string multiple times
|
||||
|
||||
Code cleanup.
|
||||
Older cURL wanted piece of memory we call it with to be stable, but
|
||||
we updated the auth material after handing it to a call.
|
||||
|
||||
|
||||
* dk/maint-t5150-dirname (2013-06-17) 1 commit
|
||||
(merged to 'next' on 2013-06-20 at 7441301)
|
||||
+ tests: allow sha1's as part of the path
|
||||
* fg/submodule-non-ascii-path (2013-06-20) 2 commits
|
||||
(merged to 'next' on 2013-06-20 at 122c0b2)
|
||||
+ t7400: test of UTF-8 submodule names pass under Mac OS
|
||||
(merged to 'next' on 2013-06-17 at a0b9fa3)
|
||||
+ handle multibyte characters in name
|
||||
|
||||
Fix a test script.
|
||||
Many "git submodule" operations do not work on a submodule at a
|
||||
path whose name is not in ASCII.
|
||||
|
||||
|
||||
* dk/version-gen-gitdir (2013-06-17) 1 commit
|
||||
(merged to 'next' on 2013-06-20 at c9c687e)
|
||||
+ GIT-VERSION-GEN: support non-standard $GIT_DIR path
|
||||
* jk/add-i-custom-diff-algo (2013-06-23) 2 commits
|
||||
(merged to 'next' on 2013-06-24 at 42e7894)
|
||||
+ add -i: add extra options at the right place in "diff" command line
|
||||
(merged to 'next' on 2013-06-17 at 48d5d4e)
|
||||
+ add--interactive: respect diff.algorithm
|
||||
|
||||
|
||||
Allow packaging a tarball in a working tree with $GIT_DIR set elsewhere.
|
||||
* jk/pull-into-dirty-unborn (2013-06-20) 2 commits
|
||||
(merged to 'next' on 2013-06-23 at ab4b111)
|
||||
+ pull: merge into unborn by fast-forwarding from empty tree
|
||||
+ pull: update unborn branch tip after index
|
||||
|
||||
"git pull" into nothing trashed "local changes" that were in the
|
||||
index, and this avoids it.
|
||||
|
||||
|
||||
* fc/sequencer-plug-leak (2013-06-06) 2 commits
|
||||
(merged to 'next' on 2013-06-20 at 3c94075)
|
||||
+ sequencer: avoid leaking message buffer when refusing to create an empty commit
|
||||
+ sequencer: remove useless indentation
|
||||
|
||||
Plug a small leak in an error codepath.
|
||||
* kb/diff-blob-blob-doc (2013-06-18) 1 commit
|
||||
(merged to 'next' on 2013-06-20 at 34e896a)
|
||||
+ Documentation: Move "git diff <blob> <blob>"
|
||||
|
||||
|
||||
* fg/submodule-fixup (2013-06-17) 1 commit
|
||||
(merged to 'next' on 2013-06-20 at 64d74b4)
|
||||
+ git-submodule.sh: remove duplicate call to set_rev_name
|
||||
|
||||
Code cleanup.
|
||||
* mm/merge-in-dirty-worktree-doc (2013-06-18) 1 commit
|
||||
(merged to 'next' on 2013-06-20 at 21b3267)
|
||||
+ Documentation/git-merge.txt: weaken warning about uncommited changes
|
||||
|
||||
|
||||
* jh/libify-note-handling (2013-06-12) 3 commits
|
||||
(merged to 'next' on 2013-06-20 at 7dac8b6)
|
||||
+ Move create_notes_commit() from notes-merge.c into notes-utils.c
|
||||
+ Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
|
||||
+ finish_copy_notes_for_rewrite(): Let caller provide commit message
|
||||
|
||||
Make it possible to call into copy-notes API from the sequencer code.
|
||||
* mm/push-force-is-dangerous (2013-06-18) 1 commit
|
||||
(merged to 'next' on 2013-06-20 at a6a8913)
|
||||
+ Documentation/git-push.txt: explain better cases where --force is dangerous
|
||||
|
||||
|
||||
* jk/apache-test-for-2.4 (2013-06-14) 4 commits
|
||||
(merged to 'next' on 2013-06-17 at 290e72e)
|
||||
+ t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
|
||||
+ t/lib-httpd/apache.conf: load compat access module in apache 2.4
|
||||
+ t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
|
||||
+ t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
|
||||
* mt/send-email-cc-match-fix (2013-06-20) 2 commits
|
||||
(merged to 'next' on 2013-06-23 at a2656b3)
|
||||
+ send-email: sanitize author when writing From line
|
||||
+ send-email: add test for duplicate utf8 name
|
||||
|
||||
Allow httpd tests to run with Apache 2.4.
|
||||
Logic used by git-send-email to suppress cc mishandled names that
|
||||
need RFC2047 quoting.
|
||||
|
||||
|
||||
* jk/doc-build-move-infordir-def (2013-06-17) 2 commits
|
||||
(merged to 'next' on 2013-06-20 at 81e56a8)
|
||||
+ Documentation/Makefile: move infodir to be with other '*dir's
|
||||
+ Documentation/Makefile: fix spaces around assignments
|
||||
|
||||
Makefile cleanup.
|
||||
* ph/builtin-srcs-are-in-subdir-these-days (2013-06-18) 1 commit
|
||||
(merged to 'next' on 2013-06-20 at 7507a48)
|
||||
+ fix "builtin-*" references to be "builtin/*"
|
||||
|
||||
|
||||
* jk/mergetool-lib-refactor (2013-06-17) 1 commit
|
||||
(merged to 'next' on 2013-06-20 at 7ce98c0)
|
||||
+ mergetool--lib: refactor {diff,merge}_cmd logic
|
||||
* rr/cherry-pick-fast-forward-reflog-message (2013-06-19) 1 commit
|
||||
(merged to 'next' on 2013-06-24 at 8b6e9d8)
|
||||
+ sequencer: write useful reflog message for fast-forward
|
||||
|
||||
Code cleanup.
|
||||
The reflog message created when "git cherry-pick" fast-forwarded
|
||||
did not say anything but "cherry-pick", but it now says
|
||||
"cherry-pick: fast-forward".
|
||||
|
||||
|
||||
* jk/unpack-entry-fallback-to-another (2013-06-14) 2 commits
|
||||
(merged to 'next' on 2013-06-17 at 89e0eab)
|
||||
+ unpack_entry: do not die when we fail to apply a delta
|
||||
+ t5303: drop "count=1" from corruption dd
|
||||
* rr/rebase-stash-store (2013-06-17) 5 commits
|
||||
(merged to 'next' on 2013-06-23 at 2398dad)
|
||||
+ rebase: use 'git stash store' to simplify logic
|
||||
+ stash: introduce 'git stash store'
|
||||
+ stash: simplify option parser for create
|
||||
+ stash doc: document short form -p in synopsis
|
||||
+ stash doc: add a warning about using create
|
||||
|
||||
Follow-up to an earlier fix.
|
||||
|
||||
|
||||
* mm/rm-coalesce-errors (2013-06-12) 2 commits
|
||||
(merged to 'next' on 2013-06-20 at c70340c)
|
||||
+ rm: introduce advice.rmHints to shorten messages
|
||||
+ rm: better error message on failure for multiple files
|
||||
|
||||
Give a single message followed by list of paths from "git rm" to
|
||||
report multiple paths that cannot be removed.
|
||||
|
||||
|
||||
* mz/rebase-tests (2013-06-18) 8 commits
|
||||
(merged to 'next' on 2013-06-18 at 12cfec8)
|
||||
+ rebase topology tests: fix commit names on case-insensitive file systems
|
||||
(merged to 'next' on 2013-06-14 at 73f3318)
|
||||
+ tests: move test for rebase messages from t3400 to t3406
|
||||
+ t3406: modernize style
|
||||
+ add tests for rebasing merged history
|
||||
+ add tests for rebasing root
|
||||
+ add tests for rebasing of empty commits
|
||||
+ add tests for rebasing with patch-equivalence present
|
||||
+ add simple tests of consistency across rebase types
|
||||
|
||||
|
||||
* nk/config-local-doc (2013-06-17) 1 commit
|
||||
(merged to 'next' on 2013-06-20 at 3568ebe)
|
||||
+ config: Add description of --local option
|
||||
|
||||
|
||||
* rr/am-quit-empty-then-abort-fix (2013-06-17) 2 commits
|
||||
(merged to 'next' on 2013-06-20 at f9feae3)
|
||||
+ t/am: use test_path_is_missing() where appropriate
|
||||
+ am: handle stray $dotest directory
|
||||
|
||||
Recent "rebase --autostash" update made it impossible to recover
|
||||
with "git am --abort" from a repository where "git am" without mbox
|
||||
was run by mistake and then was killed with "^C".
|
||||
|
||||
|
||||
* rr/prompt-rebase-breakage-fix (2013-06-14) 1 commit
|
||||
(merged to 'next' on 2013-06-17 at 02957d8)
|
||||
+ prompt: squelch error output from cat
|
||||
|
||||
|
||||
* rr/rebase-autostash (2013-06-13) 3 commits
|
||||
(merged to 'next' on 2013-06-17 at e692317)
|
||||
+ rebase: finish_rebase() in noop rebase
|
||||
+ rebase: finish_rebase() in fast-forward rebase
|
||||
+ rebase: guard against missing files in read_basic_state()
|
||||
|
||||
|
||||
* rr/rebase-sha1-by-string-query (2013-06-14) 3 commits
|
||||
(merged to 'next' on 2013-06-20 at d0742fe)
|
||||
+ rebase: use peel_committish() where appropriate
|
||||
+ sh-setup: add new peel_committish() helper
|
||||
+ t/rebase: add failing tests for a peculiar revision
|
||||
|
||||
Allow various commit objects to be given to "git rebase" by ':/look
|
||||
for this string' syntax, e.g. "git rebase --onto ':/there'".
|
||||
|
||||
|
||||
* rs/unpack-trees-tree-walk-conflict-field (2013-06-17) 1 commit
|
||||
(merged to 'next' on 2013-06-20 at 0afbf0b)
|
||||
+ unpack-trees: don't shift conflicts left and right
|
||||
|
||||
Code clean-up.
|
||||
|
||||
|
||||
* rt/cherry-pick-continue-advice-in-status (2013-06-17) 1 commit
|
||||
(merged to 'next' on 2013-06-20 at ec8a930)
|
||||
+ wt-status: give better advice when cherry-pick is in progress
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* rr/remote-branch-config-refresh (2013-06-23) 9 commits
|
||||
- t/t5505-remote: test multiple push/pull in remotes-file
|
||||
- ls-remote doc: don't encourage use of branches-file
|
||||
- ls-remote doc: rewrite <repository> paragraph
|
||||
- ls-remote doc: fix example invocation on git.git
|
||||
- t/t5505-remote: test url-with-# in branches-file
|
||||
- remote: remove dead code in read_branches_file()
|
||||
- t/t5505-remote: use test_path_is_missing
|
||||
- t/t5505-remote: test push-refspec in branches-file
|
||||
- t/t5505-remote: modernize style
|
||||
|
||||
The original way to specify remote repository using .git/branches/
|
||||
used to have a nifty feature. The code to support the feature was
|
||||
still in a function but the caller was changed not to call it 5
|
||||
years ago, breaking that feature and leaving the supporting code
|
||||
unreachable.
|
||||
|
||||
Will merge to 'next'.
|
||||
Finishing touches for the "git rebase --autostash" feature
|
||||
introduced earlier.
|
||||
|
||||
|
||||
* tr/maint-apply-non-git-patch-parsefix (2013-06-21) 1 commit
|
||||
@@ -235,18 +122,15 @@ of the repositories listed at
|
||||
by programs other than Git. THis is an old breakage in v1.7.11 and
|
||||
will need to be merged down to the maintanance tracks.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
* vl/typofix (2013-06-19) 1 commit
|
||||
(merged to 'next' on 2013-06-23 at a057524)
|
||||
+ random typofixes (committed missing a 't', successful missing an 's')
|
||||
|
||||
|
||||
* wk/doc-in-linux-3.x-era (2013-06-22) 4 commits
|
||||
- Documentation: Update 'linux-2.6.git' -> 'linux.git'
|
||||
- Documentation: Update the NFS remote examples to use the staging repo
|
||||
- doc/clone: Pick more compelling paths for the --reference example
|
||||
- doc/clone: Remove the '--bare -l -s' example
|
||||
|
||||
Update documentation to update to more recent realities.
|
||||
|
||||
Will merge to 'next'.
|
||||
* wk/doc-git-has-grown (2013-06-23) 1 commit
|
||||
(merged to 'next' on 2013-06-23 at 256263d)
|
||||
+ user-manual: Update download size for Git and the kernel
|
||||
|
||||
|
||||
* ys/cygstart (2013-06-21) 1 commit
|
||||
@@ -256,79 +140,95 @@ of the repositories listed at
|
||||
On "Cygwin", recognize "cygstart" as a possible way to start a web
|
||||
browser (used in "help -w" and "instaweb" among others).
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* bp/mediawiki-preview (2013-06-26) 5 commits
|
||||
- git-remote-mediawiki: Add preview subcommand into git mw.
|
||||
- git-remote-mediawiki: Adding git-mw command
|
||||
- git-remote-mediawiki: factoring code between git-remote-mediawiki and Git::Mediawiki
|
||||
- git-remote-mediawiki: new git bin-wrapper for developement
|
||||
- git-remote-mediawiki: Introduction of Git::Mediawiki.pm
|
||||
|
||||
|
||||
* ed/color-prompt (2013-06-26) 5 commits
|
||||
- git-prompt.sh: add missing information in comments
|
||||
- git-prompt.sh: do not print duplicate clean color code
|
||||
- t9903: remove redundant tests
|
||||
- git-prompt.sh: refactor colored prompt code
|
||||
- t9903: add tests for git-prompt pcmode
|
||||
|
||||
Code clean-up for in-prompt status script (in contrib/).
|
||||
|
||||
Will merge to 'next' after getting the merge sanity-checked.
|
||||
|
||||
|
||||
* fg/submodule-clone-depth (2013-06-26) 1 commit
|
||||
- Add depth to submodule update
|
||||
|
||||
Allow shallow-cloning of submodules with "git submodule update".
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* ft/doc-git-transport (2013-06-26) 1 commit
|
||||
(merged to 'next' on 2013-06-27 at 4a7d248)
|
||||
+ documentation: add git:// transport security notice
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/maint-diff-core-safecrlf (2013-06-25) 1 commit
|
||||
- diff: demote core.safecrlf=true to core.safecrlf=warn
|
||||
* rr/column-doc (2013-06-26) 1 commit
|
||||
(merged to 'next' on 2013-06-27 at 99497e1)
|
||||
+ column doc: rewrite documentation for column.ui
|
||||
|
||||
"git diff" refused to even show difference when core.safecrlf is
|
||||
set to true (i.e. error out) and there are offending lines in the
|
||||
working tree files.
|
||||
|
||||
Will hold for a while to see if anybody can come up with better
|
||||
tests.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jk/fast-import-empty-ls (2013-06-23) 4 commits
|
||||
- fast-import: allow moving the root tree
|
||||
- fast-import: allow ls or filecopy of the root tree
|
||||
- fast-import: set valid mode on root tree in "ls"
|
||||
- t9300: document fast-import empty path issues
|
||||
* sb/mailmap-merijn-brand (2013-06-25) 1 commit
|
||||
(merged to 'next' on 2013-06-27 at 2dd247a)
|
||||
+ .mailmap: Map "H.Merijn Brand" to "H. Merijn Brand"
|
||||
|
||||
Waiting for reviews.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* sg/bash-prompt (2013-06-24) 22 commits
|
||||
- Merge branch 'bash-prompt-color-refactorization' into bash-prompt-speedup-and-color-refactorization
|
||||
- fixup! git-prompt.sh: add missing information in comments
|
||||
- git-prompt.sh: add missing information in comments
|
||||
- git-prompt.sh: do not print duplicate clean color code
|
||||
- git-prompt.sh: refactor colored prompt code
|
||||
- t9903: add tests for git-prompt pcmode
|
||||
- bash prompt: mention that PROMPT_COMMAND mode is faster
|
||||
- bash prompt: avoid command substitution when finalizing gitstring
|
||||
- bash prompt: avoid command substitution when checking for untracked files
|
||||
- bash prompt: use bash builtins to check stash state
|
||||
- bash prompt: use bash builtins to check for unborn branch for dirty state
|
||||
- bash prompt: combine 'git rev-parse' for detached head
|
||||
- bash prompt: combine 'git rev-parse' executions in the main code path
|
||||
- bash prompt: use bash builtins to find out current branch
|
||||
- bash prompt: use bash builtins to find out rebase state
|
||||
- bash prompt: run 'git rev-parse --git-dir' directly instead of __gitdir()
|
||||
- bash prompt: return early from __git_ps1() when not in a git repository
|
||||
- bash prompt: print unique detached HEAD abbreviated object name
|
||||
- bash prompt: add a test for symbolic link symbolic refs
|
||||
- completion, bash prompt: move __gitdir() tests to completion test suite
|
||||
- bash prompt: use 'write_script' helper in interactive rebase test
|
||||
- bash prompt: fix redirection coding style in tests
|
||||
* ap/rebase-multiple-fixups (2013-06-27) 1 commit
|
||||
- rebase -i: handle fixup! fixup! in --autosquash
|
||||
|
||||
Will hold for a few days, then split and merge to 'next'.
|
||||
Having multiple "fixup!" on a line in the rebase instruction sheet
|
||||
did not work very well with "git rebase -i --autosquash".
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* af/rebase-i-merge-options (2013-06-25) 2 commits
|
||||
- SQUASH???
|
||||
- Do not ignore merge options in interactive rebase
|
||||
* jc/pull-training-wheel (2013-06-27) 1 commit
|
||||
- pull: require choice between rebase/merge on non-fast-forward pull
|
||||
|
||||
"git rebase -i" now honors --strategy and -X options.
|
||||
Make "git pull" refuse with "it does not fast forward; choose between
|
||||
'pull --merge' and 'pull --rebase'".
|
||||
|
||||
|
||||
* rj/cygwin-remove-cheating-lstat (2013-06-25) 1 commit
|
||||
- cygwin: Remove the Win32 l/stat() implementation
|
||||
* kb/am-deprecate-resolved (2013-06-27) 1 commit
|
||||
- am: replace uses of --resolved with --continue
|
||||
|
||||
Promote "git am --continue" over "git am --resolved" for UI
|
||||
consistency.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* as/log-output-encoding-in-user-format (2013-06-20) 3 commits
|
||||
- t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
|
||||
- t7102 (reset): don't hardcode SHA-1 in expected outputs
|
||||
- t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs
|
||||
* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
|
||||
- ### DONTMERGE: needs better explanation on what config they need
|
||||
- pack-refs.c: Add missing call to git_config()
|
||||
- show-ref.c: Add missing call to git_config()
|
||||
|
||||
"log --format=" did not honor i18n.logoutputencoding configuration
|
||||
and this is a beginning of the series that attempts to fix it.
|
||||
The changes themselves are probably good, but it is unclear what
|
||||
basic setting needs to be read for which exact operation.
|
||||
|
||||
Waiting for a reroll, not to add dependency on new 8859-5 locale.
|
||||
$gmane/228532
|
||||
Waiting for clarification.
|
||||
$gmane/228294
|
||||
|
||||
|
||||
* fc/contrib-related (2013-06-09) 5 commits
|
||||
@@ -459,12 +359,118 @@ of the repositories listed at
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* as/log-output-encoding-in-user-format (2013-06-26) 5 commits
|
||||
- pretty: --format output should honor logOutputEncoding
|
||||
- pretty: Add failing tests: --format output should honor logOutputEncoding
|
||||
- t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
|
||||
- t7102 (reset): don't hardcode SHA-1 in expected outputs
|
||||
- t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs
|
||||
|
||||
"log --format=" did not honor i18n.logoutputencoding configuration
|
||||
and this is a beginning of the series that attempts to fix it.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* rr/remote-branch-config-refresh (2013-06-23) 9 commits
|
||||
(merged to 'next' on 2013-06-26 at 48746e1)
|
||||
+ t/t5505-remote: test multiple push/pull in remotes-file
|
||||
+ ls-remote doc: don't encourage use of branches-file
|
||||
+ ls-remote doc: rewrite <repository> paragraph
|
||||
+ ls-remote doc: fix example invocation on git.git
|
||||
+ t/t5505-remote: test url-with-# in branches-file
|
||||
+ remote: remove dead code in read_branches_file()
|
||||
+ t/t5505-remote: use test_path_is_missing
|
||||
+ t/t5505-remote: test push-refspec in branches-file
|
||||
+ t/t5505-remote: modernize style
|
||||
|
||||
The original way to specify remote repository using .git/branches/
|
||||
used to have a nifty feature. The code to support the feature was
|
||||
still in a function but the caller was changed not to call it 5
|
||||
years ago, breaking that feature and leaving the supporting code
|
||||
unreachable.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* wk/doc-in-linux-3.x-era (2013-06-22) 4 commits
|
||||
(merged to 'next' on 2013-06-26 at a24e9e6)
|
||||
+ Documentation: Update 'linux-2.6.git' -> 'linux.git'
|
||||
+ Documentation: Update the NFS remote examples to use the staging repo
|
||||
+ doc/clone: Pick more compelling paths for the --reference example
|
||||
+ doc/clone: Remove the '--bare -l -s' example
|
||||
|
||||
Update documentation to match more recent realities.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/maint-diff-core-safecrlf (2013-06-25) 1 commit
|
||||
- diff: demote core.safecrlf=true to core.safecrlf=warn
|
||||
|
||||
"git diff" refused to even show difference when core.safecrlf is
|
||||
set to true (i.e. error out) and there are offending lines in the
|
||||
working tree files.
|
||||
|
||||
Will hold for a while to see if anybody can come up with better
|
||||
tests.
|
||||
|
||||
|
||||
* jk/fast-import-empty-ls (2013-06-23) 4 commits
|
||||
- fast-import: allow moving the root tree
|
||||
- fast-import: allow ls or filecopy of the root tree
|
||||
- fast-import: set valid mode on root tree in "ls"
|
||||
- t9300: document fast-import empty path issues
|
||||
|
||||
Waiting for reviews.
|
||||
|
||||
|
||||
* sg/bash-prompt (2013-06-24) 16 commits
|
||||
(merged to 'next' on 2013-06-27 at 09fda6a)
|
||||
+ bash prompt: mention that PROMPT_COMMAND mode is faster
|
||||
+ bash prompt: avoid command substitution when finalizing gitstring
|
||||
+ bash prompt: avoid command substitution when checking for untracked files
|
||||
+ bash prompt: use bash builtins to check stash state
|
||||
+ bash prompt: use bash builtins to check for unborn branch for dirty state
|
||||
+ bash prompt: combine 'git rev-parse' for detached head
|
||||
+ bash prompt: combine 'git rev-parse' executions in the main code path
|
||||
+ bash prompt: use bash builtins to find out current branch
|
||||
+ bash prompt: use bash builtins to find out rebase state
|
||||
+ bash prompt: run 'git rev-parse --git-dir' directly instead of __gitdir()
|
||||
+ bash prompt: return early from __git_ps1() when not in a git repository
|
||||
+ bash prompt: print unique detached HEAD abbreviated object name
|
||||
+ bash prompt: add a test for symbolic link symbolic refs
|
||||
+ completion, bash prompt: move __gitdir() tests to completion test suite
|
||||
+ bash prompt: use 'write_script' helper in interactive rebase test
|
||||
+ bash prompt: fix redirection coding style in tests
|
||||
(this branch is used by sg/bash-prompt-premerge.)
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* af/rebase-i-merge-options (2013-06-25) 2 commits
|
||||
- SQUASH???
|
||||
- Do not ignore merge options in interactive rebase
|
||||
|
||||
"git rebase -i" now honors --strategy and -X options.
|
||||
|
||||
Waiting for response to review comments.
|
||||
|
||||
|
||||
* rj/cygwin-remove-cheating-lstat (2013-06-25) 1 commit
|
||||
- cygwin: Remove the Win32 l/stat() implementation
|
||||
|
||||
Seems that this gives different performance results to different
|
||||
people.
|
||||
|
||||
|
||||
* jc/triangle-push-fixup (2013-06-24) 5 commits
|
||||
- t/t5528-push-default: test pushdefault workflows
|
||||
- t/t5528-push-default: generalize test_push_*
|
||||
- push: change `simple` to accommodate triangular workflows
|
||||
- config doc: rewrite push.default section
|
||||
- t/t5528-push-default: remove redundant test_config lines
|
||||
(merged to 'next' on 2013-06-26 at 73cbb69)
|
||||
+ t/t5528-push-default: test pushdefault workflows
|
||||
+ t/t5528-push-default: generalize test_push_*
|
||||
+ push: change `simple` to accommodate triangular workflows
|
||||
+ config doc: rewrite push.default section
|
||||
+ t/t5528-push-default: remove redundant test_config lines
|
||||
(this branch is tangled with rr/triangle-push-fix.)
|
||||
|
||||
Earlier remote.pushdefault (and per-branch branch.*.pushremote)
|
||||
@@ -493,8 +499,6 @@ of the repositories listed at
|
||||
tentatively defines it as the same as 'current', but we may have
|
||||
to tighten it to avoid surprises in some way.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jg/status-config (2013-06-24) 4 commits
|
||||
- status/commit: make sure --porcelain is not affected by user-facing config
|
||||
@@ -509,17 +513,9 @@ of the repositories listed at
|
||||
The bottom two has been graduated to 'master' but then reverted.
|
||||
The tip two are quick attempts to fix the fallout. The one for
|
||||
status.short looks correct; the other one is still in flux and
|
||||
under discussion, waiting for alternative cleaner patches.
|
||||
under discussion.
|
||||
|
||||
|
||||
* bc/http-keep-memory-given-to-curl (2013-06-19) 1 commit
|
||||
(merged to 'next' on 2013-06-23 at cf91828)
|
||||
+ http.c: don't rewrite the user:passwd string multiple times
|
||||
|
||||
Older cURL wanted piece of memory we call it with to be stable, but
|
||||
we updated the auth material after handing it to a call.
|
||||
|
||||
Will merge to 'master'.
|
||||
Waiting for possible alternative cleaner patches for the tip one.
|
||||
|
||||
|
||||
* jc/reflog-doc (2013-06-19) 1 commit
|
||||
@@ -531,17 +527,6 @@ of the repositories listed at
|
||||
scripts, so fixing it is not all that urgent.
|
||||
|
||||
|
||||
* jk/pull-into-dirty-unborn (2013-06-20) 2 commits
|
||||
(merged to 'next' on 2013-06-23 at ab4b111)
|
||||
+ pull: merge into unborn by fast-forwarding from empty tree
|
||||
+ pull: update unborn branch tip after index
|
||||
|
||||
"git pull" into nothing trashed "local changes" that were in the
|
||||
index, and this avoids it.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* mh/ref-races-optim-invalidate-cached (2013-06-20) 1 commit
|
||||
- refs: do not invalidate the packed-refs cache unnecessarily
|
||||
(this branch uses mh/ref-races.)
|
||||
@@ -549,39 +534,15 @@ of the repositories listed at
|
||||
Optional.
|
||||
|
||||
|
||||
* rr/cherry-pick-fast-forward-reflog-message (2013-06-19) 1 commit
|
||||
(merged to 'next' on 2013-06-24 at 8b6e9d8)
|
||||
+ sequencer: write useful reflog message for fast-forward
|
||||
|
||||
The reflog message created when "git cherry-pick" fast-forwarded
|
||||
did not say anything but "cherry-pick", but it now says
|
||||
"cherry-pick: fast-forward".
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* vl/typofix (2013-06-19) 1 commit
|
||||
(merged to 'next' on 2013-06-23 at a057524)
|
||||
+ random typofixes (committed missing a 't', successful missing an 's')
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* wk/doc-git-has-grown (2013-06-23) 1 commit
|
||||
(merged to 'next' on 2013-06-23 at 256263d)
|
||||
+ user-manual: Update download size for Git and the kernel
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* rr/rebase-checkout-reflog (2013-06-23) 7 commits
|
||||
- rebase -i: use a better reflog message
|
||||
- rebase: use a better reflog message
|
||||
- checkout: respect GIT_REFLOG_ACTION
|
||||
- status: do not depend on rebase reflog messages
|
||||
- t/t2021-checkout-last: "checkout -" should work after a rebase finishes
|
||||
- wt-status: remove unused field in grab_1st_switch_cbdata
|
||||
- t7512: test "detached from" as well
|
||||
(merged to 'next' on 2013-06-27 at 4d99efa)
|
||||
+ status: do not depend on rebase reflog messages
|
||||
+ t/t2021-checkout-last: "checkout -" should work after a rebase finishes
|
||||
+ wt-status: remove unused field in grab_1st_switch_cbdata
|
||||
+ t7512: test "detached from" as well
|
||||
|
||||
Invocations of "git checkout" used internally by "git rebase" were
|
||||
counted as "checkout", and affected later "git checkout -" to the
|
||||
@@ -591,74 +552,6 @@ of the repositories listed at
|
||||
Will split and merge to 'next'.
|
||||
|
||||
|
||||
* rr/rebase-stash-store (2013-06-17) 5 commits
|
||||
(merged to 'next' on 2013-06-23 at 2398dad)
|
||||
+ rebase: use 'git stash store' to simplify logic
|
||||
+ stash: introduce 'git stash store'
|
||||
+ stash: simplify option parser for create
|
||||
+ stash doc: document short form -p in synopsis
|
||||
+ stash doc: add a warning about using create
|
||||
|
||||
Finishing touches for the "git rebase --autostash" feature
|
||||
introduced earlier.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* mm/push-force-is-dangerous (2013-06-18) 1 commit
|
||||
(merged to 'next' on 2013-06-20 at a6a8913)
|
||||
+ Documentation/git-push.txt: explain better cases where --force is dangerous
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
|
||||
- ### DONTMERGE: needs better explanation on what config they need
|
||||
- pack-refs.c: Add missing call to git_config()
|
||||
- show-ref.c: Add missing call to git_config()
|
||||
|
||||
The changes themselves are probably good, but it is unclear what
|
||||
basic setting needs to be read for which exact operation.
|
||||
|
||||
Waiting for clarification.
|
||||
$gmane/228294
|
||||
|
||||
|
||||
* bc/checkout-tracking-name-plug-leak (2013-06-18) 2 commits
|
||||
(merged to 'next' on 2013-06-23 at 35f8f85)
|
||||
+ t/t9802: explicitly name the upstream branch to use as a base
|
||||
+ builtin/checkout.c: don't leak memory in check_tracking_name
|
||||
|
||||
Plug a small leak in checkout.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* kb/diff-blob-blob-doc (2013-06-18) 1 commit
|
||||
(merged to 'next' on 2013-06-20 at 34e896a)
|
||||
+ Documentation: Move "git diff <blob> <blob>"
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* mm/merge-in-dirty-worktree-doc (2013-06-18) 1 commit
|
||||
(merged to 'next' on 2013-06-20 at 21b3267)
|
||||
+ Documentation/git-merge.txt: weaken warning about uncommited changes
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* mt/send-email-cc-match-fix (2013-06-20) 2 commits
|
||||
(merged to 'next' on 2013-06-23 at a2656b3)
|
||||
+ send-email: sanitize author when writing From line
|
||||
+ send-email: add test for duplicate utf8 name
|
||||
|
||||
Logic used by git-send-email to suppress cc mishandled names that
|
||||
need RFC2047 quoting.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* nk/name-rev-abbreviated-refs (2013-06-18) 1 commit
|
||||
(merged to 'next' on 2013-06-23 at 2ec9e05)
|
||||
+ name-rev: allow to specify a subpath for --refs option
|
||||
@@ -670,13 +563,6 @@ of the repositories listed at
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ph/builtin-srcs-are-in-subdir-these-days (2013-06-18) 1 commit
|
||||
(merged to 'next' on 2013-06-20 at 7507a48)
|
||||
+ fix "builtin-*" references to be "builtin/*"
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jk/submodule-subdirectory-ok (2013-06-17) 6 commits
|
||||
(merged to 'next' on 2013-06-23 at f17fb37)
|
||||
+ submodule: drop the top-level requirement
|
||||
@@ -692,15 +578,6 @@ of the repositories listed at
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jk/add-i-custom-diff-algo (2013-06-23) 2 commits
|
||||
(merged to 'next' on 2013-06-24 at 42e7894)
|
||||
+ add -i: add extra options at the right place in "diff" command line
|
||||
(merged to 'next' on 2013-06-17 at 48d5d4e)
|
||||
+ add--interactive: respect diff.algorithm
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* mh/ref-races (2013-06-20) 11 commits
|
||||
(merged to 'next' on 2013-06-23 at 71f1a18)
|
||||
+ for_each_ref: load all loose refs before packed refs
|
||||
@@ -723,24 +600,13 @@ of the repositories listed at
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* fg/submodule-non-ascii-path (2013-06-20) 2 commits
|
||||
(merged to 'next' on 2013-06-20 at 122c0b2)
|
||||
+ t7400: test of UTF-8 submodule names pass under Mac OS
|
||||
(merged to 'next' on 2013-06-17 at a0b9fa3)
|
||||
+ handle multibyte characters in name
|
||||
|
||||
Many "git submodule" operations do not work on a submodule at a
|
||||
path whose name is not in ASCII.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/topo-author-date-sort (2013-06-21) 9 commits
|
||||
- t6003: add --author-date-order test
|
||||
- topology tests: teach a helper to set author dates as well
|
||||
- t6003: add --date-order test
|
||||
- topology tests: teach a helper to take abbreviated timestamps
|
||||
- t/lib-t6000: style fixes
|
||||
(merged to 'next' on 2013-06-26 at 9283719)
|
||||
+ t6003: add --author-date-order test
|
||||
+ topology tests: teach a helper to set author dates as well
|
||||
+ t6003: add --date-order test
|
||||
+ topology tests: teach a helper to take abbreviated timestamps
|
||||
+ t/lib-t6000: style fixes
|
||||
(merged to 'next' on 2013-06-15 at ad4fb48)
|
||||
+ log: --author-date-order
|
||||
+ sort-in-topological-order: use prio-queue
|
||||
@@ -752,7 +618,7 @@ of the repositories listed at
|
||||
output is topologically sorted and commits in parallel histories
|
||||
are shown intermixed together based on the author timestamp.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* mh/loose-refs-race-with-pack-ref (2013-06-19) 3 commits
|
||||
@@ -794,7 +660,7 @@ of the repositories listed at
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jx/clean-interactive (2013-06-24) 16 commits
|
||||
* jx/clean-interactive (2013-06-26) 16 commits
|
||||
- test: run testcases with POSIX absolute paths on Windows
|
||||
- test: add t7301 for git-clean--interactive
|
||||
- git-clean: add documentation for interactive git-clean
|
||||
@@ -805,27 +671,32 @@ of the repositories listed at
|
||||
- git-clean: add colors to interactive git-clean
|
||||
- git-clean: show items of del_list in columns
|
||||
- git-clean: add support for -i/--interactive
|
||||
- git-clean: refactor git-clean into two phases
|
||||
- Refactor write_name_quoted_relative, remove unused params
|
||||
- Refactor quote_path_relative, remove unused params
|
||||
- quote.c: remove path_relative, use relative_path instead
|
||||
- path.c: refactor relative_path(), not only strip prefix
|
||||
- test: add test cases for relative_path
|
||||
(merged to 'next' on 2013-06-26 at f7be2d8)
|
||||
+ git-clean: refactor git-clean into two phases
|
||||
+ write_name{_quoted_relative,}(): remove redundant parameters
|
||||
+ quote_path_relative(): remove redundant parameter
|
||||
+ quote.c: substitute path_relative with relative_path
|
||||
+ path.c: refactor relative_path(), not only strip prefix
|
||||
+ test: add test cases for relative_path
|
||||
|
||||
Add "interactive" mode to "git clean".
|
||||
|
||||
Waiting for reviews.
|
||||
The early part to refactor relative path related helper functions
|
||||
looked sensible. The actual "clean interactive" may want to be
|
||||
discussed further by interested parties before the topic is fully
|
||||
merged to 'next'.
|
||||
|
||||
|
||||
* tr/test-v-and-v-subtest-only (2013-06-23) 8 commits
|
||||
- test-lib: support running tests under valgrind in parallel
|
||||
- test-lib: allow prefixing a custom string before "ok N" etc.
|
||||
- test-lib: valgrind for only tests matching a pattern
|
||||
- test-lib: verbose mode for only tests matching a pattern
|
||||
- test-lib: self-test that --verbose works
|
||||
- test-lib: rearrange start/end of test_expect_* and test_skip
|
||||
- test-lib: refactor $GIT_SKIP_TESTS matching
|
||||
- test-lib: enable MALLOC_* for the actual tests
|
||||
(merged to 'next' on 2013-06-26 at 8ff4d84)
|
||||
+ test-lib: support running tests under valgrind in parallel
|
||||
+ test-lib: allow prefixing a custom string before "ok N" etc.
|
||||
+ test-lib: valgrind for only tests matching a pattern
|
||||
+ test-lib: verbose mode for only tests matching a pattern
|
||||
+ test-lib: self-test that --verbose works
|
||||
+ test-lib: rearrange start/end of test_expect_* and test_skip
|
||||
+ test-lib: refactor $GIT_SKIP_TESTS matching
|
||||
+ test-lib: enable MALLOC_* for the actual tests
|
||||
|
||||
Allows N instances of tests run in parallel, each running 1/N parts
|
||||
of the test suite under Valgrind, to speed things up.
|
||||
@@ -833,8 +704,6 @@ of the repositories listed at
|
||||
The tip two may be useful in practice but is a tad ugly ;-)
|
||||
Rerolled to fix breakage in non-prove tests.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit
|
||||
- git add: -u/-A now affects the entire working tree
|
||||
@@ -907,7 +776,7 @@ of the repositories listed at
|
||||
. push: remove dead code in setup_push_upstream()
|
||||
. push: change `simple` to accommodate triangular workflows
|
||||
. config doc: rewrite push.default section
|
||||
- t/t5528-push-default: remove redundant test_config lines
|
||||
+ t/t5528-push-default: remove redundant test_config lines
|
||||
(this branch is tangled with jc/triangle-push-fixup.)
|
||||
|
||||
A quick rewrite in jc/triangle-push-fixup.
|
||||
Superseded by jc/triangle-push-fixup.
|
||||
|
||||
Reference in New Issue
Block a user