What's cooking in git.git (Nov 2013, #01; Fri, 1)

What's cooking in git.git (Nov 2013, #01; Fri, 1)

[Junio C Hamano]

Here are the topics that have been cooking.  Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.

An early preview 1.8.5-rc0 has been tagged. There still are handful
of fixes and enhancements left in 'next' that I'd like to see in the
final, which will hopefully be in when the first release candidate
is tagged.

As promised/requested, the final steps for 2.0 are in 'next'; they,
together with a handful topics that have been merged to 'next'
fairly recently, will _not_ be part of the upcoming 1.8.5 release,
but will be carried over in 'next' to the next cycle.

You can find the changes described here in the integration branches
of the repositories listed at

    http://git-blame.blogspot.com/p/git-public-repositories.html

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

* ap/remote-hg-unquote-cquote (2013-10-23) 1 commit
  (merged to 'next' on 2013-10-28 at 6b99fd5)
 + remote-hg: unquote C-style paths when exporting

 A fast-import stream expresses a pathname with funny characters by
 quoting them in C style; remote-hg remote helper forgot to unquote
 such a path.


* jk/for-each-ref-skip-parsing (2013-10-30) 1 commit
  (merged to 'next' on 2013-10-30 at 56ea310)
 + for-each-ref: avoid loading objects to print %(objectname)


* jk/pack-corruption-post-mortem (2013-10-25) 1 commit
  (merged to 'next' on 2013-10-30 at 2248df6)
 + howto: add article on recovering a corrupted object


* jk/reset-p-current-head-fix (2013-10-25) 2 commits
  (merged to 'next' on 2013-10-30 at 37ae6e0)
 + reset: pass real rev name to add--interactive
 + add-interactive: handle unborn branch in patch mode

 "git reset -p HEAD" has codepath to special case it from resetting
 to contents of other commits, but recent change broke it.


* jl/submodule-mv (2013-10-13) 1 commit
  (merged to 'next' on 2013-10-28 at 8dc9b31)
 + mv: Fix spurious warning when moving a file in presence of submodules

 Moving a regular file in a repository with a .gitmodules file was
 producing a warning 'Could not find section in .gitmodules where
 path=<filename>'.


* js/test-help-format-windows-port-fix (2013-10-30) 1 commit
  (merged to 'next' on 2013-10-30 at b98e991)
 + t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html


* js/tests-windows-port-fix (2013-10-28) 3 commits
  (merged to 'next' on 2013-10-30 at 61f8e24)
 + tests: undo special treatment of CRLF for Windows
 + Windows: a test_cmp that is agnostic to random LF <> CRLF conversions
 + t5300-pack-object: do not compare binary data using test_cmp


* rs/web-browse-xdg-open (2013-10-30) 1 commit
  (merged to 'next' on 2013-10-30 at 37d6eb4)
 + web--browse: Add support for xdg-open


* sb/refs-code-cleanup (2013-10-28) 2 commits
  (merged to 'next' on 2013-10-30 at a9bf06a)
 + cache: remove unused function 'have_git_dir'
 + refs: remove unused function invalidate_ref_cache

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

* fc/trivial (2013-10-31) 13 commits
 - setup: trivial style fixes
 - run-command: trivial style fixes
 - diff: trivial style fix
 - revision: trivial style fixes
 - pretty: trivial style fix
 - describe: trivial style fixes
 - transport-helper: trivial style fix
 - sha1-name: trivial style cleanup
 - branch: trivial style fix
 - revision: add missing include
 - doc/pull: clarify the illustrations
 - t: replace pulls with merges
 - merge: simplify ff-only option

 A random collection of style fixes and minor doc updates.

 Will merge to 'next'.


* jk/duplicate-objects-in-packs (2013-10-31) 1 commit
  (merged to 'next' on 2013-11-01 at 8951339)
 + Fix '\%o' for printf from coreutils

 Test fixup to a topic recently graduated.

 Will merge to 'master'.


* rr/for-each-ref-decoration (2013-10-31) 4 commits
 - fixup! for-each-ref: introduce %(upstream:track[short])
 - for-each-ref: introduce %(upstream:track[short])
 - for-each-ref: introduce %(HEAD) asterisk marker
 - for-each-ref: introduce %C(...) for color


* vd/doc-unpack-objects (2013-11-01) 2 commits
  (merged to 'next' on 2013-11-01 at 443d0f4)
 + Documentation: "pack-file" is not literal in unpack-objects
 + Documentation: restore a space in unpack-objects usage

 Will merge to 'master'.


