What's cooking in git.git (Jul 2010, #03; Fri, 16)

What's cooking in git.git (Jul 2010, #03; Fri, 16)

[Junio C Hamano]

Here are the topics that have been cooking.  Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'.  The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.

I've ended up merging a few more fixes to 'master'; please give it a good
final round of testing so that we can have the real thing mid next week.

Thanks.

--------------------------------------------------
[New Topics]

* ab/report-corrupt-object-with-type (2010-06-10) 1 commit
 - sha1_file: Show the the type and path to corrupt objects

* cc/revert (2010-07-14) 4 commits
 - revert: improve success message by adding abbreviated commit sha1
 - revert: don't print "Finished one cherry-pick." if commit failed
 - revert: refactor commit code into a new run_git_commit() function
 - revert: report success when using option --strategy

* en/fast-export-fix (2010-07-07) 2 commits
 . fast-export: Add a --full-tree option
 . fast-export: Fix dropping of files with --import-marks and path limiting

Seems to have breakage in test 9350 (possibly others but I didn't look).

* jn/parse-date-basic (2010-07-15) 1 commit
 - Export parse_date_basic() to convert a date string to timestamp
 (this branch is used by rr/svn-export.)

* kf/post-receive-sample-hook (2010-07-16) 1 commit
 - post-receive-email: optional message line count limit

* tr/rfc-reset-doc (2010-07-16) 5 commits
 - Documentation/reset: move "undo permanently" example behind "make topic"
 - Documentation/reset: reorder examples to match description
 - Documentation/reset: promote 'examples' one section up
 - Documentation/reset: separate options by mode
 - Documentation/git-reset: reorder modes for soft-mixed-hard progression

--------------------------------------------------
[Graduated to "master"]

* ab/submodule-add-f (2010-07-05) 1 commit
  (merged to 'next' on 2010-07-14 at 4ab3d00)
 + git submodule: add submodules with git add -f <path>

* bc/maint-makefile-fixes (2010-07-06) 2 commits
  (merged to 'next' on 2010-07-14 at 294ab08)
 + Makefile: work around ksh's failure to handle missing list argument to for loop
 + Makefile: remove some unnecessary curly braces

* eb/doc-log-manpage (2010-07-07) 1 commit
  (merged to 'next' on 2010-07-14 at d073ef2)
 + Reorganize `git-log' man page to clarify common diff options.

* jc/diff-merge-base-multi (2010-07-16) 2 commits
 + diff A...B: do not limit the syntax too narrowly
 + diff A...B: give one possible diff when there are more than one merge-base

* jc/rebase-i-commit-msg-fix (2010-07-05) 2 commits
  (merged to 'next' on 2010-07-14 at 2273bd2)
 + rebase-i: do not get fooled by a log message ending with backslash
 + rebase-i: style fix

* jk/maint-status-keep-index-timestamp (2010-07-06) 1 commit
  (merged to 'next' on 2010-07-14 at 43cc5ef)
 + do not write out index when status does not have to

* jn/grep-open (2010-07-02) 1 commit
  (merged to 'next' on 2010-07-14 at c057fd6)
 + grep -O: Do not pass color sequences as filenames to pager

* jn/paginate-fix (2010-06-26) 4 commits
 + git --paginate: do not commit pager choice too early
 + tests: local config file should be honored from subdirs of toplevel
 + t7006: test pager configuration for several git commands
 + t7006 (pager): introduce helper for parameterized tests

* jn/tests (2010-07-10) 1 commit
  (merged to 'next' on 2010-07-14 at 390c1f6)
 + t3000 (ls-files -o): modernize style

* js/merge-rr-fix (2010-07-14) 1 commit
 + MERGE_RR is in .git, not .git/rr-cache

* mg/revision-doc (2010-07-05) 3 commits
  (merged to 'next' on 2010-07-14 at 416a2ad)
 + Documentation: link to gitrevisions rather than git-rev-parse
 + Documentation: gitrevisions
 + Documentation: split off rev doc into include file

* ns/merge-recursive-uptodate (2010-07-09) 1 commit
 + merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency

* wp/merge-tree-fix (2010-07-14) 2 commits
 + merge-tree: fix where two branches share no changes
 + add basic tests for merge-tree

--------------------------------------------------
[Stalled -- would discard unless there are some movements soon]

* by/log-range-diff (2010-07-12) 18 commits
 . Minimum fix to make by/log-range-diff topic at least compile
 . add test cases for '--graph' of line level log
 . line.c output the '--graph' padding before each line
 . add parent rewrite feature to line level log
 . make rewrite_parents an external function
 . some document update
 . add two test cases
 . add --always-print option
 . map/print ranges along traversing the history topologically
 . print the line log
 . map/take range to parent
 . add range clone functions
 . export three functions from diff.c
 . parse the -L options
 . refactor parse_loc
 . add the basic data structure for line level history
 . parse-options: add two helper functions
 . parse-options: stop when encounter a non-option

Seems to break some tests in t403X range but we are not in a hurry.

* ps/gitweb-soc (2010-06-02) 2 commits
  (merged to 'next' on 2010-06-13 at 92245ae)
 + git-instaweb: Add option to reuse previous config file
 + Makefile: Use $(sharedir)/gitweb for target 'install-gitweb'

If we are going to have a configuration variable to control this, I
strongly suspect that --reuse-config should be renamed so that the
variable can be named more sanely and in line with whatever option
that replaces it.

* js/rebase-origin-x (2010-02-05) 1 commit
 - [RFC w/o test and incomplete] rebase: add -x option to record original commit name

I retract my objection against the idea of -x; needs polishing before
moving forward.

* zl/mailinfo-recode-patch (2010-06-14) 2 commits
 - add --recode-patch option to git-am
 - add --recode-patch option to git-mailinfo

I recall there was another round of re-roll planned for this one.

* jk/tag-contains (2010-07-05) 4 commits
 - Why is "git tag --contains" so slow?
 - default core.clockskew variable to one day
 - limit "contains" traversals based on commit timestamp
 - tag: speed up --contains calculation

--------------------------------------------------
[Cooking]

* rr/svn-export (2010-07-15) 8 commits
 - Add SVN dump parser
 - Add infrastructure to write revisions in fast-export format
 - Add stream helper library
 - Add string-specific memory pool
 - vcs-svn: treap_search should return NULL for missing items
 - Add treap implementation
 - Add memory pool library
 - Introduce vcs-svn lib
 (this branch uses jn/parse-date-basic.)

* hv/autosquash-config (2010-07-14) 1 commit
 - add configuration variable for --autosquash option of interactive rebase

* jh/graph-next-line (2010-07-13) 2 commits
 - Enable custom schemes for column colors in the graph API
 - Make graph_next_line() available in the graph.h API

* jl/add-n-ignore-missing (2010-07-10) 1 commit
 - git add: Add the "--ignore-missing" option for the dry run

* ar/string-list-foreach (2010-07-03) 2 commits
 - Convert the users of for_each_string_list to for_each_string_list_item macro
 - Add a for_each_string_list_item macro
 (this branch is used by tf/string-list-init.)

* il/rfc-remote-fd-ext (2010-06-28) 2 commits
 - New remote helper: git-remote-ext
 - New remote helper git-remote-fd

* gp/pack-refs-remove-empty-dirs (2010-07-06) 1 commit
  (merged to 'next' on 2010-07-14 at 7d25131)
 + pack-refs: remove newly empty directories

* hv/submodule-find-ff-merge (2010-07-07) 3 commits
 - Implement automatic fast-forward merge for submodules
 - setup_revisions(): Allow walking history in a submodule
 - Teach ref iteration module about submodules

* jn/fast-import-subtree (2010-06-30) 1 commit
 - Teach fast-import to import subtrees named by tree id

* sg/rerere-gc-old-still-used (2010-07-13) 2 commits
 - rerere: fix overeager gc
 - mingw_utime(): handle NULL times parameter

* tf/string-list-init (2010-07-04) 1 commit
 - string_list: Add STRING_LIST_INIT macro and make use of it.
 (this branch uses ar/string-list-foreach.)

* en/d-f-conflict-fix (2010-07-09) 6 commits
  (merged to 'next' on 2010-07-14 at 2b2a810)
 + fast-import: Improve robustness when D->F changes provided in wrong order
 + fast-export: Fix output order of D/F changes
 + merge_recursive: Fix renames across paths below D/F conflicts
 + merge-recursive: Fix D/F conflicts
 + Add a rename + D/F conflict testcase
 + Add additional testcases for D/F conflicts

* ab/i18n (2010-07-10) 1 commit
 - Add infrastructure for translating Git with gettext

* tc/checkout-B (2010-06-24) 3 commits
 - builtin/checkout: learn -B
 - builtin/checkout: reword hint for -b
 - add tests for checkout -b

* eb/double-convert-before-merge (2010-07-02) 3 commits
 - Don't expand CRLFs when normalizing text during merge
 - Try normalizing files to avoid delete/modify conflicts when merging
 - Avoid conflicts when merging branches with mixed normalization

Re: What's cooking in git.git (Jul 2010, #03; Fri, 16)

[Bo Yang]

Hi Junio,
On Sat, Jul 17, 2010 at 2:06 PM, Junio C Hamano <gitster@pobox.com> wrote:
> --------------------------------------------------
> [Stalled -- would discard unless there are some movements soon]
>
> * by/log-range-diff (2010-07-12) 18 commits
>  . Minimum fix to make by/log-range-diff topic at least compile
>  . add test cases for '--graph' of line level log
>  . line.c output the '--graph' padding before each line
>  . add parent rewrite feature to line level log
>  . make rewrite_parents an external function
>  . some document update
>  . add two test cases
>  . add --always-print option
>  . map/print ranges along traversing the history topologically
>  . print the line log
>  . map/take range to parent
>  . add range clone functions
>  . export three functions from diff.c
>  . parse the -L options
>  . refactor parse_loc
>  . add the basic data structure for line level history
>  . parse-options: add two helper functions
>  . parse-options: stop when encounter a non-option

I will send a new series of this patches tomorrow. I have several
graduate parties these days, so I am sorry for the delay!

-- 
Regards!
Bo
----------------------------
My blog: http://blog.morebits.org
Why Git: http://www.whygitisbetterthanx.com/

Re: What's cooking in git.git (Jul 2010, #03; Fri, 16)

[Elijah Newren]

Hi,

On Sat, Jul 17, 2010 at 12:06 AM, Junio C Hamano <gitster@pobox.com> wrote:
> * en/fast-export-fix (2010-07-07) 2 commits
>  . fast-export: Add a --full-tree option
>  . fast-export: Fix dropping of files with --import-marks and path limiting
>
> Seems to have breakage in test 9350 (possibly others but I didn't look).

The patch series works on top of maint or master, but not on top of
next or pu.  The existing tests pass, but the new one it adds breaks
because (1) this new testcase depends on the full output of
fast-export (and in particular the order of printed filenames) and (2)
the "fix output order of D/F changes" from the below series (which
underwent some modifications after the original submission of the
above series) changes that order.

> * en/d-f-conflict-fix (2010-07-09) 6 commits
>  (merged to 'next' on 2010-07-14 at 2b2a810)
>  + fast-import: Improve robustness when D->F changes provided in wrong order
>  + fast-export: Fix output order of D/F changes
>  + merge_recursive: Fix renames across paths below D/F conflicts
>  + merge-recursive: Fix D/F conflicts
>  + Add a rename + D/F conflict testcase
>  + Add additional testcases for D/F conflicts

One fix is fairly trivial -- just change the testcase to use the newer
file output order.  Alternatively, I could modify the new test to not
depend on the full output of fast-export.  I'll do the latter and
resubmit.

Sorry about this problem; I should have retested the combination of
the two series after modifying one of them.

Elijah