To: git@vger.kernel.org
-Subject: What's cooking in git.git (Aug 2011, #07; Wed, 24)
-X-master-at: b7fcd007153b5021ed70ddc0a224127f14601bbc
-X-next-at: aa5cf7ba43e1b74c3a0aae0ca2989879d9a46233
+Subject: What's cooking in git.git (Sep 2011, #01; Fri, 2)
+X-master-at: b32128793de296348a565e8f7c4257ec82208a48
+X-next-at: be4d2450c3dc8f2570ac5b51987d355b67eef11a
-What's cooking in git.git (Aug 2011, #07; Wed, 24)
+What's cooking in git.git (Sep 2011, #01; Fri, 2)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'.
+Some of the recent patches are fixes to new feature topics already merged
+to "master" and are being fast tracked for 1.7.7-rc1, but otherwise
+patches for new features and fixes to longstanding issues will stay in
+'pu' or 'next' until the 1.7.7 final.
+
--------------------------------------------------
-[Stalled]
+[New Topics]
-* jk/add-i-hunk-filter (2011-07-27) 5 commits
- (merged to 'next' on 2011-08-11 at 8ff9a56)
- + add--interactive: add option to autosplit hunks
- + add--interactive: allow negatation of hunk filters
- + add--interactive: allow hunk filtering on command line
- + add--interactive: factor out regex error handling
- + add--interactive: refactor patch mode argument processing
+* mh/check-ref-format-print-normalize (2011-08-27) 2 commits
+ (merged to 'next' on 2011-08-30 at e827410)
+ + Forbid DEL characters in reference names
+ + check-ref-format --print: Normalize refnames that start with slashes
-Needs documentation updates.
+Will merge to "master".
-* jh/receive-count-limit (2011-05-23) 10 commits
- - receive-pack: Allow server to refuse pushes with too many objects
- - pack-objects: Estimate pack size; abort early if pack size limit is exceeded
- - send-pack/receive-pack: Allow server to refuse pushing too large packs
- - pack-objects: Allow --max-pack-size to be used together with --stdout
- - send-pack/receive-pack: Allow server to refuse pushes with too many commits
- - pack-objects: Teach new option --max-commit-count, limiting #commits in pack
- - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
- - Tighten rules for matching server capabilities in server_supports()
- - send-pack: Attempt to retrieve remote status even if pack-objects fails
- - Update technical docs to reflect side-band-64k capability in receive-pack
+* bk/ancestry-path (2011-08-25) 3 commits
+ (merged to 'next' on 2011-09-02 at d05ba5d)
+ + revision: do not include sibling history in --ancestry-path output
+ + revision: keep track of the end-user input from the command line
+ + rev-list: Demonstrate breakage with --ancestry-path --all
-Would need another round to separate per-pack and per-session limits.
+The topic came up a bit too late in the cycle.
+Will cook for a while.
-* jm/mergetool-pathspec (2011-06-22) 2 commits
- - mergetool: Don't assume paths are unmerged
- - mergetool: Add tests for filename with whitespace
+* mg/branch-list (2011-08-28) 5 commits
+ (merged to 'next' on 2011-09-02 at b818eae)
+ + branch: allow pattern arguments
+ + branch: introduce --list option
+ + git-branch: introduce missing long forms for the options
+ + git-tag: introduce long forms for the options
+ + t6040: test branch -vv
-I think this is a good idea, but it probably needs a re-roll.
-Cf. $gmane/176254, 176255, 166256
+Not urgent; the topic came up a bit too late in the cycle.
-* jk/generation-numbers (2011-07-14) 7 commits
- - limit "contains" traversals based on commit generation
- - check commit generation cache validity against grafts
- - pretty: support %G to show the generation number of a commit
- - commit: add commit_generation function
- - add metadata-cache infrastructure
- - decorate: allow storing values instead of pointers
- - Merge branch 'jk/tag-contains-ab' (early part) into HEAD
+* mm/rebase-i-exec-edit (2011-08-26) 2 commits
+ (merged to 'next' on 2011-09-02 at e75b1b9)
+ + rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree
+ + rebase -i: clean error message for --continue after failed exec
-The initial "tag --contains" de-pessimization without need for generation
-numbers is already in; backburnered.
+Not urgent; the topic came up a bit too late in the cycle.
-* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
- - t5800: point out that deleting branches does not work
- - t5800: document inability to push new branch with old content
+* jk/default-attr (2011-08-26) 1 commit
+ - attr: map builtin userdiff drivers to well-known extensions
-* po/cygwin-backslash (2011-08-05) 2 commits
- - On Cygwin support both UNIX and DOS style path-names
- - git-compat-util: add generic find_last_dir_sep that respects is_dir_sep
+Not urgent; I fixed up the test breakage just for fun.
-I think a further refactoring (no, not my suggestion) was offered?
+* hv/submodule-merge-search (2011-08-26) 4 commits
+ - submodule: Search for merges only at end of recursive merge
+ - allow multiple calls to submodule merge search for the same path
+ - submodule: Demonstrate known breakage during recursive merge
+ - push: Don't push a repository with unpushed submodules
+ (this branch uses fg/submodule-auto-push.)
---------------------------------------------------
-[Cooking]
+Not urgent; the topic came up a bit too late in the cycle.
+The bottom one needs to be replaced with a properly written commit log message.
-* jc/merge-reword (2011-05-25) 1 commit
- (merged to 'next' on 2011-08-24 at aa5cf7b)
- + merge: reword the final message
+* mm/mediawiki-as-a-remote (2011-09-01) 2 commits
+ - git-remote-mediawiki: allow push to set MediaWiki metadata
+ - Add a remote helper to interact with mediawiki (fetch & push)
-Will merge to "master".
+Fun.
+Not urgent; the topic came up a bit too late in the cycle.
-* nk/branch-v-abbrev (2011-07-01) 1 commit
- (merged to 'next' on 2011-08-24 at e9152cf)
- + branch -v: honor core.abbrev
+* nd/maint-autofix-tag-in-head (2011-08-26) 3 commits
+ - Accept tags in HEAD or MERGE_HEAD
+ - merge: remove global variable head[]
+ - merge: keep stash[] a local variable
+
+Probably needs a re-roll to aim a bit higher.
+Not urgent; will not be in 1.7.7.
+
+* bc/unstash-clean-crufts (2011-08-27) 4 commits
+ (merged to 'next' on 2011-09-02 at 7bfd66f)
+ + git-stash: remove untracked/ignored directories when stashed
+ + t/t3905: add missing '&&' linkage
+ + git-stash.sh: fix typo in error message
+ + t/t3905: use the name 'actual' for test output, swap arguments to test_cmp
+
+Not urgent; the topic came up a bit too late in the cycle.
+
+* cb/maint-ls-files-error-report (2011-08-28) 1 commit
+ (merged to 'next' on 2011-08-30 at b606e19)
+ + t3005: do not assume a particular order of stdout and stderr of git-ls-files
Will merge to "master".
-* jk/pager-with-external-command (2011-08-19) 1 commit
- (merged to 'next' on 2011-08-24 at 083f5da)
- + support pager.* for external commands
- (this branch is used by jk/pager-with-alias and jk/pager-with-alias; uses jk/color-and-pager.)
+* da/make-auto-header-dependencies (2011-08-30) 1 commit
+ (merged to 'next' on 2011-09-02 at e04a4af)
+ + Makefile: Improve compiler header dependency check
+ (this branch uses fk/make-auto-header-dependencies.)
-Up to this part (but not "alias") the topic looked unconditionally a good
-thing to do.
+Not urgent; will not be in 1.7.7.
-Will aim to merge to "master" by -rc1.
+* gb/am-hg-patch (2011-08-29) 1 commit
+ (merged to 'next' on 2011-09-02 at 3edfe4c)
+ + am: preliminary support for hg patches
-* fk/use-kwset-pickaxe-grep-f (2011-08-20) 5 commits
- (merged to 'next' on 2011-08-23 at 93ba509)
- + Use kwset in grep
- + Use kwset in pickaxe
- + Adapt the kwset code to Git
- + Add string search routines from GNU grep
- + Add obstack.[ch] from EGLIBC 2.10
+Not urgent; the topic came up a bit too late in the cycle.
-Will aim to merge to "master" by -rc1.
+* jc/diff-index-unpack (2011-08-29) 3 commits
+ (merged to 'next' on 2011-09-02 at 4206bd9)
+ + diff-index: pass pathspec down to unpack-trees machinery
+ + unpack-trees: allow pruning with pathspec
+ + traverse_trees(): allow pruning with pathspec
-* jc/maint-autofix-tag-in-head (2011-08-19) 1 commit
- (merged to 'next' on 2011-08-23 at 18cee02)
- + commit: reduce use of redundant global variables
+Will cook for a while.
+
+* jn/remote-helpers-doc (2011-09-01) 3 commits
+ - (short) documentation for the testgit remote helper
+ - Documentation/git-remote-helpers: explain how import works with multiple refs
+ - Documentation/remote-helpers: explain capabilities first
+
+Not urgent.
+
+* nm/grep-object-sha1-lock (2011-08-30) 1 commit
+ (merged to 'next' on 2011-09-02 at 336f57d)
+ + grep: Fix race condition in delta_base_cache
+
+Not urgent; the topic came up a bit too late in the cycle.
+
+* tr/mergetool-valgrind (2011-08-30) 1 commit
+ (merged to 'next' on 2011-09-02 at f5f2c61)
+ + Symlink mergetools scriptlets into valgrind wrappers
+
+Not urgent; the topic came up a bit too late in the cycle.
+
+* fg/submodule-auto-push (2011-08-20) 1 commit
+ (merged to 'next' on 2011-08-24 at 398e764)
+ + push: teach --recurse-submodules the on-demand option
+ (this branch is used by hv/submodule-merge-search.)
+
+What the topic aims to achieve may make sense, but the implementation
+looked somewhat suboptimal.
+
+* jc/fetch-verify (2011-09-01) 4 commits
+ - NEEDSWORK: rev-list --verify-objects: run fsck_objects() on all objects listed
+ - fetch: verify we have everything we need before updating our ref
+ - rev-list --verify-object
+ - list-objects: pass callback data to show_objects()
+ (this branch uses jc/traverse-commit-list.)
+
+Make "git fetch" verify what it received a bit more carefully before
+updating the refs in the receiving end.
+
+Not urgent; the topic came up a bit too late in the cycle.
+
+* rc/histogram-diff (2011-08-31) 1 commit
+ (merged to 'next' on 2011-09-02 at be4d245)
+ + xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()
Will merge to "master".
+--------------------------------------------------
+[Graduated to "master"]
+
+* ac/describe-dirty-refresh (2011-08-11) 1 commit
+ (merged to 'next' on 2011-08-23 at b873611)
+ + describe: Refresh the index when run with --dirty
+
+* bc/bisect-test-use-shell-path (2011-08-30) 1 commit
+ (merged to 'next' on 2011-08-30 at c090151)
+ + t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh
+
+* bg/t5540-osx-grep (2011-08-28) 1 commit
+ (merged to 'next' on 2011-08-30 at 894af05)
+ + t5540-http-test: shorten grep pattern
+
* bw/doc-repo-layout (2011-08-23) 2 commits
(merged to 'next' on 2011-08-24 at 605c730)
+ Mark http-fetch without -a as deprecated
+ Documentation: Grammar correction, wording fixes and cleanup
-Will merge to "master".
-
* ci/forbid-unwanted-current-branch-update (2011-08-22) 2 commits
(merged to 'next' on 2011-08-24 at 1e93b67)
+ Show interpreted branch name in error messages
+ Prevent force-updating of the current branch
-Will aim to merge to "master" by -rc1.
+* da/difftool-mergtool-refactor (2011-08-19) 4 commits
+ (merged to 'next' on 2011-08-23 at a1cc3be)
+ + mergetools/meld: Use '--output' when available
+ + mergetool--lib: Refactor tools into separate files
+ + mergetool--lib: Make style consistent with git
+ + difftool--helper: Make style consistent with git
* di/fast-import-blob-tweak (2011-08-22) 2 commits
(merged to 'next' on 2011-08-24 at 52eef2a)
+ fast-import: treat cat-blob as a delta base hint for next blob
+ fast-import: count and report # of calls to diff_delta in stats
-Will aim to merge to "master" by -rc1.
-
-* di/fast-import-tagging (2011-08-23) 2 commits
- (merged to 'next' on 2011-08-24 at 67e0937)
- + fast-import: allow to tag newly created objects
- + fast-import: add tests for tagging blobs
-
-Will aim to merge to "master" by -rc1.
-
* di/fast-import-deltified-tree (2011-08-14) 2 commits
(merged to 'next' on 2011-08-23 at ee30265)
+ fast-import: prevent producing bad delta
+ fast-import: add a test for tree delta base corruption
-Will aim to merge to "master" by -rc1.
+* di/fast-import-doc (2011-08-17) 1 commit
+ (merged to 'next' on 2011-08-23 at dab4088)
+ + doc/fast-import: document feature import-marks-if-exists
* di/fast-import-ident (2011-08-11) 5 commits
(merged to 'next' on 2011-08-23 at 9b86391)
+ fast-import: don't fail on omitted committer name
+ fast-import: add input format tests
-Will aim to merge to "master" by -rc1.
-
-* di/fast-import-doc (2011-08-17) 1 commit
- (merged to 'next' on 2011-08-23 at dab4088)
- + doc/fast-import: document feature import-marks-if-exists
+* di/fast-import-tagging (2011-08-23) 2 commits
+ (merged to 'next' on 2011-08-24 at 67e0937)
+ + fast-import: allow to tag newly created objects
+ + fast-import: add tests for tagging blobs
-Will merge to "master".
+* di/parse-options-split (2011-08-11) 2 commits
+ (merged to 'next' on 2011-08-23 at 6cd667f)
+ + Reduce parse-options.o dependencies
+ + parse-options: export opterr, optbug
-* jc/combine-diff-callback (2011-08-20) 1 commit
- (merged to 'next' on 2011-08-24 at 9f9b42d)
- + combine-diff: support format_callback
- (this branch is used by fg/submodule-ff-check-before-push.)
+* en/merge-recursive-2 (2011-08-14) 57 commits
+ (merged to 'next' on 2011-08-23 at ba6ad0d)
+ + merge-recursive: Don't re-sort a list whose order we depend upon
+ + merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
+ + t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify
+ + merge-recursive: Avoid unnecessary file rewrites
+ + t6022: Additional tests checking for unnecessary updates of files
+ + merge-recursive: Fix spurious 'refusing to lose untracked file...' messages
+ + t6022: Add testcase for spurious "refusing to lose untracked" messages
+ + t3030: fix accidental success in symlink rename
+ + merge-recursive: Fix working copy handling for rename/rename/add/add
+ + merge-recursive: add handling for rename/rename/add-dest/add-dest
+ + merge-recursive: Have conflict_rename_delete reuse modify/delete code
+ + merge-recursive: Make modify/delete handling code reusable
+ + merge-recursive: Consider modifications in rename/rename(2to1) conflicts
+ + merge-recursive: Create function for merging with branchname:file markers
+ + merge-recursive: Record more data needed for merging with dual renames
+ + merge-recursive: Defer rename/rename(2to1) handling until process_entry
+ + merge-recursive: Small cleanups for conflict_rename_rename_1to2
+ + merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
+ + merge-recursive: Introduce a merge_file convenience function
+ + merge-recursive: Fix modify/delete resolution in the recursive case
+ + merge-recursive: When we detect we can skip an update, actually skip it
+ + merge-recursive: Provide more info in conflict markers with file renames
+ + merge-recursive: Cleanup and consolidation of rename_conflict_info
+ + merge-recursive: Consolidate process_entry() and process_df_entry()
+ + merge-recursive: Improve handling of rename target vs. directory addition
+ + merge-recursive: Add comments about handling rename/add-source cases
+ + merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
+ + merge-recursive: Fix deletion of untracked file in rename/delete conflicts
+ + merge-recursive: Split update_stages_and_entry; only update stages at end
+ + merge-recursive: Allow make_room_for_path() to remove D/F entries
+ + string-list: Add API to remove an item from an unsorted list
+ + merge-recursive: Split was_tracked() out of would_lose_untracked()
+ + merge-recursive: Save D/F conflict filenames instead of unlinking them
+ + merge-recursive: Fix code checking for D/F conflicts still being present
+ + merge-recursive: Fix sorting order and directory change assumptions
+ + merge-recursive: Fix recursive case with D/F conflict via add/add conflict
+ + merge-recursive: Avoid working directory changes during recursive case
+ + merge-recursive: Remember to free generated unique path names
+ + merge-recursive: Consolidate different update_stages functions
+ + merge-recursive: Mark some diff_filespec struct arguments const
+ + merge-recursive: Correct a comment
+ + merge-recursive: Make BUG message more legible by adding a newline
+ + t6022: Add testcase for merging a renamed file with a simple change
+ + t6022: New tests checking for unnecessary updates of files
+ + t6022: Remove unnecessary untracked files to make test cleaner
+ + t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify
+ + t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify
+ + t6036: tests for criss-cross merges with various directory/file conflicts
+ + t6036: criss-cross with weird content can fool git into clean merge
+ + t6036: Add differently resolved modify/delete conflict in criss-cross test
+ + t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts
+ + t6042: Ensure rename/rename conflicts leave index and workdir in sane state
+ + t6042: Add tests for content issues with modify/rename/directory conflicts
+ + t6042: Add a testcase where undetected rename causes silent file deletion
+ + t6042: Add a pair of cases where undetected renames cause issues
+ + t6042: Add failing testcase for rename/modify/add-source conflict
+ + t6042: Add a testcase where git deletes an untracked file
-Will merge to "master".
+I've taken advantage of the end-of-summer lull and reproduced all 16000+
+two-head merges in the Linux kernel repository with and without this
+series to make sure they get the identical results (either cleanly merged,
+or getting conflicted the same way).
-* jc/maint-clone-alternates (2011-08-23) 2 commits
- (merged to 'next' on 2011-08-23 at 7280deb)
- + clone: clone from a repository with relative alternates
- + clone: allow more than one --reference
+* fg/submodule-ff-check-before-push (2011-08-20) 2 commits
+ (merged to 'next' on 2011-08-24 at 398e764)
+ + push: Don't push a repository with unpushed submodules
+ (this branch is used by hv/submodule-merge-search.)
-Will aim to merge to "master" by -rc1.
+This is only the "check" part, which was sensible. The "auto-push" patch
+has been moved to its own topic.
-* nd/maint-clone-gitdir (2011-08-22) 2 commits
- (merged to 'next' on 2011-08-24 at cbf052b)
- + clone: allow to clone from .git file
- + read_gitfile_gently(): rename misnamed function to read_gitfile()
+* fk/use-kwset-pickaxe-grep-f (2011-08-28) 6 commits
+ (merged to 'next' on 2011-08-28 at 3be2039)
+ + obstack: Fix portability issues
+ (merged to 'next' on 2011-08-23 at 93ba509)
+ + Use kwset in grep
+ + Use kwset in pickaxe
+ + Adapt the kwset code to Git
+ + Add string search routines from GNU grep
+ + Add obstack.[ch] from EGLIBC 2.10
-Will aim to merge to "master" by -rc1.
+* gb/maint-am-patch-format-error-message (2011-08-29) 1 commit
+ (merged to 'next' on 2011-08-30 at ed01a1d)
+ + am: format is in $patch_format, not parse_patch
-* jc/traverse-commit-list (2011-08-22) 3 commits
- (merged to 'next' on 2011-08-24 at df50dd7)
- + revision.c: update show_object_with_name() without using malloc()
- + revision.c: add show_object_with_name() helper function
- + rev-list: fix finish_object() call
+* gb/maint-am-stgit-author-to-from-fix (2011-08-29) 1 commit
+ (merged to 'next' on 2011-08-30 at 0740010)
+ + am: fix stgit patch mangling
-Not urgent; will not be in 1.7.7.
+* jc/clean-exclude-doc (2011-08-28) 1 commit
+ (merged to 'next' on 2011-08-30 at 79dd173)
+ + Documentation: clarify "git clean -e <pattern>"
-* rc/diff-cleanup-records (2011-08-17) 2 commits
- (merged to 'next' on 2011-08-23 at b8414f5)
- + Merge branch 'rc/histogram-diff' into HEAD
- + xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()
+* jc/combine-diff-callback (2011-08-20) 1 commit
+ (merged to 'next' on 2011-08-24 at 9f9b42d)
+ + combine-diff: support format_callback
+ (this branch is used by fg/submodule-ff-check-before-push and hv/submodule-merge-search.)
-Will aim to merge to "master" by -rc1.
+* jc/maint-autofix-tag-in-head (2011-08-19) 1 commit
+ (merged to 'next' on 2011-08-23 at 18cee02)
+ + commit: reduce use of redundant global variables
-* fk/make-auto-header-dependencies (2011-08-18) 1 commit
- (merged to 'next' on 2011-08-24 at 3da2c25)
- + Makefile: Use computed header dependencies if the compiler supports it
+* jc/maint-clone-alternates (2011-08-23) 2 commits
+ (merged to 'next' on 2011-08-23 at 7280deb)
+ + clone: clone from a repository with relative alternates
+ + clone: allow more than one --reference
-Not urgent; will not be in 1.7.7.
+* jc/merge-reword (2011-05-25) 1 commit
+ (merged to 'next' on 2011-08-24 at aa5cf7b)
+ + merge: reword the final message
* jk/color-and-pager (2011-08-19) 10 commits
(merged to 'next' on 2011-08-23 at cbb9495)
+ t7006: modernize calls to unset
(this branch is used by jk/pager-with-alias and jk/pager-with-external-command.)
-Will aim to merge to "master" by -rc1.
+* jk/pager-with-external-command (2011-08-19) 1 commit
+ (merged to 'next' on 2011-08-24 at 083f5da)
+ + support pager.* for external commands
+ (this branch is used by jk/pager-with-alias and jk/pager-with-alias; uses jk/color-and-pager.)
+
+* jn/plug-empty-tree-leak (2011-08-16) 2 commits
+ (merged to 'next' on 2011-08-23 at aee2184)
+ + merge-recursive: take advantage of hardcoded empty tree
+ + revert: plug memory leak in "cherry-pick root commit" codepath
-* jk/pager-with-alias (2011-08-19) 1 commit
- - support pager.* for aliases
- (this branch uses jk/color-and-pager, jk/pager-with-external-command and jk/pager-with-external-command.)
+* js/i18n-scripts (2011-08-08) 5 commits
+ (merged to 'next' on 2011-08-23 at a1b5529)
+ + submodule: take advantage of gettextln and eval_gettextln.
+ + stash: take advantage of eval_gettextln
+ + pull: take advantage of eval_gettextln
+ + git-am: take advantage of gettextln and eval_gettextln.
+ + gettext: add gettextln, eval_gettextln to encode common idiom
+
+* js/i18n-scripts-2 (2011-08-30) 1 commit
+ (merged to 'next' on 2011-08-30 at 5a144a2)
+ + bisect: take advantage of gettextln, eval_gettextln.
+
+* mg/branch-set-upstream-previous (2011-08-19) 1 commit
+ (merged to 'next' on 2011-08-23 at acef0b6)
+ + branch.c: use the parsed branch name
-Perhaps will drop.
+* mg/maint-notes-C-doc (2011-08-25) 1 commit
+ (merged to 'next' on 2011-08-30 at 6f3281a)
+ + git-notes.txt: clarify -C vs. copy and -F
-* nd/decorate-grafts (2011-08-19) 5 commits
+* mh/attr (2011-08-14) 7 commits
+ (merged to 'next' on 2011-08-23 at 22faa6e)
+ + Unroll the loop over passes
+ + Change while loop into for loop
+ + Determine the start of the states outside of the pass loop
+ + Change parse_attr() to take a pointer to struct attr_state
+ + Increment num_attr in parse_attr_line(), not parse_attr()
+ + Document struct match_attr
+ + Add a file comment
+
+* ms/daemon-timeout-is-in-seconds (2011-08-28) 1 commit
+ (merged to 'next' on 2011-08-30 at 2462eb0)
+ + git-daemon.txt: specify --timeout in seconds
+
+* nd/decorate-grafts (2011-08-25) 6 commits
+ (merged to 'next' on 2011-08-25 at 44967e7)
+ + log: Do not decorate replacements with --no-replace-objects
(merged to 'next' on 2011-08-23 at 475d27e)
+ log: decorate "replaced" on to replaced commits
+ log: decorate grafted commits with "grafted"
+ Add for_each_commit_graft() to iterate all grafts
+ decoration: do not mis-decorate refs with same prefix
-Will aim to merge to "master" by -rc1.
+* nd/maint-clone-gitdir (2011-08-22) 2 commits
+ (merged to 'next' on 2011-08-24 at cbf052b)
+ + clone: allow to clone from .git file
+ + read_gitfile_gently(): rename misnamed function to read_gitfile()
+
+* nk/branch-v-abbrev (2011-07-01) 1 commit
+ (merged to 'next' on 2011-08-24 at e9152cf)
+ + branch -v: honor core.abbrev
+ (this branch is used by mg/branch-list.)
+
+* rc/diff-cleanup-records (2011-08-17) 2 commits
+ (merged to 'next' on 2011-08-23 at b8414f5)
+ + Merge branch 'rc/histogram-diff' into HEAD
+ + xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()
+
+* tr/maint-format-patch-empty-output (2011-08-29) 4 commits
+ (merged to 'next' on 2011-08-30 at 078c522)
+ + Document negated forms of format-patch --to --cc --add-headers
+ + t4014: "no-add-headers" is actually called "no-add-header"
+ + t4014: invoke format-patch with --stdout where intended
+ + t4014: check for empty files from git format-patch --stdout
+
+* tr/maint-ident-to-git-memmove (2011-08-29) 1 commit
+ (merged to 'next' on 2011-08-30 at 9395a9b)
+ + Use memmove in ident_to_git
+
+* tr/maint-strbuf-grow-nul-termination (2011-08-29) 1 commit
+ (merged to 'next' on 2011-08-30 at dc87192)
+ + strbuf_grow(): maintain nul-termination even for new buffer
+
+* tr/maint-t3903-misquoted-command (2011-08-30) 1 commit
+ (merged to 'next' on 2011-08-30 at f533857)
+ + t3903: fix misquoted rev-parse invocation
* va/p4-branch-import (2011-08-22) 4 commits
(merged to 'next' on 2011-08-24 at f67f8af)
+ git-p4: Correct branch base depot path detection
(this branch uses va/p4-rename-copy.)
-Will merge to "master".
+* va/p4-branch-import-test-update (2011-08-29) 1 commit
+ (merged to 'next' on 2011-08-30 at 5c54fb3)
+ + git-p4: simple branch tests edits
* va/p4-rename-copy (2011-08-22) 5 commits
(merged to 'next' on 2011-08-24 at f1faa94)
+ git-p4: Allow setting rename/copy detection threshold
(this branch is used by va/p4-branch-import.)
-Will merge to "master".
+--------------------------------------------------
+[Stalled]
-* da/difftool-mergtool-refactor (2011-08-19) 4 commits
- (merged to 'next' on 2011-08-23 at a1cc3be)
- + mergetools/meld: Use '--output' when available
- + mergetool--lib: Refactor tools into separate files
- + mergetool--lib: Make style consistent with git
- + difftool--helper: Make style consistent with git
+* jk/add-i-hunk-filter (2011-07-27) 5 commits
+ (merged to 'next' on 2011-08-11 at 8ff9a56)
+ + add--interactive: add option to autosplit hunks
+ + add--interactive: allow negatation of hunk filters
+ + add--interactive: allow hunk filtering on command line
+ + add--interactive: factor out regex error handling
+ + add--interactive: refactor patch mode argument processing
-Will merge to "master".
+Needs documentation updates, tests, and integration with the higher level
+callers, e.g. "git add -p".
-* mg/branch-set-upstream-previous (2011-08-19) 1 commit
- (merged to 'next' on 2011-08-23 at acef0b6)
- + branch.c: use the parsed branch name
+* jh/receive-count-limit (2011-05-23) 10 commits
+ - receive-pack: Allow server to refuse pushes with too many objects
+ - pack-objects: Estimate pack size; abort early if pack size limit is exceeded
+ - send-pack/receive-pack: Allow server to refuse pushing too large packs
+ - pack-objects: Allow --max-pack-size to be used together with --stdout
+ - send-pack/receive-pack: Allow server to refuse pushes with too many commits
+ - pack-objects: Teach new option --max-commit-count, limiting #commits in pack
+ - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
+ - Tighten rules for matching server capabilities in server_supports()
+ - send-pack: Attempt to retrieve remote status even if pack-objects fails
+ - Update technical docs to reflect side-band-64k capability in receive-pack
-Will merge to "master".
+Would need another round to separate per-pack and per-session limits.
-* di/parse-options-split (2011-08-11) 2 commits
- (merged to 'next' on 2011-08-23 at 6cd667f)
- + Reduce parse-options.o dependencies
- + parse-options: export opterr, optbug
+* jm/mergetool-pathspec (2011-06-22) 2 commits
+ - mergetool: Don't assume paths are unmerged
+ - mergetool: Add tests for filename with whitespace
-Will merge to "master".
+I think this is a good idea, but it probably needs a re-roll.
+Cf. $gmane/176254, 176255, 166256
-* mh/attr (2011-08-14) 7 commits
- (merged to 'next' on 2011-08-23 at 22faa6e)
- + Unroll the loop over passes
- + Change while loop into for loop
- + Determine the start of the states outside of the pass loop
- + Change parse_attr() to take a pointer to struct attr_state
- + Increment num_attr in parse_attr_line(), not parse_attr()
- + Document struct match_attr
- + Add a file comment
+* jk/generation-numbers (2011-07-14) 7 commits
+ - limit "contains" traversals based on commit generation
+ - check commit generation cache validity against grafts
+ - pretty: support %G to show the generation number of a commit
+ - commit: add commit_generation function
+ - add metadata-cache infrastructure
+ - decorate: allow storing values instead of pointers
+ - Merge branch 'jk/tag-contains-ab' (early part) into HEAD
-Will aim to merge to "master" by -rc1.
+The initial "tag --contains" de-pessimization without need for generation
+numbers is already in; backburnered.
+
+* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
+ - t5800: point out that deleting branches does not work
+ - t5800: document inability to push new branch with old content
+
+* po/cygwin-backslash (2011-08-05) 2 commits
+ - On Cygwin support both UNIX and DOS style path-names
+ - git-compat-util: add generic find_last_dir_sep that respects is_dir_sep
+
+I think a further refactoring (no, not my suggestion) was offered?
+
+--------------------------------------------------
+[Cooking]
+
+* jc/traverse-commit-list (2011-08-22) 3 commits
+ (merged to 'next' on 2011-08-24 at df50dd7)
+ + revision.c: update show_object_with_name() without using malloc()
+ + revision.c: add show_object_with_name() helper function
+ + rev-list: fix finish_object() call
+ (this branch is used by jc/fetch-verify.)
+
+Not urgent; will not be in 1.7.7.
+
+* fk/make-auto-header-dependencies (2011-08-18) 1 commit
+ (merged to 'next' on 2011-08-24 at 3da2c25)
+ + Makefile: Use computed header dependencies if the compiler supports it
+ (this branch is used by da/make-auto-header-dependencies.)
+
+Not urgent; will not be in 1.7.7.
* mh/iterate-refs (2011-08-14) 6 commits
- Retain caches of submodule refs
Not urgent; will not be in 1.7.7.
-* jn/plug-empty-tree-leak (2011-08-16) 2 commits
- (merged to 'next' on 2011-08-23 at aee2184)
- + merge-recursive: take advantage of hardcoded empty tree
- + revert: plug memory leak in "cherry-pick root commit" codepath
-
-Will merge to "master".
-
-* ac/describe-dirty-refresh (2011-08-11) 1 commit
- (merged to 'next' on 2011-08-23 at b873611)
- + describe: Refresh the index when run with --dirty
-
-Will merge to "master".
-
-* en/merge-recursive-2 (2011-08-14) 57 commits
- (merged to 'next' on 2011-08-23 at ba6ad0d)
- + merge-recursive: Don't re-sort a list whose order we depend upon
- + merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
- + t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify
- + merge-recursive: Avoid unnecessary file rewrites
- + t6022: Additional tests checking for unnecessary updates of files
- + merge-recursive: Fix spurious 'refusing to lose untracked file...' messages
- + t6022: Add testcase for spurious "refusing to lose untracked" messages
- + t3030: fix accidental success in symlink rename
- + merge-recursive: Fix working copy handling for rename/rename/add/add
- + merge-recursive: add handling for rename/rename/add-dest/add-dest
- + merge-recursive: Have conflict_rename_delete reuse modify/delete code
- + merge-recursive: Make modify/delete handling code reusable
- + merge-recursive: Consider modifications in rename/rename(2to1) conflicts
- + merge-recursive: Create function for merging with branchname:file markers
- + merge-recursive: Record more data needed for merging with dual renames
- + merge-recursive: Defer rename/rename(2to1) handling until process_entry
- + merge-recursive: Small cleanups for conflict_rename_rename_1to2
- + merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
- + merge-recursive: Introduce a merge_file convenience function
- + merge-recursive: Fix modify/delete resolution in the recursive case
- + merge-recursive: When we detect we can skip an update, actually skip it
- + merge-recursive: Provide more info in conflict markers with file renames
- + merge-recursive: Cleanup and consolidation of rename_conflict_info
- + merge-recursive: Consolidate process_entry() and process_df_entry()
- + merge-recursive: Improve handling of rename target vs. directory addition
- + merge-recursive: Add comments about handling rename/add-source cases
- + merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
- + merge-recursive: Fix deletion of untracked file in rename/delete conflicts
- + merge-recursive: Split update_stages_and_entry; only update stages at end
- + merge-recursive: Allow make_room_for_path() to remove D/F entries
- + string-list: Add API to remove an item from an unsorted list
- + merge-recursive: Split was_tracked() out of would_lose_untracked()
- + merge-recursive: Save D/F conflict filenames instead of unlinking them
- + merge-recursive: Fix code checking for D/F conflicts still being present
- + merge-recursive: Fix sorting order and directory change assumptions
- + merge-recursive: Fix recursive case with D/F conflict via add/add conflict
- + merge-recursive: Avoid working directory changes during recursive case
- + merge-recursive: Remember to free generated unique path names
- + merge-recursive: Consolidate different update_stages functions
- + merge-recursive: Mark some diff_filespec struct arguments const
- + merge-recursive: Correct a comment
- + merge-recursive: Make BUG message more legible by adding a newline
- + t6022: Add testcase for merging a renamed file with a simple change
- + t6022: New tests checking for unnecessary updates of files
- + t6022: Remove unnecessary untracked files to make test cleaner
- + t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify
- + t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify
- + t6036: tests for criss-cross merges with various directory/file conflicts
- + t6036: criss-cross with weird content can fool git into clean merge
- + t6036: Add differently resolved modify/delete conflict in criss-cross test
- + t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts
- + t6042: Ensure rename/rename conflicts leave index and workdir in sane state
- + t6042: Add tests for content issues with modify/rename/directory conflicts
- + t6042: Add a testcase where undetected rename causes silent file deletion
- + t6042: Add a pair of cases where undetected renames cause issues
- + t6042: Add failing testcase for rename/modify/add-source conflict
- + t6042: Add a testcase where git deletes an untracked file
-
-Will aim to merge to "master" by -rc1.
-
-* fg/submodule-ff-check-before-push (2011-08-20) 2 commits
- (merged to 'next' on 2011-08-24 at 398e764)
- + push: teach --recurse-submodules the on-demand option
- + push: Don't push a repository with unpushed submodules
- (this branch uses jc/combine-diff-callback.)
-
-Will aim to merge to "master" by -rc1.
-
* hv/submodule-update-none (2011-08-11) 2 commits
(merged to 'next' on 2011-08-24 at 5302fc1)
+ add update 'none' flag to disable update of submodule by default
Not urgent; will not be in 1.7.7.
-* js/i18n-scripts (2011-08-08) 5 commits
- (merged to 'next' on 2011-08-23 at a1b5529)
- + submodule: take advantage of gettextln and eval_gettextln.
- + stash: take advantage of eval_gettextln
- + pull: take advantage of eval_gettextln
- + git-am: take advantage of gettextln and eval_gettextln.
- + gettext: add gettextln, eval_gettextln to encode common idiom
-
-Will merge to "master".
-
* fg/submodule-git-file-git-dir (2011-08-22) 2 commits
(merged to 'next' on 2011-08-23 at 762194e)
+ Move git-dir for submodules
Will keep it in 'next' at least for one cycle.
Not urgent; will not be in 1.7.7.
+
+--------------------------------------------------
+[Discarded]
+
+* jk/pager-with-alias (2011-08-19) 1 commit
+ . support pager.* for aliases
projects / thirdparty / git.git / commitdiff
