mirror of
https://github.com/git/git.git
synced 2026-01-18 14:44:28 +00:00
What's cooking (2011/08 #06)
This commit is contained in:
Junio C Hamano
@@ -1,203 +1,95 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Aug 2011, #05; Fri, 19)
|
||||
X-master-at: cee426811c981c62c4b236ebdcb47d1c2945cf56
|
||||
X-next-at: b5fcad02a1cc9cc1c2b8ebaef4ad67d0f9101c98
|
||||
Subject: What's cooking in git.git (Aug 2011, #06; Tue, 23)
|
||||
X-master-at: 8d9185bc12650a9839dff45a8754f05618cdb3f5
|
||||
X-next-at: b87361146165b920a11ae9bb995856575d51be9a
|
||||
|
||||
What's cooking in git.git (Aug 2011, #05; Fri, 19)
|
||||
What's cooking in git.git (Aug 2011, #06; Tue, 23)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'.
|
||||
|
||||
There are a few 'fixup!' commits queued in topics still in 'pu', so that
|
||||
authors have a choice to just say "that fix looks good, squash it in!"
|
||||
instead of going through an extra round.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/traverse-commit-list (2011-08-17) 3 commits
|
||||
- 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
|
||||
|
||||
* rc/diff-cleanup-records (2011-08-17) 2 commits
|
||||
- Merge branch 'rc/histogram-diff' into HEAD
|
||||
- xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()
|
||||
|
||||
* fk/make-auto-header-dependencies (2011-08-18) 1 commit
|
||||
- Makefile: Use computed header dependencies if the compiler supports it
|
||||
|
||||
* jk/color-and-pager (2011-08-18) 10 commits
|
||||
- want_color: automatically fallback to color.ui
|
||||
- diff: don't load color config in plumbing
|
||||
- config: refactor get_colorbool function
|
||||
- color: delay auto-color decision until point of use
|
||||
- git_config_colorbool: refactor stdout_is_tty handling
|
||||
- diff: refactor COLOR_DIFF from a flag into an int
|
||||
- setup_pager: set GIT_PAGER_IN_USE
|
||||
- t7006: use test_config helpers
|
||||
- test-lib: add helper functions for config
|
||||
- t7006: modernize calls to unset
|
||||
(this branch is used by jk/pager-with-alias.)
|
||||
|
||||
Looked reasonable.
|
||||
Will merge to "next".
|
||||
|
||||
* jk/pager-with-alias (2011-08-18) 2 commits
|
||||
- support pager.* for aliases
|
||||
- support pager.* for external commands
|
||||
(this branch uses jk/color-and-pager.)
|
||||
|
||||
* nd/decorate-grafts (2011-08-19) 5 commits
|
||||
- log: decorate "replaced" on to replaced commits
|
||||
- log: decorate grafted commits with "grafted"
|
||||
- Move write_shallow_commits to fetch-pack.c
|
||||
- Add for_each_commit_graft() to iterate all grafts
|
||||
- decoration: do not mis-decorate refs with same prefix
|
||||
|
||||
Looked reasonable.
|
||||
Will merge to "next".
|
||||
|
||||
* va/p4-branch-import (2011-08-19) 4 commits
|
||||
- git-p4: Add simple test case for branch import
|
||||
- git-p4: Allow branch definition with git config
|
||||
- git-p4: Allow filtering Perforce branches by user
|
||||
- git-p4: Correct branch base depot path detection
|
||||
(this branch uses va/p4-rename-copy.)
|
||||
|
||||
* va/p4-rename-copy (2011-08-18) 4 commits
|
||||
- git-p4: Add test case for copy detection.
|
||||
- git-p4: Add test case for rename detection.
|
||||
- git-p4: Add description of rename/copy detection options.
|
||||
- git-p4: Allow setting rename/copy detection threshold.
|
||||
(this branch is used by va/p4-branch-import.)
|
||||
|
||||
* da/difftool-mergtool-refactor (2011-08-19) 4 commits
|
||||
- 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
|
||||
|
||||
* mg/branch-set-upstream-previous (2011-08-19) 1 commit
|
||||
- branch.c: use the parsed branch name
|
||||
I was very tempted to cut 1.7.7-rc0 today, but we have quite a few topics
|
||||
that deserve to be in the upcoming release and are still in 'next'. I'll
|
||||
probably merge most if not all of what are in 'next' as of today sometime
|
||||
later this week, tag a 1.7.7-rc0 release and declare feature freeze for
|
||||
this cycle.
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* cb/maint-exec-error-report (2011-08-01) 2 commits
|
||||
(merged to 'next' on 2011-08-05 at 2764424)
|
||||
+ notice error exit from pager
|
||||
+ error_routine: use parent's stderr if exec fails
|
||||
* cb/maint-ls-files-error-report (2011-08-11) 1 commit
|
||||
(merged to 'next' on 2011-08-15 at 69f41cf)
|
||||
+ ls-files: fix pathspec display on error
|
||||
|
||||
* cb/maint-quiet-push (2011-08-08) 2 commits
|
||||
(merged to 'next' on 2011-08-08 at 917d73b)
|
||||
+ receive-pack: do not overstep command line argument array
|
||||
(merged to 'next' on 2011-08-01 at 87df938)
|
||||
+ propagate --quiet to send-pack/receive-pack
|
||||
* jn/maint-test-return (2011-08-11) 3 commits
|
||||
(merged to 'next' on 2011-08-15 at 5a42301)
|
||||
+ t3900: do not reference numbered arguments from the test script
|
||||
+ test: cope better with use of return for errors
|
||||
+ test: simplify return value of test_run_
|
||||
|
||||
* db/am-skip-blank-at-the-beginning (2011-08-11) 1 commit
|
||||
(merged to 'next' on 2011-08-11 at 3637843)
|
||||
+ am: ignore leading whitespace before patch
|
||||
* rt/zlib-smaller-window (2011-08-11) 2 commits
|
||||
(merged to 'next' on 2011-08-15 at e05b26b)
|
||||
+ test: consolidate definition of $LF
|
||||
+ Tolerate zlib deflation with window size < 32Kb
|
||||
|
||||
* jc/maint-combined-diff-work-tree (2011-08-04) 1 commit
|
||||
(merged to 'next' on 2011-08-05 at 976a4d4)
|
||||
+ diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/maint-smart-http-race-upload-pack (2011-08-08) 1 commit
|
||||
(merged to 'next' on 2011-08-11 at 3f24b64)
|
||||
+ helping smart-http/stateless-rpc fetch race
|
||||
* 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
|
||||
|
||||
* js/bisect-no-checkout (2011-08-09) 11 commits
|
||||
(merged to 'next' on 2011-08-11 at 6c94a45)
|
||||
+ bisect: add support for bisecting bare repositories
|
||||
+ bisect: further style nitpicks
|
||||
+ bisect: replace "; then" with "\n<tab>*then"
|
||||
+ bisect: cleanup whitespace errors in git-bisect.sh.
|
||||
+ bisect: add documentation for --no-checkout option.
|
||||
+ bisect: add tests for the --no-checkout option.
|
||||
+ bisect: introduce --no-checkout support into porcelain.
|
||||
+ bisect: introduce support for --no-checkout option.
|
||||
+ bisect: add tests to document expected behaviour in presence of broken trees.
|
||||
+ bisect: use && to connect statements that are deferred with eval.
|
||||
+ bisect: move argument parsing before state modification.
|
||||
* 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
|
||||
|
||||
* js/ref-namespaces (2011-07-21) 5 commits
|
||||
(merged to 'next' on 2011-07-25 at 5b7dcfe)
|
||||
+ ref namespaces: tests
|
||||
+ ref namespaces: documentation
|
||||
+ ref namespaces: Support remote repositories via upload-pack and receive-pack
|
||||
+ ref namespaces: infrastructure
|
||||
+ Fix prefix handling in ref iteration functions
|
||||
* bw/doc-repo-layout (2011-08-22) 2 commits
|
||||
- Mark http-fetch without -a as deprecated
|
||||
- Documentation: Grammar correction, wording fixes and cleanup
|
||||
|
||||
* js/sh-style (2011-08-05) 2 commits
|
||||
(merged to 'next' on 2011-08-11 at 4a4c22c)
|
||||
+ filter-branch.sh: de-dent usage string
|
||||
+ misc-sh: fix up whitespace in some other .sh files.
|
||||
* ci/forbid-unwanted-current-branch-update (2011-08-22) 2 commits
|
||||
- Show interpreted branch name in error messages
|
||||
- Prevent force-updating of the current branch
|
||||
|
||||
* ma/am-exclude (2011-08-09) 2 commits
|
||||
(merged to 'next' on 2011-08-11 at cf0ba4d)
|
||||
+ am: Document new --exclude=<path> option
|
||||
(merged to 'next' on 2011-08-05 at 658e57c)
|
||||
+ am: pass exclude down to apply
|
||||
* di/fast-import-blob-tweak (2011-08-22) 2 commits
|
||||
- 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
|
||||
|
||||
* mh/check-attr-listing (2011-08-04) 23 commits
|
||||
(merged to 'next' on 2011-08-11 at f73ad50)
|
||||
+ Rename git_checkattr() to git_check_attr()
|
||||
+ git-check-attr: Fix command-line handling to match docs
|
||||
+ git-check-attr: Drive two tests using the same raw data
|
||||
+ git-check-attr: Add an --all option to show all attributes
|
||||
+ git-check-attr: Error out if no pathnames are specified
|
||||
+ git-check-attr: Process command-line args more systematically
|
||||
+ git-check-attr: Handle each error separately
|
||||
+ git-check-attr: Extract a function error_with_usage()
|
||||
+ git-check-attr: Introduce a new variable
|
||||
+ git-check-attr: Extract a function output_attr()
|
||||
+ Allow querying all attributes on a file
|
||||
+ Remove redundant check
|
||||
+ Remove redundant call to bootstrap_attr_stack()
|
||||
+ Extract a function collect_all_attrs()
|
||||
+ Teach prepare_attr_stack() to figure out dirlen itself
|
||||
+ git-check-attr: Use git_attr_name()
|
||||
+ Provide access to the name attribute of git_attr
|
||||
+ git-check-attr: Add tests of command-line parsing
|
||||
+ git-check-attr: Add missing "&&"
|
||||
+ Disallow the empty string as an attribute name
|
||||
+ Remove anachronism from comment
|
||||
+ doc: Correct git_attr() calls in example code
|
||||
+ doc: Add a link from gitattributes(5) to git-check-attr(1)
|
||||
(this branch is used by mh/check-attr-relative.)
|
||||
* jc/combine-diff-callback (2011-08-20) 1 commit
|
||||
- combine-diff: support format_callback
|
||||
(this branch is used by fg/submodule-ff-check-before-push.)
|
||||
|
||||
* mh/check-attr-relative (2011-08-04) 6 commits
|
||||
(merged to 'next' on 2011-08-11 at f94550c)
|
||||
+ test-path-utils: Add subcommand "prefix_path"
|
||||
+ test-path-utils: Add subcommand "absolute_path"
|
||||
+ git-check-attr: Normalize paths
|
||||
+ git-check-attr: Demonstrate problems with relative paths
|
||||
+ git-check-attr: Demonstrate problems with unnormalized paths
|
||||
+ git-check-attr: test that no output is written to stderr
|
||||
(this branch uses mh/check-attr-listing.)
|
||||
* 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
|
||||
|
||||
* rc/histogram-diff (2011-08-08) 12 commits
|
||||
(merged to 'next' on 2011-08-11 at 684dfd1)
|
||||
+ xdiff/xhistogram: drop need for additional variable
|
||||
+ xdiff/xhistogram: rely on xdl_trim_ends()
|
||||
+ xdiff/xhistogram: rework handling of recursed results
|
||||
+ xdiff: do away with xdl_mmfile_next()
|
||||
(merged to 'next' on 2011-08-03 at f9e2328)
|
||||
+ Make test number unique
|
||||
(merged to 'next' on 2011-07-25 at 3351028)
|
||||
+ xdiff/xprepare: use a smaller sample size for histogram diff
|
||||
+ xdiff/xprepare: skip classification
|
||||
+ teach --histogram to diff
|
||||
+ t4033-diff-patience: factor out tests
|
||||
+ xdiff/xpatience: factor out fall-back-diff function
|
||||
+ xdiff/xprepare: refactor abort cleanups
|
||||
+ xdiff/xprepare: use memset()
|
||||
* nd/maint-clone-gitdir (2011-08-22) 2 commits
|
||||
- clone: allow to clone from .git file
|
||||
- read_gitfile_gently(): rename misnamed function to read_gitfile()
|
||||
|
||||
* di/fast-import-tagging (2011-08-23) 2 commits
|
||||
- fast-import: allow to tag newly created objects
|
||||
- fast-import: add tests for tagging blobs
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* 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
|
||||
|
||||
Needs documentation updates.
|
||||
|
||||
* jc/merge-reword (2011-05-25) 2 commits
|
||||
- merge: mark the final "Merge made by..." message for l10n
|
||||
- merge: reword the final message
|
||||
@@ -255,44 +147,103 @@ I think a further refactoring (no, not my suggestion) was offered?
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* di/fast-import-doc (2011-08-17) 1 commit
|
||||
- doc/fast-import: document feature import-marks-if-exists
|
||||
* jc/traverse-commit-list (2011-08-22) 3 commits
|
||||
- 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
|
||||
|
||||
Comments from fast-import folks?
|
||||
* 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()
|
||||
|
||||
* fk/make-auto-header-dependencies (2011-08-18) 1 commit
|
||||
- Makefile: Use computed header dependencies if the compiler supports it
|
||||
|
||||
* jk/color-and-pager (2011-08-19) 10 commits
|
||||
(merged to 'next' on 2011-08-23 at cbb9495)
|
||||
+ want_color: automatically fallback to color.ui
|
||||
+ diff: don't load color config in plumbing
|
||||
+ config: refactor get_colorbool function
|
||||
+ color: delay auto-color decision until point of use
|
||||
+ git_config_colorbool: refactor stdout_is_tty handling
|
||||
+ diff: refactor COLOR_DIFF from a flag into an int
|
||||
+ setup_pager: set GIT_PAGER_IN_USE
|
||||
+ t7006: use test_config helpers
|
||||
+ test-lib: add helper functions for config
|
||||
+ t7006: modernize calls to unset
|
||||
(this branch is used by jk/pager-with-alias.)
|
||||
|
||||
* jk/pager-with-alias (2011-08-19) 2 commits
|
||||
- support pager.* for aliases
|
||||
- support pager.* for external commands
|
||||
(this branch uses jk/color-and-pager.)
|
||||
|
||||
* nd/decorate-grafts (2011-08-19) 5 commits
|
||||
(merged to 'next' on 2011-08-23 at 475d27e)
|
||||
+ log: decorate "replaced" on to replaced commits
|
||||
+ log: decorate grafted commits with "grafted"
|
||||
+ Move write_shallow_commits to fetch-pack.c
|
||||
+ Add for_each_commit_graft() to iterate all grafts
|
||||
+ decoration: do not mis-decorate refs with same prefix
|
||||
|
||||
* va/p4-branch-import (2011-08-22) 4 commits
|
||||
- git-p4: Add simple test case for branch import
|
||||
- git-p4: Allow branch definition with git config
|
||||
- git-p4: Allow filtering Perforce branches by user
|
||||
- git-p4: Correct branch base depot path detection
|
||||
(this branch uses va/p4-rename-copy.)
|
||||
|
||||
* va/p4-rename-copy (2011-08-22) 5 commits
|
||||
- git-p4: Process detectCopiesHarder with --bool
|
||||
- git-p4: Add test case for copy detection
|
||||
- git-p4: Add test case for rename detection
|
||||
- git-p4: Add description of rename/copy detection options
|
||||
- git-p4: Allow setting rename/copy detection threshold
|
||||
(this branch is used by va/p4-branch-import.)
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
||||
* 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-deltified-tree (2011-08-14) 2 commits
|
||||
- fast-import: prevent producing bad delta
|
||||
- fast-import: add a test for tree delta base corruption
|
||||
|
||||
Comments from fast-import folks?
|
||||
(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
|
||||
|
||||
* di/fast-import-ident (2011-08-11) 5 commits
|
||||
- fsck: improve committer/author check
|
||||
- fsck: add a few committer name tests
|
||||
- fast-import: check committer name more strictly
|
||||
- fast-import: don't fail on omitted committer name
|
||||
- fast-import: add input format tests
|
||||
|
||||
Comments from fast-import folks?
|
||||
(merged to 'next' on 2011-08-23 at 9b86391)
|
||||
+ fsck: improve committer/author check
|
||||
+ fsck: add a few committer name tests
|
||||
+ fast-import: check committer name more strictly
|
||||
+ fast-import: don't fail on omitted committer name
|
||||
+ fast-import: add input format tests
|
||||
|
||||
* di/parse-options-split (2011-08-11) 2 commits
|
||||
- Reduce parse-options.o dependencies
|
||||
- parse-options: export opterr, optbug
|
||||
|
||||
Looked reasonable.
|
||||
Will merge to "next".
|
||||
(merged to 'next' on 2011-08-23 at 6cd667f)
|
||||
+ Reduce parse-options.o dependencies
|
||||
+ parse-options: export opterr, optbug
|
||||
|
||||
* mh/attr (2011-08-14) 7 commits
|
||||
- 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
|
||||
|
||||
All looked reasonable.
|
||||
Will merge to "next".
|
||||
(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
|
||||
|
||||
* mh/iterate-refs (2011-08-14) 6 commits
|
||||
- Retain caches of submodule refs
|
||||
@@ -303,84 +254,81 @@ Will merge to "next".
|
||||
- Extract a function clear_cached_refs()
|
||||
|
||||
I did not see anything wrong per-se, but it was unclear what the benefit
|
||||
of these changes are. I probably need to read it once again.
|
||||
of these changes are.
|
||||
|
||||
* jn/plug-empty-tree-leak (2011-08-16) 2 commits
|
||||
- merge-recursive: take advantage of hardcoded empty tree
|
||||
- revert: plug memory leak in "cherry-pick root commit" codepath
|
||||
|
||||
Both looked reasonable.
|
||||
Will merge to "next".
|
||||
(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
|
||||
|
||||
* ac/describe-dirty-refresh (2011-08-11) 1 commit
|
||||
- describe: Refresh the index when run with --dirty
|
||||
|
||||
Will merge to "next", but needs Sign-off.
|
||||
(merged to 'next' on 2011-08-23 at b873611)
|
||||
+ describe: Refresh the index when run with --dirty
|
||||
|
||||
* en/merge-recursive-2 (2011-08-14) 57 commits
|
||||
- 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
|
||||
(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
|
||||
|
||||
Rerolled.
|
||||
Will merge to "next".
|
||||
|
||||
* fg/submodule-ff-check-before-push (2011-08-09) 1 commit
|
||||
* fg/submodule-ff-check-before-push (2011-08-20) 2 commits
|
||||
- push: teach --recurse-submodules the on-demand option
|
||||
- push: Don't push a repository with unpushed submodules
|
||||
(this branch uses jc/combine-diff-callback.)
|
||||
|
||||
* hv/submodule-update-none (2011-08-11) 2 commits
|
||||
- add update 'none' flag to disable update of submodule by default
|
||||
@@ -397,51 +345,17 @@ Will merge to "next".
|
||||
- object.c: code movement for readability
|
||||
|
||||
* js/i18n-scripts (2011-08-08) 5 commits
|
||||
- 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
|
||||
(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 "next".
|
||||
|
||||
* cb/maint-ls-files-error-report (2011-08-11) 1 commit
|
||||
(merged to 'next' on 2011-08-15 at 69f41cf)
|
||||
+ ls-files: fix pathspec display on error
|
||||
|
||||
Will merge to "master".
|
||||
|
||||
* jn/maint-test-return (2011-08-11) 3 commits
|
||||
(merged to 'next' on 2011-08-15 at 5a42301)
|
||||
+ t3900: do not reference numbered arguments from the test script
|
||||
+ test: cope better with use of return for errors
|
||||
+ test: simplify return value of test_run_
|
||||
|
||||
Will merge to "master".
|
||||
|
||||
* rt/zlib-smaller-window (2011-08-11) 2 commits
|
||||
(merged to 'next' on 2011-08-15 at e05b26b)
|
||||
+ test: consolidate definition of $LF
|
||||
+ Tolerate zlib deflation with window size < 32Kb
|
||||
|
||||
Will merge to "master".
|
||||
|
||||
* fg/submodule-git-file-git-dir (2011-08-16) 3 commits
|
||||
- fixup! Move git-dir for submodules
|
||||
- Move git-dir for submodules
|
||||
- rev-parse: add option --resolve-git-dir <path>
|
||||
|
||||
Will merge to "next", after squashing the top one.
|
||||
|
||||
* 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
|
||||
|
||||
Needs documentation updates.
|
||||
* 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
|
||||
+ rev-parse: add option --resolve-git-dir <path>
|
||||
|
||||
* jk/http-auth-keyring (2011-08-03) 13 commits
|
||||
(merged to 'next' on 2011-08-03 at b06e80e)
|
||||
|
||||
Reference in New Issue
Block a user