* jk/two-way-merge-corner-case-fix (2013-11-01) 3 commits
 - t1005: add test for "read-tree --reset -u A B"
 - t1005: reindent
 - unpack-trees: fix "read-tree -u --reset A B" with conflicted index

 Fix a rather longstanding corner-case bug in twoway "reset to
 there" merge, which is most often seen in "git am --abort".

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

* np/pack-v4 (2013-09-18) 90 commits
 . packv4-parse.c: add tree offset caching
 . t1050: replace one instance of show-index with verify-pack
 . index-pack, pack-objects: allow creating .idx v2 with .pack v4
 . unpack-objects: decode v4 trees
 . unpack-objects: allow to save processed bytes to a buffer
 - ...

 Nico and Duy advancing the eternal vaporware pack-v4.  This is here
 primarily for wider distribution of the preview edition.

 Temporarily ejected from 'pu', to try out jk/pack-bitmap, which
 this topic conflicts with.


* mf/graph-show-root (2013-10-25) 1 commit
 . graph.c: mark root commit differently

 In a repository with multiple-roots, "log --graph", especially with
 "--oneline", does not give the reader enough visual cue to see
 where one line of history ended and a separate history began.

 This is the version that marks the roots 'x' when they would have
 been marked as '*'; Keshav Kini suggested an alternative of giving
 an extra blank line after every root, which I tend to think is a
 better approach to the problem.


* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
 - perf-lib: add test_perf_cleanup target
 - perf-lib: split starting the test from the execution

 Add test_perf_cleanup shell function to the perf suite, that allows
 the script writers to define a test with a clean-up action.

 Holding until needed.


* yt/shortened-rename (2013-10-18) 2 commits
 - SQUASH??? style fixes and s/omit/shorten/ where appropriate
 - diff.c: keep arrow(=>) on show_stats()'s shortened filename part to make rename visible

 Attempts to give more weight on the fact that a filepair represents
 a rename than showing substring of the actual path when diffstat
 lines are not wide enough.

 I am not sure if that is solving a right problem, though.


* rv/send-email-cache-generated-mid (2013-08-21) 2 commits
 - git-send-email: Cache generated message-ids, use them when prompting
 - git-send-email: add optional 'choices' parameter to the ask sub


* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
 - ### DONTMERGE: needs better explanation on what config they need
 - pack-refs.c: Add missing call to git_config()
 - show-ref.c: Add missing call to git_config()

 The changes themselves are probably good, but it is unclear what
 basic setting needs to be read for which exact operation.

 Waiting for clarification.
 $gmane/228294


* jc/format-patch (2013-04-22) 2 commits
 - format-patch: --inline-single
 - format-patch: rename "no_inline" field

 A new option to send a single patch to the standard output to be
 appended at the bottom of a message.  I personally have no need for
 this, but it was easy enough to cobble together.  Tests, docs and
 stripping out more MIMEy stuff are left as exercises to interested
 parties.


* jk/gitweb-utf8 (2013-04-08) 4 commits
 - gitweb: Fix broken blob action parameters on blob/commitdiff pages
 - gitweb: Don't append ';js=(0|1)' to external links
 - gitweb: Make feed title valid utf8
 - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch

 Various fixes to gitweb.

 Drew Northup volunteered to take a look into this.
 $gmane/226216


* jc/show-branch (2013-06-07) 5 commits
 - show-branch: use commit slab to represent bitflags of arbitrary width
 - show-branch.c: remove "all_mask"
 - show-branch.c: abstract out "flags" operation
 - show-branch.c: lift all_mask/all_revs to a global static
 - show-branch.c: update comment style

 Waiting for the final step to lift the hard-limit before sending it out.

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

