Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in '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]
* nd/archive-pathspec (2014-09-22) 1 commit
- archive: support filtering paths with glob
"git archive" learned to filter what gets archived with pathspec.
Will merge to 'next'.
* rs/graph-simplify (2014-09-22) 1 commit
(merged to 'next' on 2014-09-23 at 72969e2)
+ graph: simplify graph_padding_line()
Will merge to 'master'.
* rs/remote-simplify (2014-09-22) 1 commit
(merged to 'next' on 2014-09-23 at 176e316)
+ remote: simplify match_name_with_pattern() using strbuf
Will merge to 'master'.
* sb/merge-recursive-copy-paste-fix (2014-09-23) 2 commits
(merged to 'next' on 2014-09-24 at b8dfbef)
+ merge-recursive: remove stale commented debugging code
+ merge-recursive: fix copy-paste mistake
"git merge-recursive" had a small bug that could have made it
mishandle "one side deleted, the other side did not touch it" in a
rare corner case, where the other side actually did touch to cause
the blob object names to be different but both blobs before and
after the change normalize to the same (e.g. correcting mistake to
check in a blob with CRLF line endings by replacing it with another
blob that records the same contents with LF line endings).
Will merge to 'master'.
* sb/t6031-typofix (2014-09-22) 1 commit
(merged to 'next' on 2014-09-23 at aec57a9)
+ t6031-test-merge-recursive: do not forget to add file to be committed
Will merge to 'master'.
* sb/t9300-typofix (2014-09-22) 1 commit
(merged to 'next' on 2014-09-23 at aa519bd)
+ t9300-fast-import: fix typo in test description
Will merge to 'master'.
* so/rebase-doc-fork-point (2014-09-22) 1 commit
- Documentation/git-rebase.txt: document when --fork-point is auto-enabled
* sk/tag-contains-wo-recursion (2014-09-23) 1 commit
- t7004: give the test a bit more stack space
* jt/itimer-autoconf (2014-08-29) 3 commits
- autoconf: check for setitimer()
- autoconf: check for struct itimerval
- git-compat-util.h: add missing semicolon after struct itimerval
(this branch is used by jt/timer-settime.)
Split the early part of jt/timer-settime topic out into a topic.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* rs/ref-transaction (2014-09-12) 20 commits
. remote rm/prune: print a message when writing packed-refs fails
. ref_transaction_commit: bail out on failure to remove a ref
. lockfile: remove unable_to_lock_error
. refs.c: do not permit err == NULL
. for-each-ref.c: improve message before aborting on broken ref
. refs.c: fix handling of badly named refs
. branch -d: avoid repeated symref resolution
. refs.c: change resolve_ref_unsafe reading argument to be a flags field
. refs.c: make write_ref_sha1 static
. fetch.c: change s_update_ref to use a ref transaction
. refs.c: ref_transaction_commit: distinguish name conflicts from other errors
. refs.c: pass a skip list to name_conflict_fn
. refs.c: call lock_ref_sha1_basic directly from commit
. refs.c: move the check for valid refname to lock_ref_sha1_basic
. rename_ref: don't ask read_ref_full where the ref came from
. refs.c: pass the ref log message to _create/delete/update instead of _commit
. refs.c: add an err argument to delete_ref_loose
. wrapper.c: add a new function unlink_or_msg
. wrapper.c: remove/unlink_or_warn: simplify, treat ENOENT as success
. mv test: recreate mod/ directory instead of relying on stale copy
Rerolled and was asked to wait. Seems to break HEAD reflog
upon "checkout HEAD^0".
Expecting another reroll.
* tr/remerge-diff (2014-09-08) 8 commits
- log --remerge-diff: show what the conflict resolution changed
- name-hash: allow dir hashing even when !ignore_case
- merge-recursive: allow storing conflict hunks in index
- merge_diff_mode: fold all merge diff variants into an enum
- combine-diff: do not pass revs->dense_combined_merges redundantly
- merge-recursive: -Xindex-only to leave worktree unchanged
- merge-recursive: internal flag to avoid touching the worktree
- merge-recursive: remove dead conditional in update_stages()
"log -p" output learns a new way to let users inspect a merge
commit by showing the differences between the automerged result
with conflicts the person who recorded the merge would have seen
and the final conflict resolution that was recorded in the merge.
Review comments sent.
* hv/submodule-config (2014-06-30) 4 commits
- do not die on error of parsing fetchrecursesubmodules option
- use new config API for worktree configurations of submodules
- extract functions for submodule config set and lookup
- implement submodule config cache for lookup of submodule names
Kicked back to 'pu' per request ($gmane/255610).
* jt/timer-settime (2014-08-29) 6 commits
- use timer_settime() for new platforms
- autoconf: check for timer_settime()
- autoconf: check for struct itimerspec
- autoconf: check for struct sigevent
- autoconf: check for struct timespec
- autoconf: check for timer_t
(this branch uses jt/itimer-autoconf.)
Reviewed, discussed and wanting for a reroll.
* jk/pack-bitmap (2014-08-04) 1 commit
- pack-bitmap: do not use gcc packed attribute
Hold, waiting for Karsten's replacement.
* cb/mergetool-difftool (2014-07-21) 2 commits
- difftool: don't assume that default sh is sane
- mergetool: don't require a work tree for --tool-help
Update the way the "difftool --help" shows the help message that is
shared with the "mergetool" to reduce one shell dependency.
Will be rerolled.
* rr/mergetool-temporary-filename-tweak (2014-08-21) 1 commit
- Allow the user to change the temporary file name for mergetool
Needs rerolling (new paragraph in doc seems to be in a wrong place)
* jk/tag-contains (2014-06-30) 8 commits
. perf: add tests for tag --contains
. tag: use commit_contains
. commit: provide a fast multi-tip contains function
. string-list: add pos to iterator callback
. add functions for memory-efficient bitmaps
. paint_down_to_common: use prio_queue
. tag: factor out decision to stream tags
. tag: allow --sort with -n
Expecting a reroll.
* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
- SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
- git-add--interactive: Preserve diff heading when splitting hunks
Waiting for a reroll.
* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
- gitweb: Harden UTF-8 handling in generated links
$gmane/250758?
* rh/prompt-tests (2014-06-05) 11 commits
- t9904: new __git_ps1 tests for Zsh
- test-lib: make it possible to override how test code is eval'd
- lib-prompt-tests.sh: add variable for string that encodes percent in PS1
- lib-prompt-tests.sh: put all tests inside a function
- t9903: move prompt tests to a new lib-prompt-tests.sh file
- t9903: move PS1 color code variable definitions to lib-bash.sh
- t9903: include "Bash" in test names via new $shellname var
- t9903: run pc mode tests again with PS1 expansion disabled
- t9903: move test name prefix to a separate variable
- t9903: put the Bash pc mode prompt test cases in a function
- t9903: remove Zsh test from the suite of Bash prompt tests
Expecting a reroll to limit the damage to test_eval_; also reported
to be broken with older zsh that are still in the field ($gmane/251231).
* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
- userdiff: support Java try keyword
- userdiff: support C# async methods and correct C# keywords
Reviews sent; waiting for a response.
* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
- git-rebase: print name of rev when using shorthand
Teach "git rebase -" to report the concrete name of the branch
(i.e. the previous one).
But it stops short and does not do the same for "git rebase @{-1}".
Expecting a reroll.
* jk/makefile (2014-02-05) 16 commits
. FIXUP
. move LESS/LV pager environment to Makefile
. Makefile: teach scripts to include make variables
. FIXUP
. Makefile: auto-build C strings from make variables
. Makefile: drop *_SQ variables
. FIXUP
. Makefile: add c-quote helper function
. Makefile: introduce sq function for shell-quoting
. Makefile: always create files via make-var
. Makefile: store GIT-* sentinel files in MAKE/
. Makefile: prefer printf to echo for GIT-*
. Makefile: use tempfile/mv strategy for GIT-*
. Makefile: introduce make-var helper function
. Makefile: fix git-instaweb dependency on gitweb
. Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
Simplify the Makefile rules and macros that exist primarily for
quoting purposes, and make it easier to robustly express the
dependency rules.
Expecting a reroll.
* po/everyday-doc (2014-01-27) 1 commit
- Make 'git help everyday' work
This may make the said command to emit something, but the source is
not meant to be formatted into a manual pages to begin with, and
also its contents are a bit stale. It may be a good first step in
the right direction, but needs more work to at least get the
mark-up right before public consumption.
Waiting for a reroll (thread ending at $gmane/254746)
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
- merge: make prepare_to_commit responsible for write_merge_state
- t7505: ensure cleanup after hook blocks merge
- t7505: add missing &&
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
run during "git merge". The log message stresses too much on one
hook, prepare-commit-msg, but it would equally apply to other hooks
like post-merge, I think.
Waiting for a reroll.
* jc/graph-post-root-gap (2013-12-30) 3 commits
- WIP: document what we want at the end
- graph: remove unused code a bit
- graph: stuff the current commit into graph->columns[]
This was primarily a RFH ($gmane/239580).
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
- perf-lib: add test_perf_cleanup target
- perf-lib: split starting the test from the execution
Add test_perf_cleanup shell function to the perf suite, that allows
the script writers to define a test with a clean-up action.
Will hold.
* jc/show-branch (2014-03-24) 5 commits
- show-branch: use commit slab to represent bitflags of arbitrary width
- show-branch.c: remove "all_mask"
- show-branch.c: abstract out "flags" operation
- show-branch.c: lift all_mask/all_revs to a global static
- show-branch.c: update comment style
Waiting for the final step to lift the hard-limit before sending it out.
--------------------------------------------------
[Cooking]
* jk/faster-name-conflicts (2014-09-12) 1 commit
(merged to 'next' on 2014-09-19 at 34d2840)
+ refs: speed up is_refname_available
Optimize the check to see if a ref $F can be created by making sure
no existing ref has $F/ as its prefix, which especially matters in
a repository with a large number of existing refs.
Will merge to 'master'.
* jk/write-packed-refs-via-stdio (2014-09-10) 1 commit
(merged to 'next' on 2014-09-19 at f1e94fb)
+ refs: write packed_refs file using stdio
Optimize the code path to write out the packed-refs file, which
especially matters in a repository with a large number of refs.
Will merge to 'master'.
* da/include-compat-util-first-in-c (2014-09-15) 4 commits
- SQUASH???
- check-headers: add header usage checks for .c files
- Makefile: add check-headers target
- cleanups: ensure that git-compat-util.h is included first
* da/rev-parse-verify-quiet (2014-09-19) 4 commits
(merged to 'next' on 2014-09-23 at 5ed184a)
+ stash: prefer --quiet over shell redirection of the standard error stream
+ refs: make rev-parse --quiet actually quiet
+ t1503: use test_must_be_empty
+ Documentation: a note about stdout for git rev-parse --verify --quiet
"rev-parse --verify --quiet $name" is meant to quietly exit with a
non-zero status when $name is not a valid object name, but still
gave error messages in some cases.
Will merge to 'master'.
* hj/pretty-naked-decoration (2014-09-18) 1 commit
(merged to 'next' on 2014-09-23 at fb699c4)
+ pretty: add %D format specifier
The pretty-format specifier "%d", which expanded to " (tagname)"
for a tagged commit, gained a cousin "%D" that just gives the
"tagname" without frills.
Will merge to 'master'.
* jc/ignore-sigpipe-while-running-hooks (2014-09-16) 1 commit
(merged to 'next' on 2014-09-19 at 7abf293)
+ receive-pack: allow hooks to ignore its standard input stream
pre- and post-receive hooks are no longer required to read all
their inputs.
Will merge to 'master'.
* jk/close-stderr-of-credential-cache-deamon (2014-09-16) 1 commit
(merged to 'next' on 2014-09-19 at 51ba3be)
+ credential-cache: close stderr in daemon process
Plug fd leaks.
Will merge to 'master'.
* jk/mbox-from-line (2014-09-22) 2 commits
(merged to 'next' on 2014-09-23 at 506b89b)
+ mailinfo: work around -Wstring-plus-int warning
(merged to 'next' on 2014-09-19 at 314af77)
+ mailinfo: make ">From" in-body header check more robust
Some MUAs mangled a line in a message that begins with "From " to
">From " when writing to a mailbox file and feeding such an input
to "git am" used to lose such a line.
Will merge to 'master'.
* jk/prune-packed-server-info (2014-09-15) 4 commits
(merged to 'next' on 2014-09-19 at 5e6c398)
+ repack: call prune_packed_objects() and update_server_info() directly
+ server-info: clean up after writing info/packs
+ make update-server-info more robust
+ prune-packed: fix minor memory leak
Code cleanup.
Will merge to 'master'.
* pr/use-default-sigpipe-setting (2014-09-22) 2 commits
(merged to 'next' on 2014-09-24 at 2d678ed)
+ mingw.h: add dummy functions for sigset_t operations
+ unblock and unignore SIGPIPE
We used to get confused when a process called us with SIGPIPE
ignored; we do want to die with SIGPIPE when the output is not
read by default, and do ignore the signal when appropriate.
Will merge to 'master'.
* rs/realloc-array (2014-09-18) 2 commits
(merged to 'next' on 2014-09-23 at a5bb3a6)
+ use REALLOC_ARRAY for changing the allocation size of arrays
+ add macro REALLOC_ARRAY
Code cleanup.
Will merge to 'master'.
* jk/branch-verbose-merged (2014-09-18) 1 commit
(merged to 'next' on 2014-09-23 at d940d15)
+ branch: clean up commit flags after merge-filter walk
The "--verbose" option no longer breaks "git branch --merged $it".
Will merge to 'master'.
* sb/help-unknown-command-sort-fix (2014-09-18) 1 commit
(merged to 'next' on 2014-09-23 at 6ab29ed)
+ help: fix the size passed to qsort
Code cleanup.
Will merge to 'master'.
* jc/hash-object (2014-09-11) 3 commits
(merged to 'next' on 2014-09-19 at ea6ac62)
+ hash-object: add --literally option
+ hash-object: pass 'write_object' as a flag
+ hash-object: reduce file-scope statics
(this branch is used by jc/hash-object-fsck-tag.)
"hash-object" learned a new "--literally" option to hash any random
garbage into a loose object, to allow us to create a test data for
mechanisms to catch corrupt objects.
Will merge to 'master'.
* jc/hash-object-fsck-tag (2014-09-12) 2 commits
(merged to 'next' on 2014-09-19 at f14a7fe)
+ t1450: make sure fsck detects a malformed tagger line
+ Merge branch 'js/fsck-tag-validation' into HEAD
(this branch uses jc/hash-object and js/fsck-tag-validation.)
Using "hash-object --literally", test one of the new breakages
js/fsck-tag-validation topic teaches "fsck" to catch is caught.
Will merge to 'master'.
* js/fsck-tag-validation (2014-09-12) 6 commits
(merged to 'next' on 2014-09-19 at 4a62182)
+ Make sure that index-pack --strict checks tag objects
+ Add regression tests for stricter tag fsck'ing
+ fsck: check tag objects' headers
+ Make sure fsck_commit_buffer() does not run out of the buffer
+ fsck_object(): allow passing object data separately from the object itself
+ Refactor type_from_string() to allow continuing after detecting an error
(this branch is used by jc/hash-object-fsck-tag.)
Teach "git fsck" to inspect the contents of annotated tag objects.
Will merge to 'master'.
* mh/lockfile (2014-09-16) 35 commits
- get_locked_file_path(): new function
- lockfile.c: rename static functions
- lockfile: rename LOCK_NODEREF to LOCK_NO_DEREF
- commit_locked_index(): extract a function commit_lock_file_to()
- trim_last_path_component(): replace last_path_elm()
- resolve_symlink(): take a strbuf parameter
- resolve_symlink(): use a strbuf for internal scratch space
- struct lock_file: change the filename member into a strbuf
- commit_lock_file(): use a strbuf to manage temporary space
- try_merge_strategy(): use a statically-allocated lock_file object
- try_merge_strategy(): remove redundant lock_file allocation
- struct lock_file: declare some fields volatile
- lockfile: avoid transitory invalid states
- git_config_set_multivar_in_file(): avoid call to rollback_lock_file()
- dump_marks(): remove a redundant call to rollback_lock_file()
- api-lockfile: document edge cases
- commit_lock_file(): rollback lock file on failure to rename
- commit_lock_file(): if close fails, roll back
- commit_lock_file(): die() if called for unlocked lockfile object
- commit_lock_file(): inline temporary variable
- remove_lock_file(): call rollback_lock_file()
- lock_file(): exit early if lockfile cannot be opened
- write_packed_entry_fn(): convert cb_data into a (const int *)
- prepare_index(): declare return value to be (const char *)
- delete_ref_loose(): don't muck around in the lock_file's filename
- cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN
- lockfile.c: document the various states of lock_file objects
- lock_file(): always add lock_file object to lock_file_list
- hold_lock_file_for_append(): release lock on errors
- lockfile: unlock file if lockfile permissions cannot be adjusted
- rollback_lock_file(): set fd to -1
- rollback_lock_file(): exit early if lock is not active
- rollback_lock_file(): do not clear filename redundantly
- api-lockfile: expand the documentation
- unable_to_lock_die(): rename function from unable_to_lock_index_die()
Rerolled, reviews in progress; it seems that we will see another reroll?
* nd/multiple-work-trees (2014-09-16) 32 commits
- t2025: add a test to make sure grafts is working from a linked checkout
- checkout: don't require a work tree when checking out into a new one
- git_path(): keep "info/sparse-checkout" per work-tree
- count-objects: report unused files in $GIT_DIR/worktrees/...
- gc: support prune --worktrees
- gc: factor out gc.pruneexpire parsing code
- gc: style change -- no SP before closing parenthesis
- checkout: clean up half-prepared directories in --to mode
- checkout: reject if the branch is already checked out elsewhere
- prune: strategies for linked checkouts
- checkout: support checking out into a new working directory
- use new wrapper write_file() for simple file writing
- wrapper.c: wrapper to open a file, fprintf then close
- setup.c: support multi-checkout repo setup
- setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
- setup.c: convert check_repository_format_gently to use strbuf
- setup.c: detect $GIT_COMMON_DIR in is_git_directory()
- setup.c: convert is_git_directory() to use strbuf
- git-stash: avoid hardcoding $GIT_DIR/logs/....
- *.sh: avoid hardcoding $GIT_DIR/hooks/...
- git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
- $GIT_COMMON_DIR: a new environment variable
- commit: use SEQ_DIR instead of hardcoding "sequencer"
- fast-import: use git_path() for accessing .git dir instead of get_git_dir()
- reflog: avoid constructing .lock path with git_path
- *.sh: respect $GIT_INDEX_FILE
- git_path(): be aware of file relocation in $GIT_DIR
- path.c: group git_path(), git_pathdup() and strbuf_git_path() together
- path.c: rename vsnpath() to do_git_path()
- git_snpath(): retire and replace with strbuf_git_path()
- path.c: make get_pathname() call sites return const char *
- path.c: make get_pathname() return strbuf instead of static buffer
A replacement for contrib/workdir/git-new-workdir that does not
rely on symbolic links and make sharing of objects and refs safer
by making the borrowee and borrowers aware of each other.
Rerolled, reviews in progress; it seems that we will see another reroll?
* cc/interpret-trailers (2014-09-22) 11 commits
- Documentation: add documentation for 'git interpret-trailers'
- trailer: add tests for commands in config file
- trailer: execute command from 'trailer.<name>.command'
- trailer: add tests for "git interpret-trailers"
- trailer: add interpret-trailers command
- trailer: put all the processing together and print
- trailer: parse trailers from file or stdin
- trailer: process command line trailer arguments
- trailer: read and process config information
- trailer: process trailers from input message and arguments
- trailer: add data structures and basic functions
A new filter to programatically edit the tail end of the commit log
messages.
Discussion on the topic with Michael Tsirkin who wants to utilize
this machinery is going on. Finally a real functionality review
that is very much welcomed ;-).
* sp/stream-clean-filter (2014-09-22) 7 commits
- sha1_file: don't convert off_t to size_t too early to avoid potential die()
- convert: stream from fd to required clean filter to reduce used address space
- copy_fd(): do not close the input file descriptor
- mmap_limit: introduce GIT_MMAP_LIMIT to allow testing expected mmap size
- memory_limit: use git_env_ulong() to parse GIT_ALLOC_LIMIT
- config.c: add git_env_ulong() to parse environment variable
- convert: drop arguments other than 'path' from would_convert_to_git()
Will merge to 'next'.
* jc/push-cert (2014-09-17) 23 commits
(merged to 'next' on 2014-09-24 at a99f5d8)
+ signed push: allow stale nonce in stateless mode
+ signed push: teach smart-HTTP to pass "git push --signed" around
+ signed push: fortify against replay attacks
+ signed push: add "pushee" header to push certificate
+ signed push: remove duplicated protocol info
+ send-pack: send feature request on push-cert packet
+ receive-pack: GPG-validate push certificates
+ push: the beginning of "git push --signed"
+ pack-protocol doc: typofix for PKT-LINE
+ gpg-interface: move parse_signature() to where it should be
+ gpg-interface: move parse_gpg_output() to where it should be
+ send-pack: clarify that cmds_sent is a boolean
+ send-pack: refactor inspecting and resetting status and sending commands
+ send-pack: rename "new_refs" to "need_pack_data"
+ receive-pack: factor out capability string generation
+ send-pack: factor out capability string generation
+ send-pack: always send capabilities
+ send-pack: refactor decision to send update per ref
+ send-pack: move REF_STATUS_REJECT_NODELETE logic a bit higher
+ receive-pack: factor out queueing of command
+ receive-pack: do not reuse old_sha1[] for other things
+ receive-pack: parse feature request a bit earlier
+ receive-pack: do not overallocate command structure
Allow "git push" request to be signed, so that it can be verified and
audited, using the GPG signature of the person who pushed, that the
tips of branches at a public repository really point the commits
the pusher wanted to, without having to "trust" the server.
Will merge to 'master'.
* jc/test-lazy-prereq (2014-06-13) 1 commit
- tests: drop GIT_*_TIMING_TESTS environment variable support
Test-script clean-up.
Will merge to 'next'.
* mt/patch-id-stable (2014-06-10) 1 commit
- patch-id: change default to stable
Teaches "git patch-id" to compute the patch ID that does not change
when the files in a single patch is reordered. As this new algorithm
is backward incompatible, the last bit to flip it to be the default
is left out of 'master' for now.
Nobody seems to be jumping up & down requesting this last step,
which makes the result somewhat backward incompatible.
Will perhaps drop.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html