What's cooking in git.git (Apr 2011, #02; Wed, 6)

What's cooking in git.git (Apr 2011, #02; Wed, 6)

[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 tip of 'master' is at 1.7.5-rc1 now.

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

* dm/http-cleanup (2011-03-30) 2 commits
 - http-push: refactor curl_easy_setup madness
 - http: make curl callbacks match contracts from curl header

* jc/pack-objects-bigfile (2011-04-05) 1 commit
 - Teach core.bigfilethreashold to pack-objects

* jk/maint-stash-oob (2011-04-06) 2 commits
 - stash: fix false positive in the invalid ref test.
 - stash: fix accidental apply of non-existent stashes

* nk/blame-abbrev (2011-04-06) 1 commit
 - blame: add --abbrev command line option and make it honor core.abbrev

* nm/submodule-update-force (2011-04-01) 1 commit
 - submodule: Add --force option for git submodule update

* jk/maint-upload-pack-shallow (2011-04-04) 1 commit
 - [REVISIT] upload-pack deadlock during a shallow clone

* jk/stash-loosen-safety (2011-04-05) 1 commit
 - stash: drop dirty worktree check on apply

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

* jc/rev-list-options-fix (2011-04-01) 1 commit
  (merged to 'next' on 2011-04-03 at 91f19de)
 + "log --cherry-pick" documentation regression fix

* jk/maint-remote-mirror-safer (2011-03-30) 3 commits
  (merged to 'next' on 2011-04-03 at ccc9c1a)
 + remote: deprecate --mirror
 + remote: separate the concept of push and fetch mirrors
 + remote: disallow some nonsensical option combinations

This avoids a nonsense configuration to be created to confuse unsuspecting
users.

* jl/submodule-fetch-on-demand (2011-03-06) 7 commits
  (merged to 'next' on 2011-03-20 at a5e452d)
 + fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
 + submodule update: Don't fetch when the submodule commit is already present
 + fetch/pull: Don't recurse into a submodule when commits are already present
 + Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
 + config: teach the fetch.recurseSubmodules option the 'on-demand' value
 + fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
 + fetch/pull: recurse into submodules when necessary

* mg/doc-revisions-txt (2011-04-04) 3 commits
  (merged to 'next' on 2011-04-04 at ebf3612)
 + revisions.txt: language improvements
 + revisions.txt: structure with a labelled list
 + revisions.txt: consistent use of quotes

* nm/maint-conflicted-submodule-entries (2011-03-30) 1 commit
  (merged to 'next' on 2011-04-03 at 40c5094)
 + submodule: process conflicting submodules only once

--------------------------------------------------
[Stalled]

* jh/gitweb-localtime (2011-03-23) 1 commit
 - gitweb: javascript ability to adjust time based on timezone

* mg/show-without-prune (2011-04-01) 1 commit
 - builtin/show: do not prune by pathspec
 (this branch uses mg/reflog-with-options.)

I wanted to like this, but it still feels like too much magic.

* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit
 - Look for password in both CVS and CVSNT password files.

It seems that we need separate parsers for these two formats in order not
to regress the users of the original cvs.

* jc/index-pack (2011-02-25) 5 commits
 - index-pack --verify: read anomalous offsets from v2 idx file
 - write_idx_file: need_large_offset() helper function
 - index-pack: --verify
 - write_idx_file: introduce a struct to hold idx customization options
 - index-pack: group the delta-base array entries also by type

Still a WIP, and will not be ready for 1.7.5. Need to put histogram output
into index-pack --verify to really kill verify-pack.

* 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

The idea of the bottom one is probably Ok, except that the use of object
flags needs to be rethought, or at least the helper needs to be moved to
builtin/tag.c to make it clear that it should not be used outside the
current usage context.

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

* dm/color-palette (2011-04-05) 1 commit
  (merged to 'next' on 2011-04-04 at 0244ef9)
 + Share color list between graph and show-branch

* mg/sha1-path-advise (2011-03-31) 2 commits
  (merged to 'next' on 2011-04-04 at e429e0c)
 + sha1_name: Suggest commit:./file for path in subdir
 + t1506: factor out test for "Did you mean..."

* ar/clean-rmdir-empty (2011-04-01) 1 commit
  (merged to 'next' on 2011-04-03 at c63fac8)
 + clean: unreadable directory may still be rmdir-able if it is empty

* jk/maint-push-async-hang (2011-03-31) 4 commits
 - send-pack: abort sideband demuxer on pack-objects error
 - run-command: allow aborting async code prematurely
 - finish_async: be quiet when waiting for async process
 - teach wait_or_whine a "quiet" mode
 (this branch is used by jk/maint-push-async-hang-threads.)

* jk/maint-push-async-hang-threads (2011-03-31) 2 commits
 - run-command: implement abort_async for pthreads
 - Merge branch 'jk/maint-push-async-hang' into jk/maint-push-async-hang-threads
 (this branch uses jk/maint-push-async-hang.)

* mg/reflog-with-options (2011-04-01) 3 commits
  (merged to 'next' on 2011-04-03 at e69a95c)
 + reflog: fix overriding of command line options
 + t/t1411: test reflog with formats
 + builtin/log.c: separate default and setup of cmd_log_init()
 (this branch is used by mg/show-without-prune.)

Reasonable, but can wait.

* mh/git-svn-automkdirs (2011-04-01) 1 commit
  (merged to 'next' on 2011-04-03 at 7fa4978)
 + git-svn: add an option to skip the creation of empty directories

Should be safe, but I'd like an Ack from git-svn folks.

* jc/diff-irreversible-delete (2011-02-28) 1 commit
  (merged to 'next' on 2011-04-03 at 5a23b23)
 + git diff -D: omit the preimage of deletes

Unstuck, thanks to Michael J Gruber.

* jh/notes-add-ui (2011-03-30) 1 commit
 - Make "git notes add" more user-friendly when there are existing notes

* jk/notes-ui-updates (2011-03-30) 7 commits
 - log/pretty-options: Document --[no-]notes and deprecate old notes options
 - revision.c: make --no-notes reset --notes list
 - revision.c: support --notes command-line option
 - notes: refactor display notes default handling
 - notes: refactor display notes extra refs field
 - revision.c: refactor notes ref expansion
 - notes: make expand_notes_ref globally accessible

I like what this does, but it probably can wait.

* nd/maint-setup (2011-03-26) 2 commits
  (merged to 'next' on 2011-03-31 at 2c36f6a)
 + Kill off get_relative_cwd()
 + setup: return correct prefix if worktree is '/'

This benefits only the minority who use /.git at the root level of the
filesystem, but the changed code is used from many codepaths; will not
merge before 1.7.5.

* mz/rebase (2011-02-28) 34 commits
  (merged to 'next' on 2011-03-31 at 3b1343c)
 + rebase: define options in OPTIONS_SPEC
  (merged to 'next' on 2011-02-25 at 52caa7a)
 + Makefile: do not install sourced rebase scripts
  (merged to 'next' on 2011-02-22 at 3219155)
 + rebase: use @{upstream} if no upstream specified
 + rebase -i: remove unnecessary state rebase-root
 + rebase -i: don't read unused variable preserve_merges
 + git-rebase--am: remove unnecessary --3way option
 + rebase -m: don't print exit code 2 when merge fails
 + rebase -m: remember allow_rerere_autoupdate option
 + rebase: remember strategy and strategy options
 + rebase: remember verbose option
 + rebase: extract code for writing basic state
 + rebase: factor out sub command handling
 + rebase: make -v a tiny bit more verbose
 + rebase -i: align variable names
 + rebase: show consistent conflict resolution hint
 + rebase: extract am code to new source file
 + rebase: extract merge code to new source file
 + rebase: remove $branch as synonym for $orig_head
 + rebase -i: support --stat
 + rebase: factor out call to pre-rebase hook
 + rebase: factor out clean work tree check
 + rebase: factor out reference parsing
 + rebase: reorder validation steps
 + rebase -i: remove now unnecessary directory checks
 + rebase: factor out command line option processing
 + rebase: align variable content
 + rebase: align variable names
 + rebase: stricter check of standalone sub command
 + rebase: act on command line outside parsing loop
 + rebase: improve detection of rebase in progress
 + rebase: remove unused rebase state 'prev_head'
 + rebase: read state outside loop
 + rebase: refactor reading of state
 + rebase: clearer names for directory variables

I wanted to wait for an independent Ack or two for the tip one, which was
a response to regression concerns raised by J6t, but ended up merging it
to 'next' after giving another look.  Will not merge before 1.7.5, as
there is no user visible improvements up to this point.

* jk/maint-merge-rename-create (2011-03-25) 3 commits
  (merged to 'next' on 2011-03-31 at b9bc9f1)
 + merge: turn on rewrite detection
 + merge: handle renames with replacement content
 + t3030: fix accidental success in symlink rename

* mz/maint-rename-unmerged (2011-03-23) 1 commit
  (merged to 'next' on 2011-03-31 at c7b3d9a)
 + diffcore-rename: don't consider unmerged path as source

Will cook until 1.7.5 final.

* nd/struct-pathspec (2011-04-05) 5 commits
 - pathspec: rename per-item field has_wildcard to use_wildcard
  (merged to 'next' on 2011-03-31 at 66cbb7d)
 + Improve tree_entry_interesting() handling code
 + Convert read_tree{,_recursive} to support struct pathspec
 + Reimplement read_tree_recursive() using tree_entry_interesting()
 + Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'

Will cook until 1.7.5 final.

* jc/add-u-migration (2011-03-22) 3 commits
 - add: make "add -u/-A" update full tree without pathspec (step 3)
 - add: make "add -u/-A" update full tree without pathspec (step 2)
  (merged to 'next' on 2011-03-31 at 962e058)
 + add: make "add -u/-A" update full tree without pathspec

Need to redo the advice after the "this is from root of the working tree"
magic pathspec.

* jc/rename-degrade-cc-to-c (2011-01-06) 4 commits
  (merged to 'next' on 2011-03-31 at 8d685d7)
 + diffcore-rename: fall back to -C when -C -C busts the rename limit
 + diffcore-rename: record filepair for rename src
 + diffcore-rename: refactor "too many candidates" logic
 + builtin/diff.c: remove duplicated call to diff_result_code()

Will hold.

* cn/system-path-tweak (2011-03-17) 1 commit
 - system_path: use a static buffer

Don't see much point in this itself. Probably will drop.

* en/merge-recursive (2011-03-17) 4 commits
  (merged to 'next' on 2011-03-18 at a32016b)
 + merge-recursive: tweak magic band-aid
  (merged to 'next' on 2011-03-09 at 3762932)
 + merge-recursive: When we detect we can skip an update, actually skip it
 + t6022: New test checking for unnecessary updates of files in D/F conflicts
 + t6022: New test checking for unnecessary updates of renamed+modified files

I am not happy with these magic band aids.  Will hold.

Re: What's cooking in git.git (Apr 2011, #02; Wed, 6)

[Jeff King]

On Wed, Apr 06, 2011 at 01:04:40PM -0700, Junio C Hamano wrote:

> * jk/maint-merge-rename-create (2011-03-25) 3 commits
>   (merged to 'next' on 2011-03-31 at b9bc9f1)
>  + merge: turn on rewrite detection
>  + merge: handle renames with replacement content
>  + t3030: fix accidental success in symlink rename

I think this was already your plan, but please hold off on merging this
to master. I got an off-list bug report that the top commit breaks a
cherry-pick on somebody's private repo, and I'm trying to track down the
exact reason.

-Peff

Re: What's cooking in git.git (Apr 2011, #02; Wed, 6)

[Ævar Arnfjörð Bjarmason]

On Wed, Apr 6, 2011 at 22:04, Junio C Hamano <gitster@pobox.com> wrote:

> * jl/submodule-fetch-on-demand (2011-03-06) 7 commits
>  (merged to 'next' on 2011-03-20 at a5e452d)
>  + fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
>  + submodule update: Don't fetch when the submodule commit is already present
>  + fetch/pull: Don't recurse into a submodule when commits are already present
>  + Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
>  + config: teach the fetch.recurseSubmodules option the 'on-demand' value
>  + fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
>  + fetch/pull: recurse into submodules when necessary

This series needs to be fixed to not fail tests with GETTEXT_POISON=YesPlease.

Re: What's cooking in git.git (Apr 2011, #02; Wed, 6)

[Jens Lehmann]

Am 10.04.2011 20:52, schrieb Ævar Arnfjörð Bjarmason:
> On Wed, Apr 6, 2011 at 22:04, Junio C Hamano <gitster@pobox.com> wrote:
> 
>> * jl/submodule-fetch-on-demand (2011-03-06) 7 commits
>>  (merged to 'next' on 2011-03-20 at a5e452d)
>>  + fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
>>  + submodule update: Don't fetch when the submodule commit is already present
>>  + fetch/pull: Don't recurse into a submodule when commits are already present
>>  + Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
>>  + config: teach the fetch.recurseSubmodules option the 'on-demand' value
>>  + fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
>>  + fetch/pull: recurse into submodules when necessary
> 
> This series needs to be fixed to not fail tests with GETTEXT_POISON=YesPlease.

Maybe something like this? Junio, do you want me to squash the changes in
the patch series and resend it or should I send a new commit?

-----------------8<-------------
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index af78e21..3279aec 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -230,7 +230,7 @@ test_expect_success "Recursion doesn't happen when no new commits are fetched in
 	! test -s actual.err
 '

-test_expect_success "Recursion stops when no new submodule commits are fetched" '
+test_expect_success C_LOCALE_OUTPUT "Recursion stops when no new submodule commits are fetched" '
 	head1=$(git rev-parse --short HEAD) &&
 	git add submodule &&
 	git commit -m "new submodule" &&
@@ -247,7 +247,7 @@ test_expect_success "Recursion stops when no new submodule commits are fetched"
 	test_cmp expect.out.sub actual.out
 '

-test_expect_success "Recursion doesn't happen when new superproject commits don't change any submodules" '
+test_expect_success C_LOCALE_OUTPUT "Recursion doesn't happen when new superproject commits don't change any submodules" '
 	add_upstream_commit &&
 	head1=$(git rev-parse --short HEAD) &&
 	echo a > file &&
@@ -264,7 +264,7 @@ test_expect_success "Recursion doesn't happen when new superproject commits don'
 	test_cmp expect.err.file actual.err
 '

-test_expect_success "Recursion picks up config in submodule" '
+test_expect_success C_LOCALE_OUTPUT "Recursion picks up config in submodule" '
 	(
 		cd downstream &&
 		git fetch --recurse-submodules &&
@@ -293,7 +293,7 @@ test_expect_success "Recursion picks up config in submodule" '
 	test_cmp expect.out actual.out
 '

-test_expect_success "Recursion picks up all submodules when necessary" '
+test_expect_success C_LOCALE_OUTPUT "Recursion picks up all submodules when necessary" '
 	add_upstream_commit &&
 	(
 		cd submodule &&
@@ -351,7 +351,7 @@ test_expect_success "'--recurse-submodules=on-demand' doesn't recurse when no ne
 	! test -s actual.err
 '

-test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)" '
+test_expect_success C_LOCALE_OUTPUT "'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)" '
 	head1=$(git rev-parse --short HEAD) &&
 	git add submodule &&
 	git commit -m "new submodule" &&
@@ -379,7 +379,7 @@ test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necess
 	test_cmp expect.err actual.err
 '

-test_expect_success "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" '
+test_expect_success C_LOCALE_OUTPUT "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" '
 	add_upstream_commit &&
 	head1=$(git rev-parse --short HEAD) &&
 	echo a >> file &&
@@ -396,7 +396,7 @@ test_expect_success "'--recurse-submodules=on-demand' stops when no new submodul
 	test_cmp expect.err.file actual.err
 '

-test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config" '
+test_expect_success C_LOCALE_OUTPUT "'fetch.recurseSubmodules=on-demand' overrides global config" '
 	(
 		cd downstream &&
 		git fetch --recurse-submodules
@@ -424,7 +424,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config
 	test_cmp expect.err.2 actual.err
 '

-test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" '
+test_expect_success C_LOCALE_OUTPUT "'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" '
 	(
 		cd downstream &&
 		git fetch --recurse-submodules
@@ -452,7 +452,7 @@ test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' override
 	test_cmp expect.err.2 actual.err
 '

-test_expect_success "don't fetch submodule when newly recorded commits are already present" '
+test_expect_success C_LOCALE_OUTPUT "don't fetch submodule when newly recorded commits are already present" '
 	(
 		cd submodule &&
 		git checkout -q HEAD^^

Re: What's cooking in git.git (Apr 2011, #02; Wed, 6)

[Ævar Arnfjörð Bjarmason]

On Mon, Apr 11, 2011 at 00:55, Jens Lehmann <Jens.Lehmann@web.de> wrote:
> Am 10.04.2011 20:52, schrieb Ævar Arnfjörð Bjarmason:
>> On Wed, Apr 6, 2011 at 22:04, Junio C Hamano <gitster@pobox.com> wrote:
>>
>>> * jl/submodule-fetch-on-demand (2011-03-06) 7 commits
>>>  (merged to 'next' on 2011-03-20 at a5e452d)
>>>  + fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
>>>  + submodule update: Don't fetch when the submodule commit is already present
>>>  + fetch/pull: Don't recurse into a submodule when commits are already present
>>>  + Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
>>>  + config: teach the fetch.recurseSubmodules option the 'on-demand' value
>>>  + fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
>>>  + fetch/pull: recurse into submodules when necessary
>>
>> This series needs to be fixed to not fail tests with GETTEXT_POISON=YesPlease.
>
> Maybe something like this? Junio, do you want me to squash the changes in
> the patch series and resend it or should I send a new commit?

Sorry about the short mail yesterday, I had to take care of something.

Anyway, that looks like it'll work, but the preferred way of doing it
is like it's done at the bottom of t3700-add.sh. I.e.:

test_expect_success 'git add --dry-run --ignore-missing of
non-existing file' '
    test_must_fail git add --dry-run --ignore-missing track-this
ignored-file >actual.out 2>actual.err
'

test_expect_success C_LOCALE_OUTPUT 'git add --dry-run
--ignore-missing of non-existing file output' '
    test_cmp expect.out actual.out &&
    test_cmp expect.err actual.err
'

That is, split up each test into a test that tests the functionality
(i.e. exit codes) and one that tests the output.

That way we make sure that only things dependent on C locale output
are skipped under non-C locales.

Sometimes that's hard, in which case it's fine to just skip the entire thing.

Re: What's cooking in git.git (Apr 2011, #02; Wed, 6)

[Jens Lehmann]

Am 11.04.2011 11:00, schrieb Ævar Arnfjörð Bjarmason:
> On Mon, Apr 11, 2011 at 00:55, Jens Lehmann <Jens.Lehmann@web.de> wrote:
>> Am 10.04.2011 20:52, schrieb Ævar Arnfjörð Bjarmason:
>>> On Wed, Apr 6, 2011 at 22:04, Junio C Hamano <gitster@pobox.com> wrote:
>>>
>>>> * jl/submodule-fetch-on-demand (2011-03-06) 7 commits
>>>>  (merged to 'next' on 2011-03-20 at a5e452d)
>>>>  + fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
>>>>  + submodule update: Don't fetch when the submodule commit is already present
>>>>  + fetch/pull: Don't recurse into a submodule when commits are already present
>>>>  + Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
>>>>  + config: teach the fetch.recurseSubmodules option the 'on-demand' value
>>>>  + fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
>>>>  + fetch/pull: recurse into submodules when necessary
>>>
>>> This series needs to be fixed to not fail tests with GETTEXT_POISON=YesPlease.
>>
>> Maybe something like this? Junio, do you want me to squash the changes in
>> the patch series and resend it or should I send a new commit?

Ok, as that series already hit master I'll hack up a new commit.

> Sorry about the short mail yesterday, I had to take care of something.

Same here :-)

> Anyway, that looks like it'll work, but the preferred way of doing it
> is like it's done at the bottom of t3700-add.sh. I.e.:
> 
> test_expect_success 'git add --dry-run --ignore-missing of
> non-existing file' '
>     test_must_fail git add --dry-run --ignore-missing track-this
> ignored-file >actual.out 2>actual.err
> '
> 
> test_expect_success C_LOCALE_OUTPUT 'git add --dry-run
> --ignore-missing of non-existing file output' '
>     test_cmp expect.out actual.out &&
>     test_cmp expect.err actual.err
> '
> 
> That is, split up each test into a test that tests the functionality
> (i.e. exit codes) and one that tests the output.
> 
> That way we make sure that only things dependent on C locale output
> are skipped under non-C locales.

Thanks for explaining, that makes sense. Jonathan mentioned some time ago
that t5526 would benefit from testing the functionality rather than the
output like it does now, so rewriting that test is on my maintenance list
anyway. I'll have to find a locale independent way to check if the
submodule paths are printed correctly, but I'll see if I can chop off the
language specific parts of the output before doing the compare.

> Sometimes that's hard, in which case it's fine to just skip the entire thing.

That shouldn't be necessary for t5526, I'll tackle that when I find some
time. The question is: Do we need a commit now adding the prerequisite as
a band aid fix to restore the ability to successfully run the test suite
with GETTEXT_POISON=YesPlease, or do we have some time so I can rewrite
t5526 properly to not depend on the language anymore?

Re: What's cooking in git.git (Apr 2011, #02; Wed, 6)

[Ævar Arnfjörð Bjarmason]

On Mon, Apr 11, 2011 at 19:55, Jens Lehmann <Jens.Lehmann@web.de> wrote:
> That shouldn't be necessary for t5526, I'll tackle that when I find some
> time. The question is: Do we need a commit now adding the prerequisite as
> a band aid fix to restore the ability to successfully run the test suite
> with GETTEXT_POISON=YesPlease, or do we have some time so I can rewrite
> t5526 properly to not depend on the language anymore?

There's no urgency. I'm the only one that runs that testing mode.

It's just something that needs to be fixed at some point, either by you or me.

So put it low on your TODO list, if at all :)