* jc/ref-excludes (2013-11-01) 5 commits
 - rev-parse: introduce --exclude=<glob> to tame wildcards
 - rev-list --exclude: export add/clear-ref-exclusion and ref-excluded API
 - rev-list --exclude: tests
 - document --exclude option
 - revision: introduce --exclude=<glob> to tame wildcards

 People often wished a way to tell "git log --branches" (and "git
 log --remotes --not --branches") to exclude some local branches
 from the expansion of "--branches" (similarly for "--tags", "--all"
 and "--glob=<pattern>").  Now they have one.


* jn/test-prereq-perl-doc (2013-10-28) 1 commit
  (merged to 'next' on 2013-11-01 at 4d4a8b4)
 + t/README: tests can use perl even with NO_PERL

 Will merge to 'master'.


* ak/cvsserver-stabilize-use-of-hash-keys (2013-10-30) 1 commit
  (merged to 'next' on 2013-11-01 at cc3b890)
 + cvsserver: Determinize output to combat Perl 5.18 hash randomization

 Will merge to 'master'.


* jk/replace-perl-in-built-scripts (2013-10-29) 1 commit
  (merged to 'next' on 2013-11-01 at 2384e29)
 + use @@PERL@@ in built scripts

 Will cook in 'next'.


* jk/subtree-install-fix (2013-10-30) 1 commit
  (merged to 'next' on 2013-11-01 at 531bd79)
 + subtree: add makefile target for html docs

 Will merge to 'master'.


* jk/wrap-perl-used-in-tests (2013-10-29) 2 commits
  (merged to 'next' on 2013-11-01 at 73444c5)
 + t: use perl instead of "$PERL_PATH" where applicable
 + t: provide a perl() function which uses $PERL_PATH

 Will merge to 'master'.


* jt/commit-fixes-footer (2013-10-30) 1 commit
 - commit: Add -f, --fixes <commit> option to add Fixes: line

 There is an ongoing discussion around this topic; in general I am
 fairly negative on a new feature that is too narrow and prefer a
 more generic solution that can be tailored for specific needs, as
 many people stated in the thread.


* sc/doc-howto-dumb-http (2013-10-28) 1 commit
  (merged to 'next' on 2013-11-01 at a734b6e)
 + doc/howto: warn about (dumb)http server document being too old

 Will merge to 'master'.


* bw/solaris-sed-tr-test-portability (2013-10-30) 2 commits
  (merged to 'next' on 2013-11-01 at f04be9a)
 + Avoid difference in tr semantics between System V and BSD
 + Change sed i\ usage to something Solaris' sed can handle

 Will merge to 'master'.


* fc/transport-helper-fixes (2013-11-01) 11 commits
 - transport-helper: demote lack of "force" option to a warning
 - transport-helper: add support to delete branches
 - fast-export: add support to delete refs
 - fast-import: add support to delete refs
 - transport-helper: add support for old:new refspec
 - fast-export: add new --refspec option
 - fast-export: improve argument parsing
 - transport-helper: check for 'forced update' message
 - transport-helper: add 'force' to 'export' helpers
 - transport-helper: don't update refs in dry-run
 - transport-helper: mismerge fix

 Updates transport-helper, fast-import and fast-export to allow the
 ref mapping and ref deletion in a way similar to the natively
 supported transports.

 Will merge to 'next'.


* jh/loose-object-dirs-creation-race (2013-10-28) 1 commit
  (merged to 'next' on 2013-11-01 at 3169b0f)
 + sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs

 Will cook in 'next'.


* nd/liteal-pathspecs (2013-10-28) 1 commit
  (merged to 'next' on 2013-11-01 at 1a91775)
 + pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses

 Will cook in 'next'.


* th/reflog-annotated-tag (2013-10-28) 1 commit
  (merged to 'next' on 2013-11-01 at 8b154cc)
 + reflog: handle lightweight and annotated tags equally

 "git log -g $annotated_tag", when there is no reflog history, should
 have produced a single output entry (i.e. the ref creation event),
 but instead showed the history leading to the tag.

 Will merge to 'master'.


* tr/merge-recursive-index-only (2013-10-28) 3 commits
 - merge-recursive: -Xindex-only to leave worktree unchanged
 - merge-recursive: internal flag to avoid touching the worktree
 - merge-recursive: remove dead conditional in update_stages()


* bc/http-100-continue (2013-10-31) 3 commits
  (merged to 'next' on 2013-11-01 at e12ae23)
 + remote-curl: fix large pushes with GSSAPI
 + remote-curl: pass curl slot_results back through run_slot
 + http: return curl's AUTHAVAIL via slot_results

 Issue "100 Continue" responses to help use of GSS-Negotiate
 authentication scheme over HTTP transport when needed.

 Will cook in 'next'.


* jc/merge-base-reflog (2013-10-29) 2 commits
  (merged to 'next' on 2013-11-01 at 6114764)
 + merge-base: teach "--fork-point" mode
 + merge-base: use OPT_CMDMODE and clarify the command line parsing

 Code the logic in "pull --rebase" that figures out a fork point
 from reflog entries in C.

 Will cook in 'next'.


* jk/pack-bitmap (2013-10-30) 20 commits
 - count-objects: recognize .bitmap in garbage-checking
 - pack-bitmap: implement optional name_hash cache
 - t: add basic bitmap functionality tests
 - repack: consider bitmaps when performing repacks
 - repack: handle optional files created by pack-objects
 - repack: turn exts array into array-of-struct
 - repack: stop using magic number for ARRAY_SIZE(exts)
 - pack-objects: implement bitmap writing
 - rev-list: add bitmap mode to speed up object lists
 - pack-objects: use bitmaps when packing objects
 - pack-bitmap: add support for bitmap indexes
 - documentation: add documentation for the bitmap format
 - ewah: compressed bitmap implementation
 - compat: add endianness helpers
 - sha1_file: export `git_open_noatime`
 - revision: allow setting custom limiter function
 - pack-objects: factor out name_hash
 - pack-objects: refactor the packing list
 - revindex: export new APIs
 - sha1write: make buffer const-correct

 Borrows the bitmap index into packfiles from JGit to speed up
 enumeration of objects involved in a commit range without having to
 fully traverse the history.

 Still under discussion.


* jk/robustify-parse-commit (2013-10-24) 6 commits
  (merged to 'next' on 2013-11-01 at 2bfbaab)
 + checkout: do not die when leaving broken detached HEAD
 + use parse_commit_or_die instead of custom message
 + use parse_commit_or_die instead of segfaulting
 + assume parse_commit checks for NULL commit
 + assume parse_commit checks commit->object.parsed
 + log_tree_diff: die when we fail to parse a commit

 Will cook in 'next'.


* mh/fetch-tags-in-addition-to-normal-refs (2013-10-30) 23 commits
 - fetch: improve the error messages emitted for conflicting refspecs
 - handle_duplicate(): mark error message for translation
 - ref_remote_duplicates(): extract a function handle_duplicate()
 - ref_remove_duplicates(): simplify loop logic
 - t5536: new test of refspec conflicts when fetching
 - ref_remove_duplicates(): avoid redundant bisection
 - git-fetch.txt: improve description of tag auto-following
 - fetch-options.txt: simplify ifdef/ifndef/endif usage
 - fetch, remote: properly convey --no-prune options to subprocesses
 - builtin/remote.c:update(): use struct argv_array
 - builtin/remote.c: reorder function definitions
 - query_refspecs(): move some constants out of the loop
 - fetch --prune: prune only based on explicit refspecs
 - fetch --tags: fetch tags *in addition to* other stuff
 - fetch: only opportunistically update references based on command line
 - get_expanded_map(): avoid memory leak
 - get_expanded_map(): add docstring
 - builtin/fetch.c: reorder function definitions
 - get_ref_map(): rename local variables
 - api-remote.txt: correct section "struct refspec"
 - t5510: check that "git fetch --prune --tags" does not prune branches
 - t5510: prepare test refs more straightforwardly
 - t5510: use the correct tag name in test

 Will merge to 'next' after taking another look.


* nv/parseopt-opt-arg (2013-10-31) 2 commits
  (merged to 'next' on 2013-11-01 at cd2afd9)
 + rev-parse --parseopt: add the --stuck-long mode
 + Use the word 'stuck' instead of 'sticked'

 Enhance "rev-parse --parseopt" mode to help parsing options with
 an optional parameter.

 Will cook in 'next'.


* ak/submodule-foreach-quoting (2013-09-27) 1 commit
  (merged to 'next' on 2013-10-14 at d77c5f1)
 + submodule foreach: skip eval for more than one argument

 A behavior change, but a worthwhile one: "git submodule foreach"
 was treating its arguments as part of a single command to be
 concatenated and passed to a shell, making writing buggy
 scripts too easy.

 This patch preserves the old "just pass it to the shell" behavior
 when a single argument is passed to 'git submodule foreach' and
 moves to a new "skip the shell and use the arguments passed
 unmolested" behavior when more than one argument is passed.

 The old behavior (always concatenating and passing to the shell)
 was similar to the 'ssh' command, while the new behavior (switching
 on the number of arguments) is what 'xterm -e' does.

 May need more thought to make sure this change is advertised well
 so that scripts that used multiple arguments but added their own
 extra layer of quoting are not broken.

 Will cook in 'next' for the rest of this cycle.


* kb/fast-hashmap (2013-10-22) 12 commits
 - remove old hash.[ch] implementation
 - read-cache.c: fix memory leaks caused by removed cache entries
 - name-hash.c: remove cache entries instead of marking them CE_UNHASHED
 - name-hash.c: use new hash map implementation for cache entries
 - name-hash.c: remove unreferenced directory entries
 - name-hash.c: use new hash map implementation for directories
 - diffcore-rename.c: use new hash map implementation
 - diffcore-rename.c: simplify finding exact renames
 - diffcore-rename.c: move code around to prepare for the next patch
 - buitin/describe.c: use new hash map implementation
 - add a hashtable implementation that supports O(1) removal
 - submodule: don't access the .gitmodules cache entry after removing it

 Improvements to our hash table to get it to meet the needs of the
 msysgit fscache project, with some nice performance improvements.

 The preparatory clean-up to submodule from Jens is at the bottom. I
 also squashed in a fix-up by Karsten found at $gmane/236468 (please
 double-check the result).

 More valgrind breakage reported ($gmane/236869).


* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit
  (merged to 'next' on 2013-10-28 at d8cdf30)
 + git add: -u/-A now affects the entire working tree

 Will cook in 'next' until Git 2.0.


* jc/core-checkstat-2.0 (2013-05-06) 1 commit
  (merged to 'next' on 2013-10-28 at f1bec96)
 + core.statinfo: remove as promised in Git 2.0

 Will cook in 'next' until Git 2.0.


* jc/push-2.0-default-to-simple (2013-06-18) 1 commit
  (merged to 'next' on 2013-10-28 at 3153a9e)
 + push: switch default from "matching" to "simple"

 Will cook in 'next' until Git 2.0.


* jc/add-2.0-ignore-removal (2013-04-22) 1 commit
  (merged to 'next' on 2013-10-28 at 5fd76ec)
 + git add <pathspec>... defaults to "-A"

 Updated endgame for "git add <pathspec>" that defaults to "--all"
 aka "--no-ignore-removal".

 Will cook in 'next' until Git 2.0.


* jc/hold-diff-remove-q-synonym-for-no-deletion (2013-07-19) 1 commit
  (merged to 'next' on 2013-11-01 at 5fc26e4)
 + diff: remove "diff-files -q" in a version of Git in a distant future

 Will cook in 'next' until a distant future.

Re: What's cooking in git.git (Nov 2013, #01; Fri, 1)

[Thomas Rast]

Junio C Hamano <gitster@pobox.com> writes:

> * tr/merge-recursive-index-only (2013-10-28) 3 commits
>  - merge-recursive: -Xindex-only to leave worktree unchanged
>  - merge-recursive: internal flag to avoid touching the worktree
>  - merge-recursive: remove dead conditional in update_stages()

FWIW -- since you dropped the earlier note to the same effect -- I still
consider this "hold until Michael finds a use for it".

-- 
Thomas Rast
tr@thomasrast.ch

Re: What's cooking in git.git (Nov 2013, #01; Fri, 1)

[Ramsay Jones]

On 01/11/13 22:52, Junio C Hamano wrote:
> Here are the topics that have been cooking.  Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'.
>
[ ... ]
> 
> 
> * fc/transport-helper-fixes (2013-11-01) 11 commits
>  - transport-helper: demote lack of "force" option to a warning
>  - transport-helper: add support to delete branches
>  - fast-export: add support to delete refs
>  - fast-import: add support to delete refs
>  - transport-helper: add support for old:new refspec
>  - fast-export: add new --refspec option
>  - fast-export: improve argument parsing
>  - transport-helper: check for 'forced update' message
>  - transport-helper: add 'force' to 'export' helpers
>  - transport-helper: don't update refs in dry-run
>  - transport-helper: mismerge fix
> 
>  Updates transport-helper, fast-import and fast-export to allow the
>  ref mapping and ref deletion in a way similar to the natively
>  supported transports.
> 
>  Will merge to 'next'.

Commit ad24a30ef ("fast-export: add new --refspec option", 31-10-2013)
causes sparse to complain:

      SP builtin/fast-export.c
  builtin/fast-export.c:739:55: warning: Variable length array is used.

Do we want to use this C99 feature?

ATB,
Ramsay Jones

Re: What's cooking in git.git (Nov 2013, #01; Fri, 1)

[Torstein Hegge]

On Fri, Nov 01, 2013 at 15:52:06 -0700, Junio C Hamano wrote:
> * th/reflog-annotated-tag (2013-10-28) 1 commit
>   (merged to 'next' on 2013-11-01 at 8b154cc)
>  + reflog: handle lightweight and annotated tags equally
> 
>  "git log -g $annotated_tag", when there is no reflog history, should
>  have produced a single output entry (i.e. the ref creation event),
>  but instead showed the history leading to the tag.

This isn't really what th/reflog-annotated-tag does, 
"git log -g $annotated_tag" now produces no output.

Is the proper behavior to output the ref creation event? In that case,
should the same happen for lightweight tags?

Or am I missing something related to "when there is no reflog history"?


Torstein

Re: What's cooking in git.git (Nov 2013, #01; Fri, 1)

[Junio C Hamano]

Ramsay Jones <ramsay@ramsay1.demon.co.uk> writes:

> On 01/11/13 22:52, Junio C Hamano wrote:
>> Here are the topics that have been cooking.  Commits prefixed with
>> '-' are only in 'pu' (proposed updates) while commits prefixed with
>> '+' are in 'next'.
>>
> [ ... ]
>> 
>> 
>> * fc/transport-helper-fixes (2013-11-01) 11 commits
>>  - transport-helper: demote lack of "force" option to a warning
>>  - transport-helper: add support to delete branches
>>  - fast-export: add support to delete refs
>>  - fast-import: add support to delete refs
>>  - transport-helper: add support for old:new refspec
>>  - fast-export: add new --refspec option
>>  - fast-export: improve argument parsing
>>  - transport-helper: check for 'forced update' message
>>  - transport-helper: add 'force' to 'export' helpers
>>  - transport-helper: don't update refs in dry-run
>>  - transport-helper: mismerge fix
>> 
>>  Updates transport-helper, fast-import and fast-export to allow the
>>  ref mapping and ref deletion in a way similar to the natively
>>  supported transports.
>> 
>>  Will merge to 'next'.
>
> Commit ad24a30ef ("fast-export: add new --refspec option", 31-10-2013)
> causes sparse to complain:
>
>       SP builtin/fast-export.c
>   builtin/fast-export.c:739:55: warning: Variable length array is used.
>
> Do we want to use this C99 feature?

Good eyes, and no---this needs to be fixed before going forward.

Thanks for spotting.

Re: What's cooking in git.git (Nov 2013, #01; Fri, 1)

[Junio C Hamano]

Torstein Hegge <hegge@resisty.net> writes:

> On Fri, Nov 01, 2013 at 15:52:06 -0700, Junio C Hamano wrote:
>> * th/reflog-annotated-tag (2013-10-28) 1 commit
>>   (merged to 'next' on 2013-11-01 at 8b154cc)
>>  + reflog: handle lightweight and annotated tags equally
>> 
>>  "git log -g $annotated_tag", when there is no reflog history, should
>>  have produced a single output entry (i.e. the ref creation event),
>>  but instead showed the history leading to the tag.
>
> This isn't really what th/reflog-annotated-tag does, 
> "git log -g $annotated_tag" now produces no output.
>
> Is the proper behavior to output the ref creation event? In that case,
> should the same happen for lightweight tags?
>
> Or am I missing something related to "when there is no reflog history"?

I actually meant, by "no reflog history", "created once and then
never updated".

But I think we first need to see if you are testing the right thing.

In a freshly created empty directory, do this:

    $ git init
    $ git commit --allow-empty -m initial
    $ git tag test master
    $ git tag -a -m 'anno' anno master
    $ find .git/logs/ -ls

For me, this does not give me any log for tags (as expected,
actually).  To have reflgos for these two tags, we need to do this
instead (you can do these, continuing from the above):

    $ git tag -d test anno
    $ mkdir .git/logs/refs/tags
    $ >.git/logs/refs/tags/test
    $ git tag test master
    $ >.git/logs/refs/tags/anno
    $ git tag -a -m 'anno' anno master
    $ find .git/logs/ -ls
    $ grep . .git/logs/refs/tags/* .git/logs/refs/heads/*

The last one shows that we now have one reflog entry each for our
lightweight and annotated tags, and the master branch also has one
reflog entry.  Now we can really try things out.

    $ git log -g master
    $ git log -g test
    $ git log -g anno

The first two should obviously show the same, but now I think about
it, I am not sure what the last one should produce.  If we further
did this:

    $ git tag -f -a -m 'annotree' anno master^{tree}

what should "git log -g" show?

After all, "log -g" (and hence "reflog") takes over the usual
history walking machinery and overrides it with a hack that assumes
that any objects it would see in the reflog entries are commits (at
least, it assumes they can be formatted with the usual codepath to
pretty-print commits).  There is no way for the current code (with
the patch under discussion, that lifts "we deal only with commits")
to magically work with a tag that points at a tree or a blob, like
this last example.

I am afraid that merging that single-liner patch was a mistake. To
fix the funkiness of showing "log -g" on tags, we need a lot more
than that.

Will kick the topic back to 'pu' (or at least, during this feature
freeze period, will backburner it and not let it graduate out of
'next').

Thanks.


    

Re: What's cooking in git.git (Nov 2013, #01; Fri, 1)

[Junio C Hamano]

Thomas Rast <tr@thomasrast.ch> writes:

> Junio C Hamano <gitster@pobox.com> writes:
>
>> * tr/merge-recursive-index-only (2013-10-28) 3 commits
>>  - merge-recursive: -Xindex-only to leave worktree unchanged
>>  - merge-recursive: internal flag to avoid touching the worktree
>>  - merge-recursive: remove dead conditional in update_stages()
>
> FWIW -- since you dropped the earlier note to the same effect -- I still
> consider this "hold until Michael finds a use for it".

Noted; thanks.

Re: What's cooking in git.git (Nov 2013, #01; Fri, 1)

[Junio C Hamano]

Junio C Hamano <gitster@pobox.com> writes:

>> Commit ad24a30ef ("fast-export: add new --refspec option", 31-10-2013)
>> causes sparse to complain:
>>
>>       SP builtin/fast-export.c
>>   builtin/fast-export.c:739:55: warning: Variable length array is used.
>>
>> Do we want to use this C99 feature?
>
> Good eyes, and no---this needs to be fixed before going forward.
>
> Thanks for spotting.

I'm tempted to squash this in to the problematic commit, if nobody
comes up with a better fix soonish, before merging the series to
'next'.

 builtin/fast-export.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 8ed41b4..7d02f63 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -736,9 +736,10 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 		usage_with_options (fast_export_usage, options);
 
 	if (refspecs_list.nr) {
-		const char *refspecs_str[refspecs_list.nr];
+		const char **refspecs_str;
 		int i;
 
+		refspecs_str = xmalloc(sizeof(const char *) * refspecs_list.nr);
 		for (i = 0; i < refspecs_list.nr; i++)
 			refspecs_str[i] = refspecs_list.items[i].string;
 
@@ -746,6 +747,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 		refspecs = parse_fetch_refspec(refspecs_nr, refspecs_str);
 
 		string_list_clear(&refspecs_list, 1);
+		free(refspecs_str);
 	}
 
 	if (use_done_feature)

Re: What's cooking in git.git (Nov 2013, #01; Fri, 1)

[Michael Haggerty]

On 11/02/2013 12:09 AM, Thomas Rast wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> * tr/merge-recursive-index-only (2013-10-28) 3 commits
>>   - merge-recursive: -Xindex-only to leave worktree unchanged
>>   - merge-recursive: internal flag to avoid touching the worktree
>>   - merge-recursive: remove dead conditional in update_stages()
>
> FWIW -- since you dropped the earlier note to the same effect -- I still
> consider this "hold until Michael finds a use for it".

Thomas,

Sorry, I didn't realize that you are waiting on me.  I've been very busy 
lately and just got back from a trip to San Francisco.  The chaos is 
scheduled to continue for at least another week.

The biggest win from being able to run test merges without touching the 
tree would be to move a lot of the time-consuming processing work of 
git-imerge into the background while the user is asked to resolve 
conflicts.  It's kindof awkward, though, because for the user to resolve 
a conflict control has to be passed back to the user.  So the main 
git-imerge process would have to spawn off a worker daemon process that 
would continue working in the background.  But then there has to be some 
kind of communication between the worker thread and the user's 
*subsequent* call to "git imerge continue".

So the bottom line is that it is nontrivial to implement this so I will 
need a bit of concentrated time to dedicate to git-imerge before I will 
be able to give you any feedback.

Michael

-- 
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/