What's cooking in git.git (Apr 2013, #07; Mon, 22)

What's cooking in git.git (Apr 2013, #07; Mon, 22)

[Junio C Hamano]

What's cooking in git.git (Apr 2013, #07; Mon, 22)
--------------------------------------------------

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

Both of the two topics on preparing "git add" users for the
behaviour change in Git 2.0 are in 'master'.  We may want to tweak
the wording of warning messages and such before the feature freeze.

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/strbuf-humanize (2013-04-10) 2 commits
  (merged to 'next' on 2013-04-14 at 66d7af5)
 + count-objects: add -H option to humanize sizes
 + strbuf: create strbuf_humanise_bytes() to show byte sizes

 Teach "--human-readable" aka "-H" option to "git count-objects" to
 show various large numbers in Ki/Mi/GiB scaled as necessary.

 I've decided to let this topic supersede mc/count-objects-kibibytes.
 Human users will get an even easier output with "-H" and by not
 changing the output without an explicit option we do not have to
 break third-party tools that may have been reading from the output
 of this command.


* as/clone-reference-with-gitfile (2013-04-09) 2 commits
  (merged to 'next' on 2013-04-15 at ab0d128)
 + clone: Allow repo using gitfile as a reference
 + clone: Fix error message for reference repository

 "git clone" did not work if a repository pointed at by the
 "--reference" option is a gitfile that points at another place.


* fc/branch-upstream-color (2013-04-15) 1 commit
  (merged to 'next' on 2013-04-15 at 2fc50fd)
 + branch: colour upstream branches

 Add more colors to "git branch -vv" output.


* fc/remote-hg (2013-04-11) 21 commits
  (merged to 'next' on 2013-04-16 at cbeaf41)
 + remote-hg: activate graphlog extension for hg_log()
 + remote-hg: fix bad file paths
 + remote-hg: document location of stored hg repository
 + remote-hg: fix bad state issue
 + remote-hg: add 'insecure' option
 + remote-hg: add simple mail test
 + remote-hg: add basic author tests
 + remote-hg: show more proper errors
 + remote-hg: force remote push
 + remote-hg: push to the appropriate branch
 + remote-hg: update tags globally
 + remote-hg: update remote bookmarks
 + remote-hg: refactor export
 + remote-hg: split bookmark handling
 + remote-hg: redirect buggy mercurial output
 + remote-hg: trivial test cleanups
 + remote-hg: make sure fake bookmarks are updated
 + remote-hg: fix for files with spaces
 + remote-hg: properly report errors on bookmark pushes
 + remote-hg: add missing config variable in doc
 + remote-hg: trivial cleanups

 Updates remote-hg helper (in contrib/).


* jk/a-thread-only-dies-once (2013-04-16) 2 commits
  (merged to 'next' on 2013-04-18 at 3208f44)
 + run-command: use thread-aware die_is_recursing routine
 + usage: allow pluggable die-recursion checks

 A regression fix for the logic to detect die() handler triggering
 itself recursively.


* jk/chopped-ident (2013-04-17) 3 commits
  (merged to 'next' on 2013-04-19 at ecec2d4)
 + blame: handle broken commit headers gracefully
 + pretty: handle broken commit headers gracefully
 + cat-file: print tags raw for "cat-file -p"

 A commit object whose author or committer ident are malformed
 crashed some code that trusted that a name, an email and an
 timestamp can always be found in it.


* jk/doc-http-backend (2013-04-13) 3 commits
  (merged to 'next' on 2013-04-19 at 7932840)
 + doc/http-backend: match query-string in apache half-auth example
 + doc/http-backend: give some lighttpd config examples
 + doc/http-backend: clarify "half-auth" repo configuration

 Improve documentation to illustrate "push authenticated, fetch
 anonymous" configuration for smart HTTP servers.


* jx/i18n-branch-error-messages (2013-04-15) 1 commit
  (merged to 'next' on 2013-04-18 at 630c211)
 + i18n: branch: mark strings for translation


* lf/read-blob-data-from-index (2013-04-17) 3 commits
  (merged to 'next' on 2013-04-17 at 611208f)
 + convert.c: remove duplicate code
 + read_blob_data_from_index(): optionally return the size of blob data
 + attr.c: extract read_index_data() as read_blob_data_from_index()

 Reduce duplicated code between convert.c and attr.c.


* mv/sequencer-pick-error-diag (2013-04-11) 1 commit
  (merged to 'next' on 2013-04-16 at a2da926)
 + cherry-pick: make sure all input objects are commits

 "git cherry-pick $blob $tree" is diagnosed as a nonsense.


* mv/ssl-ftp-curl (2013-04-12) 1 commit
  (merged to 'next' on 2013-04-15 at 7fdada6)
 + Support FTP-over-SSL/TLS for regular FTP

 Does anybody really use commit walkers over ftp???


* nd/checkout-keep-sparse (2013-04-15) 1 commit
  (merged to 'next' on 2013-04-19 at 803dabc)
 + checkout: add --ignore-skip-worktree-bits in sparse checkout mode

 Make the initial "sparse" selection of the paths more sticky across
 "git checkout".


* rt/commentchar-fmt-merge-msg (2013-04-18) 1 commit
  (merged to 'next' on 2013-04-18 at 96799bd)
 + t6200: avoid path mangling issue on Windows

 A test fix for recent update.


* ta/glossary (2013-04-15) 4 commits
  (merged to 'next' on 2013-04-19 at 63ee8a4)
 + glossary: improve definitions of refspec and pathspec
 + The name of the hash function is "SHA-1", not "SHA1"
 + glossary: improve description of SHA-1 related topics
 + glossary: remove outdated/misleading/irrelevant entries


* th/bisect-final-log (2013-04-15) 1 commit
  (merged to 'next' on 2013-04-19 at 89d2041)
 + bisect: Store first bad commit as comment in log file

 Leave a commit to note what the final outcome was in the bisect log
 file.

* tr/copy-revisions-from-stdin (2013-04-16) 1 commit
  (merged to 'next' on 2013-04-16 at d882870)
 + read_revisions_from_stdin: make copies for handle_revision_arg

 A fix to a long-standing issue in the command line parser for
 revisions, which was triggered by mv/sequence-pick-error-diag topic.

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

* jh/checkout-auto-tracking (2013-04-21) 8 commits
  (merged to 'next' on 2013-04-22 at 2356700)
 + glossary: Update and rephrase the definition of a remote-tracking branch
 + branch.c: Validate tracking branches with refspecs instead of refs/remotes/*
 + t9114.2: Don't use --track option against "svn-remote"-tracking branches
 + t7201.24: Add refspec to keep --track working
 + t3200.39: tracking setup should fail if there is no matching refspec.
 + checkout: Use remote refspecs when DWIMming tracking branches
 + t2024: Show failure to use refspec when DWIMming remote branch names
 + t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'

 Updates "git checkout foo" that DWIMs the intended "upstream" and
 turns it into "git checkout -t -b foo remotes/origin/foo" to
 correctly take existing remote definitions into account.  The
 remote "origin" may be what uniquely map its own branch to
 remotes/some/where/foo but that some/where may not be "origin".

 Will cook in 'next'.


* mg/more-textconv (2013-04-19) 6 commits
 - grep: honor --textconv for the case rev:path
 - grep: allow to use textconv filters
 - t7008: demonstrate behavior of grep with textconv
 - cat-file: do not die on --textconv without textconv filters
 - show: honor --textconv for blobs
 - t4030: demonstrate behavior of show with textconv

 Will be rerolled.


* jk/receive-pack-deadlocks-with-early-failure (2013-04-19) 1 commit
  (merged to 'next' on 2013-04-22 at 1e27177)
 + receive-pack: close sideband fd on early pack errors

 When receive-pack detects error in the pack header it received in
 order to decide which of unpack-objects or index-pack to run, it
 returned without closing the error stream, which led to a hang
 sideband thread.

 Will fast-track to 'master'.


* fc/untracked-zsh-prompt (2013-04-21) 1 commit
  (merged to 'next' on 2013-04-22 at 472da3e)
 + prompt: fix untracked files for zsh

 Will fast-track to 'master'.


* jn/glossary-revision (2013-04-21) 1 commit
 - glossary: a revision is just a commit

 The wording for "revision" in the glossary wanted to say it refers
 to "commit (noun) as a concept" but it was badly phrased.

 Will cook in 'next'.

 This may need further updates to hint that in contexts where it is
 clear, the word may refer to an object name, not necessarily a
 commit.


* rr/shortlog-doc (2013-04-22) 8 commits
 - builtin/shortlog.c: make usage string consistent with log
 - builtin/log.c: make usage string consistent with doc
 - git-shortlog.txt: make SYNOPSIS match log, update OPTIONS
 - git-log.txt: rewrite note on why "--" may be required
 - git-log.txt: generalize <since>..<until>
 - git-log.txt: order OPTIONS properly; move <since>..<until>
 - revisions.txt: clarify the .. and ... syntax
 - git-shortlog.txt: remove (-h|--help) from OPTIONS

 Update documentation for "log" and "shortlog".

 Looked reasonable.
 Will merge to 'next'.


* mh/multimail (2013-04-21) 1 commit
 - git-multimail: a replacement for post-receive-email

 Waiting for comments.

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

* 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.

 Not ready for inclusion.


* 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.

 Waiting for a reroll after a review.


* jk/commit-info-slab (2013-04-19) 3 commits
 - commit-slab: introduce a macro to define a slab for new type
 - commit-slab: avoid large realloc
 - commit: allow associating auxiliary info on-demand

 Technology demonstration to show a way we could use unbound number
 of flag bits on commit objects.


* jn/config-ignore-inaccessible (2013-04-15) 1 commit
 - config: allow inaccessible configuration under $HOME

 When $HOME is misconfigured to point at an unreadable directory, we
 used to complain and die. This loosens the check.

 I do not think we agreed that this is a good idea, though.

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

* jc/prune-all (2013-04-18) 3 commits
  (merged to 'next' on 2013-04-22 at b00ccf6)
 + api-parse-options.txt: document "no-" for non-boolean options
 + git-gc.txt, git-reflog.txt: document new expiry options
 + date.c: add parse_expiry_date()

 We used the approxidate() parser for "--expire=<timestamp>" options
 of various commands, but it is better to treat --expire=all and
 --expire=now a bit more specially than using the current timestamp.
 Update "git gc" and "git reflog" with a new parsing function for
 expiry dates.

 Will cook in 'next'.


* nd/pretty-formats (2013-04-18) 13 commits
  (merged to 'next' on 2013-04-22 at 3d63014)
 + pretty: support %>> that steal trailing spaces
 + pretty: support truncating in %>, %< and %><
 + pretty: support padding placeholders, %< %> and %><
 + pretty: add %C(auto) for auto-coloring
 + pretty: split color parsing into a separate function
 + pretty: two phase conversion for non utf-8 commits
 + utf8.c: add reencode_string_len() that can handle NULs in string
 + utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences
 + utf8.c: move display_mode_esc_sequence_len() for use by other functions
 + pretty: share code between format_decoration and show_decorations
 + pretty-formats.txt: wrap long lines
 + pretty: get the correct encoding for --pretty:format=%e
 + pretty: save commit encoding from logmsg_reencode if the caller needs it

 pretty-printing body of the commit that is stored in non UTF-8
 encoding did not work well.  The early part of this series fixes
 it.  And then it adds %C(auto) specifier that turns the coloring on
 when we are emitting to the terminal, and adds column-aligning
 format directives.

 Will merge to 'master'.


* kb/status-ignored-optim-2 (2013-04-15) 14 commits
  (merged to 'next' on 2013-04-21 at d2a5c70)
 + dir.c: git-status --ignored: don't scan the work tree twice
 + dir.c: git-status --ignored: don't scan the work tree three times
 + dir.c: git-status: avoid is_excluded checks for tracked files
 + dir.c: replace is_path_excluded with now equivalent is_excluded API
 + dir.c: unify is_excluded and is_path_excluded APIs
 + dir.c: move prep_exclude
 + dir.c: factor out parts of last_exclude_matching for later reuse
 + dir.c: git-clean -d -X: don't delete tracked directories
 + dir.c: make 'git-status --ignored' work within leading directories
 + dir.c: git-status --ignored: don't list empty directories as ignored
 + dir.c: git-ls-files --directories: don't hide empty directories
 + dir.c: git-status --ignored: don't list empty ignored directories
 + dir.c: git-status --ignored: don't list files in ignored directories
 + dir.c: git-status --ignored: don't drop ignored directories

 Rerolls kb/status-ignored-optim topic (reverted from 'next').
 With help from Karsten, conflicts with as/check-ignore topic have
 been sorted out and it is now in 'pu'.

 Will merge to 'master'.


* as/check-ignore (2013-04-11) 5 commits
  (merged to 'next' on 2013-04-21 at 7515aa8)
 + Documentation: add caveats about I/O buffering for check-{attr,ignore}
 + check-ignore: allow incremental streaming of queries via --stdin
 + check-ignore: move setup into cmd_check_ignore()
 + check-ignore: add -n / --non-matching option
 + t0008: remove duplicated test fixture data

 Enhance "check-ignore" (1.8.2 update) to work more like "check-attr"
 over bidi-pipes.

 Will cook in 'next'.
 The test in the second from the tip needs to be updated.


* mh/packed-refs-various (2013-04-15) 33 commits
 - refs: handle the main ref_cache specially
 - refs: change do_for_each_*() functions to take ref_cache arguments
 - pack_one_ref(): do some cheap tests before a more expensive one
 - pack_one_ref(): use write_packed_entry() to do the writing
 - pack_one_ref(): use function peel_entry()
 - refs: inline function do_not_prune()
 - pack_refs(): change to use do_for_each_entry()
 - refs: use same lock_file object for both ref-packing functions
 - pack_one_ref(): rename "path" parameter to "refname"
 - pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}
 - pack-refs: rename handle_one_ref() to pack_one_ref()
 - refs: extract a function write_packed_entry()
 - repack_without_ref(): write peeled refs in the rewritten file
 - t3211: demonstrate loss of peeled refs if a packed ref is deleted
 - refs: change how packed refs are deleted
 - search_ref_dir(): return an index rather than a pointer
 - repack_without_ref(): silence errors for dangling packed refs
 - t3210: test for spurious error messages for dangling packed refs
 - refs: change the internal reference-iteration API
 - refs: extract a function peel_entry()
 - peel_ref(): fix return value for non-peelable, not-current reference
 - peel_object(): give more specific information in return value
 - refs: extract function peel_object()
 - refs: extract a function ref_resolves_to_object()
 - repack_without_ref(): use function get_packed_ref()
 - peel_ref(): use function get_packed_ref()
 - get_packed_ref(): return a ref_entry
 - do_for_each_ref_in_dirs(): remove dead code
 - refs: define constant PEELED_LINE_LENGTH
 - refs: document how current_ref is used
 - refs: document do_for_each_ref() and do_one_ref()
 - refs: document the fields of struct ref_value
 - refs: document flags constants REF_*

 Updates reading and updating packed-refs file, correcting corner
 case bugs.

 Waiting for comments.


* jk/remote-helper-with-signed-tags (2013-04-15) 3 commits
  (merged to 'next' on 2013-04-21 at 0231d45)
 + transport-helper: add 'signed-tags' capability
 + transport-helper: pass --signed-tags=warn-strip to fast-export
 + fast-export: add --signed-tags=warn-strip mode

 Allows remote-helpers to declare they can handle signed tags, and
 issue a warning when using those that don't.

 Will merge to 'master'.


* jn/gitweb-install-doc (2013-04-17) 2 commits
  (merged to 'next' on 2013-04-22 at a5d4812)
 + gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility
 + gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM

 Reword gitweb configuration instrutions.

 Will merge to 'master'.


* fc/transport-helper-error-reporting (2013-04-17) 9 commits
  (merged to 'next' on 2013-04-22 at 5ba6467)
 + transport-helper: update remote helper namespace
 + transport-helper: trivial code shuffle
 + transport-helper: warn when refspec is not used
 + transport-helper: clarify pushing without refspecs
 + transport-helper: update refspec documentation
 + transport-helper: clarify *:* refspec
 + transport-helper: improve push messages
 + transport-helper: mention helper name when it dies
 + transport-helper: report errors properly

 Update transport helper to report errors and maintain ref hierarchy
 used to keep track of remote helper state better.

 Will merge to 'master'.


* jk/submodule-subdirectory-ok (2013-04-18) 2 commits
  (merged to 'next' on 2013-04-22 at f211e25)
 + submodule: drop the top-level requirement
 + rev-parse: add --prefix option

 Allow various subcommands of "git submodule" to be run not from the
 top of the working tree of the superproject.

 Will cook in 'next'.


* jl/submodule-mv (2013-04-11) 4 commits
  (merged to 'next' on 2013-04-19 at 45ae3c9)
 + rm: delete .gitmodules entry of submodules removed from the work tree
 + Teach mv to update the path entry in .gitmodules for moved submodules
 + Teach mv to move submodules using a gitfile
 + Teach mv to move submodules together with their work trees

 "git mv A B" when moving a submodule A does "the right thing",
 inclusing relocating its working tree and adjusting the paths in
 the .gitmodules file.

 Will cook in 'next'.


* jn/add-2.0-u-A-sans-pathspec (2013-04-03) 1 commit
 - git add: -u/-A now affects the entire working tree

 Will cook in 'next' until Git 2.0.


* nd/magic-pathspecs (2013-03-31) 45 commits
 . Rename field "raw" to "_raw" in struct pathspec
 . pathspec: support :(glob) syntax
 . pathspec: make --literal-pathspecs disable pathspec magic
 . pathspec: support :(literal) syntax for noglob pathspec
 . Kill limit_pathspec_to_literal() as it's only used by parse_pathspec()
 . parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN
 . parse_pathspec: make sure the prefix part is wildcard-free
 . tree-diff: remove the use of pathspec's raw[] in follow-rename codepath
 . Remove match_pathspec() in favor of match_pathspec_depth()
 . Remove init_pathspec() in favor of parse_pathspec()
 . Remove diff_tree_{setup,release}_paths
 . Convert common_prefix() to use struct pathspec
 . Convert add_files_to_cache to take struct pathspec
 . Convert {read,fill}_directory to take struct pathspec
 . Convert refresh_index to take struct pathspec
 . Convert report_path_error to take struct pathspec
 . checkout: convert read_tree_some to take struct pathspec
 . Convert unmerge_cache to take struct pathspec
 . Convert run_add_interactive to use struct pathspec
 . Convert read_cache_preload() to take struct pathspec
 . reset: convert to use parse_pathspec
 . add: convert to use parse_pathspec
 . check-ignore: convert to use parse_pathspec
 . archive: convert to use parse_pathspec
 . ls-files: convert to use parse_pathspec
 . rm: convert to use parse_pathspec
 . checkout: convert to use parse_pathspec
 . rerere: convert to use parse_pathspec
 . status: convert to use parse_pathspec
 . commit: convert to use parse_pathspec
 . clean: convert to use parse_pathspec
 . Guard against new pathspec magic in pathspec matching code
 . parse_pathspec: support prefixing original patterns
 . parse_pathspec: support stripping/checking submodule paths
 . parse_pathspec: support stripping submodule trailing slashes
 . parse_pathspec: a special flag for max_depth feature
 . Convert some get_pathspec() calls to parse_pathspec()
 . parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL}
 . parse_pathspec: save original pathspec for reporting
 . Add parse_pathspec() that converts cmdline args to struct pathspec
 . pathspec: add copy_pathspec
 . pathspec: i18n-ize error strings in pathspec parsing code
 . Move struct pathspec and related functions to pathspec.[ch]
 . clean: remove unused variable "seen"
 . setup.c: check that the pathspec magic ends with ")"

 Migrate the rest of codebase to use "struct pathspec" more.

 Will be rerolled.


* tr/line-log (2013-04-22) 13 commits
  (merged to 'next' on 2013-04-22 at 8f2c1de)
 + git-log(1): remove --full-line-diff description
  (merged to 'next' on 2013-04-21 at cd92620)
 + line-log: fix documentation formatting
  (merged to 'next' on 2013-04-15 at 504559e)
 + log -L: improve comments in process_all_files()
 + log -L: store the path instead of a diff_filespec
 + log -L: test merge of parallel modify/rename
 + t4211: pass -M to 'git log -M -L...' test
  (merged to 'next' on 2013-04-05 at 5afb00c)
 + log -L: fix overlapping input ranges
 + log -L: check range set invariants when we look it up
  (merged to 'next' on 2013-04-01 at 5be920c)
 + Speed up log -L... -M
 + log -L: :pattern:file syntax to find by funcname
 + Implement line-history search (git log -L)
 + Export rewrite_parents() for 'log -L'
 + Refactor parse_loc

 Will cook in 'next'.


* jc/push-2.0-default-to-simple (2013-04-03) 1 commit
 - push: switch default from "matching" to "simple"

 The early bits to adjust the tests have been merged to 'master'.

 Will cook in 'next' until Git 2.0.


* jc/add-2.0-delete-default (2013-04-21) 1 commit
 - git add <pathspec>... defaults to "-A"

 Will cook in 'next' until Git 2.0.

What's cooking in git.git (Apr 2013, #08; Tue, 23)

[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'.

Both of the two topics on preparing "git add" users for the
behaviour change in Git 2.0 are in 'master'.  We may want to tweak
the wording of warning messages and such before the feature freeze
(see jc/add-ignore-removal topic in 'pu' for a proposal).

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"]

* fc/untracked-zsh-prompt (2013-04-21) 1 commit
  (merged to 'next' on 2013-04-22 at 472da3e)
 + prompt: fix untracked files for zsh

 Zsh completion forgot that '%' character used to signal untracked
 files needs to be escaped with another '%'.


* jk/receive-pack-deadlocks-with-early-failure (2013-04-19) 1 commit
  (merged to 'next' on 2013-04-22 at 1e27177)
 + receive-pack: close sideband fd on early pack errors

 When receive-pack detects error in the pack header it received in
 order to decide which of unpack-objects or index-pack to run, it
 returned without closing the error stream, which led to a hang
 sideband thread.


* jn/gitweb-install-doc (2013-04-17) 2 commits
  (merged to 'next' on 2013-04-22 at a5d4812)
 + gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility
 + gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM

 Reword gitweb configuration instrutions.


* kb/status-ignored-optim-2 (2013-04-15) 14 commits
  (merged to 'next' on 2013-04-21 at d2a5c70)
 + dir.c: git-status --ignored: don't scan the work tree twice
 + dir.c: git-status --ignored: don't scan the work tree three times
 + dir.c: git-status: avoid is_excluded checks for tracked files
 + dir.c: replace is_path_excluded with now equivalent is_excluded API
 + dir.c: unify is_excluded and is_path_excluded APIs
 + dir.c: move prep_exclude
 + dir.c: factor out parts of last_exclude_matching for later reuse
 + dir.c: git-clean -d -X: don't delete tracked directories
 + dir.c: make 'git-status --ignored' work within leading directories
 + dir.c: git-status --ignored: don't list empty directories as ignored
 + dir.c: git-ls-files --directories: don't hide empty directories
 + dir.c: git-status --ignored: don't list empty ignored directories
 + dir.c: git-status --ignored: don't list files in ignored directories
 + dir.c: git-status --ignored: don't drop ignored directories

 A handful of issues in the code to traverse working tree to find
 untracked and/or ignored files have been fixed, and the general
 codepath involved in "status -u" and "clean" have been cleaned up
 and optimized.


* nd/pretty-formats (2013-04-18) 13 commits
  (merged to 'next' on 2013-04-22 at 3d63014)
 + pretty: support %>> that steal trailing spaces
 + pretty: support truncating in %>, %< and %><
 + pretty: support padding placeholders, %< %> and %><
 + pretty: add %C(auto) for auto-coloring
 + pretty: split color parsing into a separate function
 + pretty: two phase conversion for non utf-8 commits
 + utf8.c: add reencode_string_len() that can handle NULs in string
 + utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences
 + utf8.c: move display_mode_esc_sequence_len() for use by other functions
 + pretty: share code between format_decoration and show_decorations
 + pretty-formats.txt: wrap long lines
 + pretty: get the correct encoding for --pretty:format=%e
 + pretty: save commit encoding from logmsg_reencode if the caller needs it

 pretty-printing body of the commit that is stored in non UTF-8
 encoding did not work well.  The early part of this series fixes
 it.  And then it adds %C(auto) specifier that turns the coloring on
 when we are emitting to the terminal, and adds column-aligning
 format directives.

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

* jc/add-2.0-ignore-removal (2013-04-22) 1 commit
 - git add <pathspec>... defaults to "-A"
 (this branch uses jc/add-ignore-removal.)

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

 Will cook in 'next' until Git 2.0.


* jc/add-ignore-removal (2013-04-22) 2 commits
 - git add: rephrase -A/--no-all warning
 - git add: --ignore-removal is a better named --no-all
 (this branch is used by jc/add-2.0-ignore-removal.)

 Introduce "--ignore-removal" as a synonym to "--no-all" for "git
 add", and improve the 2.0 migration warning with it.

 Will merge to 'next'.


* fc/remote-hg (2013-04-22) 16 commits
 - remote-hg: strip extra newline
 - remote-hg: use marks instead of inlined files
 - remote-hg: small performance improvement
 - remote-hg: allow refs with spaces
 - remote-hg: don't update bookmarks unnecessarily
 - remote-hg: add support for schemes extension
 - remote-hg: improve email sanitation
 - remote-hg: add custom local tag write code
 - remote-hg: write tags in the appropriate branch
 - remote-hg: custom method to write tags
 - remote-hg: add support for tag objects
 - remote-hg: add branch_tip() helper
 - remote-hg: properly mark branches up-to-date
 - remote-hg: use python urlparse
 - remote-hg: safer bookmark pushing
 - remote-helpers: avoid has_key

 Further updates to remote-hg (in contrib/).

 Will merge to 'next' after a few days.


* th/bisect-skipped-log (2013-04-23) 1 commit
 - bisect: Log possibly bad, skipped commits at bisection end

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

* 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.

 Not ready for inclusion.


* 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.

 Waiting for a reroll after a review.


* jk/commit-info-slab (2013-04-19) 3 commits
 - commit-slab: introduce a macro to define a slab for new type
 - commit-slab: avoid large realloc
 - commit: allow associating auxiliary info on-demand

 Technology demonstration to show a way we could use unbound number
 of flag bits on commit objects.


* jn/config-ignore-inaccessible (2013-04-15) 1 commit
 - config: allow inaccessible configuration under $HOME

 When $HOME is misconfigured to point at an unreadable directory, we
 used to complain and die. This loosens the check.

 I do not think we agreed that this is a good idea, though.

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

* jh/checkout-auto-tracking (2013-04-21) 8 commits
  (merged to 'next' on 2013-04-22 at 2356700)
 + glossary: Update and rephrase the definition of a remote-tracking branch
 + branch.c: Validate tracking branches with refspecs instead of refs/remotes/*
 + t9114.2: Don't use --track option against "svn-remote"-tracking branches
 + t7201.24: Add refspec to keep --track working
 + t3200.39: tracking setup should fail if there is no matching refspec.
 + checkout: Use remote refspecs when DWIMming tracking branches
 + t2024: Show failure to use refspec when DWIMming remote branch names
 + t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'

 Updates "git checkout foo" that DWIMs the intended "upstream" and
 turns it into "git checkout -t -b foo remotes/origin/foo" to
 correctly take existing remote definitions into account.  The
 remote "origin" may be what uniquely map its own branch to
 remotes/some/where/foo but that some/where may not be "origin".

 Will cook in 'next'.


* mg/more-textconv (2013-04-23) 7 commits
 - git grep: honor textconv by default
 - grep: honor --textconv for the case rev:path
 - grep: allow to use textconv filters
 - t7008: demonstrate behavior of grep with textconv
 - cat-file: do not die on --textconv without textconv filters
 - show: honor --textconv for blobs
 - t4030: demonstrate behavior of show with textconv

 Rerolld. I am not sure if I like "show <blob>" and "grep" that use
 textconv by default, though.


* jn/glossary-revision (2013-04-21) 1 commit
 - glossary: a revision is just a commit

 The wording for "revision" in the glossary wanted to say it refers
 to "commit (noun) as a concept" but it was badly phrased.

 Will cook in 'next'.

 This may need further updates to hint that in contexts where it is
 clear, the word may refer to an object name, not necessarily a
 commit.


* rr/shortlog-doc (2013-04-22) 8 commits
 - builtin/shortlog.c: make usage string consistent with log
 - builtin/log.c: make usage string consistent with doc
 - git-shortlog.txt: make SYNOPSIS match log, update OPTIONS
 - git-log.txt: rewrite note on why "--" may be required
 - git-log.txt: generalize <since>..<until>
 - git-log.txt: order OPTIONS properly; move <since>..<until>
 - revisions.txt: clarify the .. and ... syntax
 - git-shortlog.txt: remove (-h|--help) from OPTIONS

 Update documentation for "log" and "shortlog".

 Looked reasonable.
 Will merge to 'next'.


* mh/multimail (2013-04-21) 1 commit
 - git-multimail: a replacement for post-receive-email

 Waiting for comments.


* jc/prune-all (2013-04-18) 3 commits
  (merged to 'next' on 2013-04-22 at b00ccf6)
 + api-parse-options.txt: document "no-" for non-boolean options
 + git-gc.txt, git-reflog.txt: document new expiry options
 + date.c: add parse_expiry_date()
 (this branch is used by mh/packed-refs-various.)

 We used the approxidate() parser for "--expire=<timestamp>" options
 of various commands, but it is better to treat --expire=all and
 --expire=now a bit more specially than using the current timestamp.
 Update "git gc" and "git reflog" with a new parsing function for
 expiry dates.

 Will cook in 'next'.


* as/check-ignore (2013-04-11) 5 commits
  (merged to 'next' on 2013-04-21 at 7515aa8)
 + Documentation: add caveats about I/O buffering for check-{attr,ignore}
 + check-ignore: allow incremental streaming of queries via --stdin
 + check-ignore: move setup into cmd_check_ignore()
 + check-ignore: add -n / --non-matching option
 + t0008: remove duplicated test fixture data

 Enhance "check-ignore" (1.8.2 update) to work more like "check-attr"
 over bidi-pipes.

 Will cook in 'next'.
 The test in the second from the tip needs to be updated.


* mh/packed-refs-various (2013-04-23) 33 commits
 - refs: handle the main ref_cache specially
 - refs: change do_for_each_*() functions to take ref_cache arguments
 - pack_one_ref(): do some cheap tests before a more expensive one
 - pack_one_ref(): use write_packed_entry() to do the writing
 - pack_one_ref(): use function peel_entry()
 - refs: inline function do_not_prune()
 - pack_refs(): change to use do_for_each_entry()
 - refs: use same lock_file object for both ref-packing functions
 - pack_one_ref(): rename "path" parameter to "refname"
 - pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}
 - pack-refs: rename handle_one_ref() to pack_one_ref()
 - refs: extract a function write_packed_entry()
 - repack_without_ref(): write peeled refs in the rewritten file
 - t3211: demonstrate loss of peeled refs if a packed ref is deleted
 - refs: change how packed refs are deleted
 - search_ref_dir(): return an index rather than a pointer
 - repack_without_ref(): silence errors for dangling packed refs
 - t3210: test for spurious error messages for dangling packed refs
 - refs: change the internal reference-iteration API
 - refs: extract a function peel_entry()
 - peel_ref(): fix return value for non-peelable, not-current reference
 - peel_object(): give more specific information in return value
 - refs: extract function peel_object()
 - refs: extract a function ref_resolves_to_object()
 - repack_without_ref(): use function get_packed_ref()
 - peel_ref(): use function get_packed_ref()
 - get_packed_ref(): return a ref_entry
 - do_for_each_ref_in_dirs(): remove dead code
 - refs: define constant PEELED_LINE_LENGTH
 - refs: document how current_ref is used
 - refs: document do_for_each_ref() and do_one_ref()
 - refs: document the fields of struct ref_value
 - refs: document flags constants REF_*
 (this branch uses jc/prune-all.)

 Updates reading and updating packed-refs file, correcting corner
 case bugs.

 Waiting for comments.


* jk/remote-helper-with-signed-tags (2013-04-15) 3 commits
  (merged to 'next' on 2013-04-21 at 0231d45)
 + transport-helper: add 'signed-tags' capability
 + transport-helper: pass --signed-tags=warn-strip to fast-export
 + fast-export: add --signed-tags=warn-strip mode

 Allows remote-helpers to declare they can handle signed tags, and
 issue a warning when using those that don't.

 Will merge to 'master'.


* fc/transport-helper-error-reporting (2013-04-17) 9 commits
  (merged to 'next' on 2013-04-22 at 5ba6467)
 + transport-helper: update remote helper namespace
 + transport-helper: trivial code shuffle
 + transport-helper: warn when refspec is not used
 + transport-helper: clarify pushing without refspecs
 + transport-helper: update refspec documentation
 + transport-helper: clarify *:* refspec
 + transport-helper: improve push messages
 + transport-helper: mention helper name when it dies
 + transport-helper: report errors properly

 Update transport helper to report errors and maintain ref hierarchy
 used to keep track of remote helper state better.

 Will merge to 'master'.


* jk/submodule-subdirectory-ok (2013-04-18) 2 commits
  (merged to 'next' on 2013-04-22 at f211e25)
 + submodule: drop the top-level requirement
 + rev-parse: add --prefix option

 Allow various subcommands of "git submodule" to be run not from the
 top of the working tree of the superproject.

 Will cook in 'next'.


* jl/submodule-mv (2013-04-23) 5 commits
  (merged to 'next' on 2013-04-23 at c04f574)
 + submodule.c: duplicate real_path's return value
  (merged to 'next' on 2013-04-19 at 45ae3c9)
 + rm: delete .gitmodules entry of submodules removed from the work tree
 + Teach mv to update the path entry in .gitmodules for moved submodules
 + Teach mv to move submodules using a gitfile
 + Teach mv to move submodules together with their work trees

 "git mv A B" when moving a submodule A does "the right thing",
 inclusing relocating its working tree and adjusting the paths in
 the .gitmodules file.

 Will cook in 'next'.


* jn/add-2.0-u-A-sans-pathspec (2013-04-03) 1 commit
 - git add: -u/-A now affects the entire working tree

 Will cook in 'next' until Git 2.0.


* nd/magic-pathspecs (2013-03-31) 45 commits
 . Rename field "raw" to "_raw" in struct pathspec
 . pathspec: support :(glob) syntax
 . pathspec: make --literal-pathspecs disable pathspec magic
 . pathspec: support :(literal) syntax for noglob pathspec
 . Kill limit_pathspec_to_literal() as it's only used by parse_pathspec()
 . parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN
 . parse_pathspec: make sure the prefix part is wildcard-free
 . tree-diff: remove the use of pathspec's raw[] in follow-rename codepath
 . Remove match_pathspec() in favor of match_pathspec_depth()
 . Remove init_pathspec() in favor of parse_pathspec()
 . Remove diff_tree_{setup,release}_paths
 . Convert common_prefix() to use struct pathspec
 . Convert add_files_to_cache to take struct pathspec
 . Convert {read,fill}_directory to take struct pathspec
 . Convert refresh_index to take struct pathspec
 . Convert report_path_error to take struct pathspec
 . checkout: convert read_tree_some to take struct pathspec
 . Convert unmerge_cache to take struct pathspec
 . Convert run_add_interactive to use struct pathspec
 . Convert read_cache_preload() to take struct pathspec
 . reset: convert to use parse_pathspec
 . add: convert to use parse_pathspec
 . check-ignore: convert to use parse_pathspec
 . archive: convert to use parse_pathspec
 . ls-files: convert to use parse_pathspec
 . rm: convert to use parse_pathspec
 . checkout: convert to use parse_pathspec
 . rerere: convert to use parse_pathspec
 . status: convert to use parse_pathspec
 . commit: convert to use parse_pathspec
 . clean: convert to use parse_pathspec
 . Guard against new pathspec magic in pathspec matching code
 . parse_pathspec: support prefixing original patterns
 . parse_pathspec: support stripping/checking submodule paths
 . parse_pathspec: support stripping submodule trailing slashes
 . parse_pathspec: a special flag for max_depth feature
 . Convert some get_pathspec() calls to parse_pathspec()
 . parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL}
 . parse_pathspec: save original pathspec for reporting
 . Add parse_pathspec() that converts cmdline args to struct pathspec
 . pathspec: add copy_pathspec
 . pathspec: i18n-ize error strings in pathspec parsing code
 . Move struct pathspec and related functions to pathspec.[ch]
 . clean: remove unused variable "seen"
 . setup.c: check that the pathspec magic ends with ")"

 Migrate the rest of codebase to use "struct pathspec" more.

 This has nasty conflicts with kb/status-ignored-optim-2,
 as/check-ignore and tr/line-log; I've already asked Duy to hold
 this and later rebase on top of them.


* tr/line-log (2013-04-22) 13 commits
  (merged to 'next' on 2013-04-22 at 8f2c1de)
 + git-log(1): remove --full-line-diff description
  (merged to 'next' on 2013-04-21 at cd92620)
 + line-log: fix documentation formatting
  (merged to 'next' on 2013-04-15 at 504559e)
 + log -L: improve comments in process_all_files()
 + log -L: store the path instead of a diff_filespec
 + log -L: test merge of parallel modify/rename
 + t4211: pass -M to 'git log -M -L...' test
  (merged to 'next' on 2013-04-05 at 5afb00c)
 + log -L: fix overlapping input ranges
 + log -L: check range set invariants when we look it up
  (merged to 'next' on 2013-04-01 at 5be920c)
 + Speed up log -L... -M
 + log -L: :pattern:file syntax to find by funcname
 + Implement line-history search (git log -L)
 + Export rewrite_parents() for 'log -L'
 + Refactor parse_loc

 Will cook in 'next'.


* jc/push-2.0-default-to-simple (2013-04-03) 1 commit
 - push: switch default from "matching" to "simple"

 The early bits to adjust the tests have been merged to 'master'.

 Will cook in 'next' until Git 2.0.

--------------------------------------------------
[Discarded]

* jc/add-2.0-delete-default (2013-04-21) 1 commit
 - git add <pathspec>... defaults to "-A"

 Superseded by jc/add-2.0-ignore-removal

Re: What's cooking in git.git (Apr 2013, #08; Tue, 23)

[Johannes Sixt]

Am 4/23/2013 21:31, schrieb Junio C Hamano:
> * fc/transport-helper-error-reporting (2013-04-17) 9 commits
>   (merged to 'next' on 2013-04-22 at 5ba6467)
>  + transport-helper: update remote helper namespace
>  + transport-helper: trivial code shuffle
>  + transport-helper: warn when refspec is not used
>  + transport-helper: clarify pushing without refspecs
>  + transport-helper: update refspec documentation
>  + transport-helper: clarify *:* refspec
>  + transport-helper: improve push messages
>  + transport-helper: mention helper name when it dies
>  + transport-helper: report errors properly
> 
>  Update transport helper to report errors and maintain ref hierarchy
>  used to keep track of remote helper state better.
> 
>  Will merge to 'master'.

Please don't, yet. There is a new test case that fails on Windows. I'll
have to figure out a work-around.

In git-remote-testgit we have this code:

	before=$(git for-each-ref --format='%(refname) %(objectname)')

	git fast-import "${testgitmarks_args[@]}" --quiet

	after=$(git for-each-ref --format='%(refname) %(objectname)')

	# figure out which refs were updated
	join -e 0 -o '0 1.2 2.2' -a 2 <(echo "$before") <(echo "$after") |
	while read ref a b
	do
		test $a == $b && continue
		echo "ok $ref"
	done

The failure is in the 'join' line: Bash on Windows does not implement
process substitution, and we do not have 'join'. This failing code exists
since 93b5cf9c (remote-testgit: report success after an import,
2012-11-28), but apparently, it did not matter so far.

-- Hannes

Re: What's cooking in git.git (Apr 2013, #08; Tue, 23)

[Felipe Contreras]

On Wed, Apr 24, 2013 at 2:57 AM, Johannes Sixt <j.sixt@viscovery.net> wrote:
> Am 4/23/2013 21:31, schrieb Junio C Hamano:
>> * fc/transport-helper-error-reporting (2013-04-17) 9 commits
>>   (merged to 'next' on 2013-04-22 at 5ba6467)
>>  + transport-helper: update remote helper namespace
>>  + transport-helper: trivial code shuffle
>>  + transport-helper: warn when refspec is not used
>>  + transport-helper: clarify pushing without refspecs
>>  + transport-helper: update refspec documentation
>>  + transport-helper: clarify *:* refspec
>>  + transport-helper: improve push messages
>>  + transport-helper: mention helper name when it dies
>>  + transport-helper: report errors properly
>>
>>  Update transport helper to report errors and maintain ref hierarchy
>>  used to keep track of remote helper state better.
>>
>>  Will merge to 'master'.
>
> Please don't, yet. There is a new test case that fails on Windows. I'll
> have to figure out a work-around.

Which test case? If it it failed, it failed before this series. I
don't see how this new series would affect anything.

-- 
Felipe Contreras

Re: What's cooking in git.git (Apr 2013, #08; Tue, 23)

[Johannes Sixt]

Am 4/24/2013 10:04, schrieb Felipe Contreras:
> On Wed, Apr 24, 2013 at 2:57 AM, Johannes Sixt <j.sixt@viscovery.net> wrote:
>> Am 4/23/2013 21:31, schrieb Junio C Hamano:
>>> * fc/transport-helper-error-reporting (2013-04-17) 9 commits
>>>   (merged to 'next' on 2013-04-22 at 5ba6467)
>>>  + transport-helper: update remote helper namespace
>>>  + transport-helper: trivial code shuffle
>>>  + transport-helper: warn when refspec is not used
>>>  + transport-helper: clarify pushing without refspecs
>>>  + transport-helper: update refspec documentation
>>>  + transport-helper: clarify *:* refspec
>>>  + transport-helper: improve push messages
>>>  + transport-helper: mention helper name when it dies
>>>  + transport-helper: report errors properly
>>>
>>>  Update transport helper to report errors and maintain ref hierarchy
>>>  used to keep track of remote helper state better.
>>>
>>>  Will merge to 'master'.
>>
>> Please don't, yet. There is a new test case that fails on Windows. I'll
>> have to figure out a work-around.
> 
> Which test case? If it it failed, it failed before this series. I
> don't see how this new series would affect anything.

The test introduced in the commit at the tip: 'push update refs'.
More precisely:

---- 8< ----
D:\Src\mingw-git\t>sh t5801-remote-helpers.sh
ok 1 - setup repository
ok 2 - cloning from local repo
ok 3 - create new commit on remote
ok 4 - pulling from local repo
ok 5 - pushing to local repo
ok 6 - fetch new branch
ok 7 - fetch multiple branches
ok 8 - push when remote has extra refs
ok 9 - push new branch by name
not ok 10 - push new branch with old:new refspec # TODO known breakage
ok 11 - cloning without refspec
ok 12 - pulling without refspecs
ok 13 - pushing without refspecs
ok 14 - pulling without marks
not ok 15 - pushing without marks # TODO known breakage
ok 16 - push all with existing object
ok 17 - push ref with existing object
not ok 18 - push update refs
#
#               (cd local &&
#               git checkout -b update master &&
#               echo update >>file &&
#               git commit -a -m update &&
#               git push origin update
#               git rev-parse --verify remotes/origin/update >expect &&
#               git rev-parse --verify testgit/origin/heads/update >actual &&
#               test_cmp expect actual
#               )
#
ok 19 - proper failure checks for fetching
ok 20 - proper failure checks for pushing
ok 21 - push messages
ok 22 - push signed tag
ok 23 - push signed tag with signed-tags capability
# still have 2 known breakage(s)
# failed 1 among remaining 21 test(s)
1..23
---- 8< ----

The verbose failure is:

---- 8< ----
expecting success:
        (cd local &&
        git checkout -b update master &&
        echo update >>file &&
        git commit -a -m update &&
        git push origin update
        git rev-parse --verify remotes/origin/update >expect &&
        git rev-parse --verify testgit/origin/heads/update >actual &&
        test_cmp expect actual
        )

Switched to a new branch 'update'
[update 86cfeec] update
 Author: A U Thor <author@example.com>
 1 file changed, 1 insertion(+)
d:/Src/mingw-git/git-remote-testgit: cannot make pipe for process substitution: Function not implemented
d:/Src/mingw-git/git-remote-testgit: cannot make pipe for process substitution: Function not implemented
d:/Src/mingw-git/git-remote-testgit: line 97: join: command not found
Everything up-to-date
fatal: Needed a single revision
not ok 18 - push update refs
---- 8< ----

An example of a successful test is this:

---- 8< ----
expecting success:
        (cd local &&
         git checkout -b new-name  &&
         echo content >>file &&
         git commit -a -m seven &&
         git push origin new-name
        ) &&
        compare_refs local HEAD server refs/heads/new-name

Switched to a new branch 'new-name'
[new-name 455466e] seven
 Author: A U Thor <author@example.com>
 1 file changed, 1 insertion(+)
d:/Src/mingw-git/git-remote-testgit: cannot make pipe for process substitution: Function not implemented
d:/Src/mingw-git/git-remote-testgit: cannot make pipe for process substitution: Function not implemented
d:/Src/mingw-git/git-remote-testgit: line 97: join: command not found
Everything up-to-date
ok 9 - push new branch by name
---- 8< ----

-- Hannes

[PATCH] git-remote-testgit: avoid process substitution

[Johannes Sixt]

From: Johannes Sixt <j6t@kdbg.org>

Bash on Windows does not implement process substitution.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
Am 4/24/2013 10:30, schrieb Johannes Sixt:
> Am 4/24/2013 10:04, schrieb Felipe Contreras:
>> On Wed, Apr 24, 2013 at 2:57 AM, Johannes Sixt <j.sixt@viscovery.net> wrote:
>>> Am 4/23/2013 21:31, schrieb Junio C Hamano:
>>>> * fc/transport-helper-error-reporting (2013-04-17) 9 commits
>>>>   (merged to 'next' on 2013-04-22 at 5ba6467)
>>>>  + transport-helper: update remote helper namespace
>>>>  + transport-helper: trivial code shuffle
>>>>  + transport-helper: warn when refspec is not used
>>>>  + transport-helper: clarify pushing without refspecs
>>>>  + transport-helper: update refspec documentation
>>>>  + transport-helper: clarify *:* refspec
>>>>  + transport-helper: improve push messages
>>>>  + transport-helper: mention helper name when it dies
>>>>  + transport-helper: report errors properly
>>>>
>>>>  Update transport helper to report errors and maintain ref hierarchy
>>>>  used to keep track of remote helper state better.
>>>>
>>>>  Will merge to 'master'.
>>>
>>> Please don't, yet. There is a new test case that fails on Windows. I'll
>>> have to figure out a work-around.
>>
>> Which test case? If it it failed, it failed before this series. I
>> don't see how this new series would affect anything.
> 
> The test introduced in the commit at the tip: 'push update refs'.

Here is a fix. It assumes that the list of refs after the import is
a superset of the refs before the import. (Can refs be deleted
via fast-import?)

 git-remote-testgit | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/git-remote-testgit b/git-remote-testgit
index 23c9d40..e99d5fa 100755
--- a/git-remote-testgit
+++ b/git-remote-testgit
@@ -91,13 +91,15 @@ do
 
 		git fast-import "${testgitmarks_args[@]}" --quiet
 
-		after=$(git for-each-ref --format='%(refname) %(objectname)')
-
 		# figure out which refs were updated
-		join -e 0 -o '0 1.2 2.2' -a 2 <(echo "$before") <(echo "$after") |
-		while read ref a b
+		git for-each-ref --format='%(refname) %(objectname)' |
+		while read ref a
 		do
-			test $a == $b && continue
+			case "$before" in
+			*"$ref $a"*)
+				continue
+				;;
+			esac
 			echo "ok $ref"
 		done
 
-- 
1.8.2.388.g36592d7

Re: [PATCH] git-remote-testgit: avoid process substitution

[Junio C Hamano]

Johannes Sixt <j.sixt@viscovery.net> writes:

> From: Johannes Sixt <j6t@kdbg.org>
>
> Bash on Windows does not implement process substitution.
>
> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
> ---
> ...
> Here is a fix. It assumes that the list of refs after the import is
> a superset of the refs before the import. (Can refs be deleted
> via fast-import?)
>
>  git-remote-testgit | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/git-remote-testgit b/git-remote-testgit
> index 23c9d40..e99d5fa 100755
> --- a/git-remote-testgit
> +++ b/git-remote-testgit
> @@ -91,13 +91,15 @@ do
>  
>  		git fast-import "${testgitmarks_args[@]}" --quiet
>  
> -		after=$(git for-each-ref --format='%(refname) %(objectname)')
> -
>  		# figure out which refs were updated
> -		join -e 0 -o '0 1.2 2.2' -a 2 <(echo "$before") <(echo "$after") |
> -		while read ref a b
> +		git for-each-ref --format='%(refname) %(objectname)' |
> +		while read ref a
>  		do
> -			test $a == $b && continue
> +			case "$before" in
> +			*"$ref $a"*)
> +				continue

This just like the original 'join' depends on the two output from
for-each-ref to be sorted the same way, which is true and fine.  But
I wonder one thing.  When $before has this in it:

	refs/heads/refs/heads/master 664059...126eaa7

and your "read ref a" got this in the input:

	refs/heads/master 664059...126eaa7

would the pattern matching by case work corretly?

Doing something like this might be needed.

	case "$LF$before$LF" in
        *"$LF$ref $a$LF"*)
        	continue ;; # matches
	esac

Re: [PATCH] git-remote-testgit: avoid process substitution

[Felipe Contreras]

On Thu, Apr 25, 2013 at 9:57 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Johannes Sixt <j.sixt@viscovery.net> writes:
>
>> From: Johannes Sixt <j6t@kdbg.org>
>>
>> Bash on Windows does not implement process substitution.
>>
>> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
>> ---
>> ...
>> Here is a fix. It assumes that the list of refs after the import is
>> a superset of the refs before the import. (Can refs be deleted
>> via fast-import?)
>>
>>  git-remote-testgit | 12 +++++++-----
>>  1 file changed, 7 insertions(+), 5 deletions(-)
>>
>> diff --git a/git-remote-testgit b/git-remote-testgit
>> index 23c9d40..e99d5fa 100755
>> --- a/git-remote-testgit
>> +++ b/git-remote-testgit
>> @@ -91,13 +91,15 @@ do
>>
>>               git fast-import "${testgitmarks_args[@]}" --quiet
>>
>> -             after=$(git for-each-ref --format='%(refname) %(objectname)')
>> -
>>               # figure out which refs were updated
>> -             join -e 0 -o '0 1.2 2.2' -a 2 <(echo "$before") <(echo "$after") |
>> -             while read ref a b
>> +             git for-each-ref --format='%(refname) %(objectname)' |
>> +             while read ref a
>>               do
>> -                     test $a == $b && continue
>> +                     case "$before" in
>> +                     *"$ref $a"*)
>> +                             continue
>
> This just like the original 'join' depends on the two output from
> for-each-ref to be sorted the same way, which is true and fine.  But
> I wonder one thing.  When $before has this in it:

I wonder if we should bother with this at all. The purpose of the code
was mainly to show to users that they should report the success only
if the refs have been updated, but the code is becoming more
obfuscated, a comment should do the trick. And then, we can just
report success for all the refs (and explain in the comment why).

-- 
Felipe Contreras

Re: [PATCH] git-remote-testgit: avoid process substitution

[Junio C Hamano]

Felipe Contreras <felipe.contreras@gmail.com> writes:

>>> ...
>>> +             git for-each-ref --format='%(refname) %(objectname)' |
>>> +             while read ref a
>>>               do
>>> -                     test $a == $b && continue
>>> +                     case "$before" in
>>> +                     *"$ref $a"*)
>>> +                             continue
>>
> I wonder if we should bother with this at all. The purpose of the code
> was mainly to show to users that they should report the success only
> if the refs have been updated, but the code is becoming more
> obfuscated, a comment should do the trick. And then, we can just
> report success for all the refs (and explain in the comment why).

Are you proposing to say "ok $ref" to everything we see in the
resulting repository, even the ones the caller of remote-testgit did
not ask us to do anything with?

Wouldn't the caller be surprised if we did so?

Re: [PATCH] git-remote-testgit: avoid process substitution

[Felipe Contreras]

On Thu, Apr 25, 2013 at 1:25 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
>>>> ...
>>>> +             git for-each-ref --format='%(refname) %(objectname)' |
>>>> +             while read ref a
>>>>               do
>>>> -                     test $a == $b && continue
>>>> +                     case "$before" in
>>>> +                     *"$ref $a"*)
>>>> +                             continue
>>>
>> I wonder if we should bother with this at all. The purpose of the code
>> was mainly to show to users that they should report the success only
>> if the refs have been updated, but the code is becoming more
>> obfuscated, a comment should do the trick. And then, we can just
>> report success for all the refs (and explain in the comment why).
>
> Are you proposing to say "ok $ref" to everything we see in the
> resulting repository, even the ones the caller of remote-testgit did
> not ask us to do anything with?
>
> Wouldn't the caller be surprised if we did so?

Why would it? The only effective difference is what you'll see
reported in the UI, but there's no user here.

-- 
Felipe Contreras

Re: [PATCH] git-remote-testgit: avoid process substitution

[Junio C Hamano]

Felipe Contreras <felipe.contreras@gmail.com> writes:

> On Thu, Apr 25, 2013 at 1:25 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Felipe Contreras <felipe.contreras@gmail.com> writes:
>>
>>>>> ...
>>>>> +             git for-each-ref --format='%(refname) %(objectname)' |
>>>>> +             while read ref a
>>>>>               do
>>>>> -                     test $a == $b && continue
>>>>> +                     case "$before" in
>>>>> +                     *"$ref $a"*)
>>>>> +                             continue
>>>>
>>> I wonder if we should bother with this at all. The purpose of the code
>>> was mainly to show to users that they should report the success only
>>> if the refs have been updated, but the code is becoming more
>>> obfuscated, a comment should do the trick. And then, we can just
>>> report success for all the refs (and explain in the comment why).
>>
>> Are you proposing to say "ok $ref" to everything we see in the
>> resulting repository, even the ones the caller of remote-testgit did
>> not ask us to do anything with?
>>
>> Wouldn't the caller be surprised if we did so?
>
> Why would it?  The only effective difference is what you'll see
> reported in the UI, but there's no user here.

You are correct that it affects only the UI, but isn't that because
the current implementation of push_update_refs_status() blindly
accepts whatever 'ok' response says without checking the ref
mentioned against what it tried to push out?  I was wondering if
that codepath should stay that way forever, or if we may want add
sanity checks later.  If the latter, I suspect this would manifest
as an ancient bug to say 'ok' for everything we have instead of what
we actually pushed out (of course, the explanation in the comment
would help).

So I am OK with that simpler approach.  Care to roll the conclusion
of your idea into a patch?

By the way, I noticed that Documentation/gitremote-helpers.txt does
not even mention these 'ok' responses for 'export' command, but they
should be the same as responses to 'push'. Perhaps we can share some
text between the two?

Re: [PATCH] git-remote-testgit: avoid process substitution

[Felipe Contreras]

On Thu, Apr 25, 2013 at 3:06 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
>> On Thu, Apr 25, 2013 at 1:25 PM, Junio C Hamano <gitster@pobox.com> wrote:
>>> Felipe Contreras <felipe.contreras@gmail.com> writes:
>>>
>>>>>> ...
>>>>>> +             git for-each-ref --format='%(refname) %(objectname)' |
>>>>>> +             while read ref a
>>>>>>               do
>>>>>> -                     test $a == $b && continue
>>>>>> +                     case "$before" in
>>>>>> +                     *"$ref $a"*)
>>>>>> +                             continue
>>>>>
>>>> I wonder if we should bother with this at all. The purpose of the code
>>>> was mainly to show to users that they should report the success only
>>>> if the refs have been updated, but the code is becoming more
>>>> obfuscated, a comment should do the trick. And then, we can just
>>>> report success for all the refs (and explain in the comment why).
>>>
>>> Are you proposing to say "ok $ref" to everything we see in the
>>> resulting repository, even the ones the caller of remote-testgit did
>>> not ask us to do anything with?
>>>
>>> Wouldn't the caller be surprised if we did so?
>>
>> Why would it?  The only effective difference is what you'll see
>> reported in the UI, but there's no user here.
>
> You are correct that it affects only the UI, but isn't that because
> the current implementation of push_update_refs_status() blindly
> accepts whatever 'ok' response says without checking the ref
> mentioned against what it tried to push out?  I was wondering if
> that codepath should stay that way forever, or if we may want add
> sanity checks later.  If the latter, I suspect this would manifest
> as an ancient bug to say 'ok' for everything we have instead of what
> we actually pushed out (of course, the explanation in the comment
> would help).

Actually, I think the code already checks for that.

> So I am OK with that simpler approach.  Care to roll the conclusion
> of your idea into a patch?

Will do.

> By the way, I noticed that Documentation/gitremote-helpers.txt does
> not even mention these 'ok' responses for 'export' command, but they
> should be the same as responses to 'push'. Perhaps we can share some
> text between the two?

Indeed, it's the same code for both.

-- 
Felipe Contreras

Re: [PATCH] git-remote-testgit: avoid process substitution

[Felipe Contreras]

On Thu, Apr 25, 2013 at 12:56 AM, Johannes Sixt <j.sixt@viscovery.net> wrote:
> From: Johannes Sixt <j6t@kdbg.org>
>
> Bash on Windows does not implement process substitution.

Nevermind, reporting all the refs creates a lot of irrelevant output,
this version is fine.

Acknowledged-by: Felipe Contreras <felipe.contreras@gmail.com>

-- 
Felipe Contreras

Re: [PATCH] git-remote-testgit: avoid process substitution

[Junio C Hamano]

Felipe Contreras <felipe.contreras@gmail.com> writes:

> On Thu, Apr 25, 2013 at 12:56 AM, Johannes Sixt <j.sixt@viscovery.net> wrote:
>> From: Johannes Sixt <j6t@kdbg.org>
>>
>> Bash on Windows does not implement process substitution.
>
> Nevermind, reporting all the refs creates a lot of irrelevant output,
> this version is fine.

When $before has this in it:

	refs/heads/refs/heads/master 664059...126eaa7

and your "read ref a" got this in the input:

	refs/heads/master 664059...126eaa7

would the pattern matching by case work corretly?

>
> Acknowledged-by: Felipe Contreras <felipe.contreras@gmail.com>

Re: [PATCH] git-remote-testgit: avoid process substitution

[Felipe Contreras]

On Fri, Apr 26, 2013 at 5:25 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
>> On Thu, Apr 25, 2013 at 12:56 AM, Johannes Sixt <j.sixt@viscovery.net> wrote:
>>> From: Johannes Sixt <j6t@kdbg.org>
>>>
>>> Bash on Windows does not implement process substitution.
>>
>> Nevermind, reporting all the refs creates a lot of irrelevant output,
>> this version is fine.
>
> When $before has this in it:
>
>         refs/heads/refs/heads/master 664059...126eaa7
>
> and your "read ref a" got this in the input:
>
>         refs/heads/master 664059...126eaa7
>
> would the pattern matching by case work corretly?

No, it wouldn't, but I don't think there's any way to do \<\> or \b in globs.

Alternatively, we could use the same $before and $after, and simply
store the output somewhere; $GIT_DIR/testgit-before, for example. This
should decrease the amount of changes needed, but I don't know if
anybody would have problems with the use of 'join'.

Cheers.

-- 
Felipe Contreras

Re* [PATCH] git-remote-testgit: avoid process substitution

[Junio C Hamano]

Felipe Contreras <felipe.contreras@gmail.com> writes:

> No, it wouldn't, but I don't think there's any way to do \<\> or \b in globs.

This should do in the meantime, but it further needs:

 - J6t's sign off for the follow-up part to remove remaining
   bash-isms to complete this patch (the last part of the patch is
   from <5178C583.6000703@viscovery.net> and we can take half the
   log message from there);

 - Rename it to git-remote-testgit.sh and tell Makefile to replace
   the shebang line with SHELL_PATH like other scripts;

 - Remove the "we need to have bash because we will run remote-testgit"
   logic from t5801



diff --git a/git-remote-testgit b/git-remote-testgit
index b395c8d..ffac950 100755
--- a/git-remote-testgit
+++ b/git-remote-testgit
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # Copyright (c) 2012 Felipe Contreras
 
 alias=$1
@@ -23,7 +23,6 @@ then
 	testgitmarks="$dir/testgit.marks"
 	test -e "$gitmarks" || >"$gitmarks"
 	test -e "$testgitmarks" || >"$testgitmarks"
-	testgitmarks_args=( "--"{import,export}"-marks=$testgitmarks" )
 fi
 
 while read line
@@ -62,22 +61,31 @@ do
 			echo "feature export-marks=$gitmarks"
 		fi
 		echo "feature done"
-		git fast-export "${testgitmarks_args[@]}" $refs |
+		git fast-export \
+			${testgitmarks:+"--import-marks=$testgitmarks"} \
+			${testgitmarks:+"--export-marks=$testgitmarks"} \
+			$refs |
 		sed -e "s#refs/heads/#${prefix}/heads/#g"
 		echo "done"
 		;;
 	export)
 		before=$(git for-each-ref --format='%(refname) %(objectname)')
 
-		git fast-import "${testgitmarks_args[@]}" --quiet
-
-		after=$(git for-each-ref --format='%(refname) %(objectname)')
+		git fast-export \
+			${testgitmarks:+"--import-marks=$testgitmarks"} \
+			${testgitmarks:+"--export-marks=$testgitmarks"} \
+			--quiet
 
 		# figure out which refs were updated
-		join -e 0 -o '0 1.2 2.2' -a 2 <(echo "$before") <(echo "$after") |
-		while read ref a b
+		LF=$'\n'
+		git for-each-ref --format='%(refname) %(objectname)' |
+		while read ref a
 		do
-			test $a == $b && continue
+			case "$LF$before$LF" in
+			*"$LF$ref $a$LF"*)
+				continue
+				;;
+			esac
 			echo "ok $ref"
 		done
 

Re: Re* [PATCH] git-remote-testgit: avoid process substitution

[Johannes Sixt]

Am 27.04.2013 01:26, schrieb Junio C Hamano:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
> 
>> No, it wouldn't, but I don't think there's any way to do \<\> or \b in globs.
> 
> This should do in the meantime, but it further needs:
> 
>  - J6t's sign off for the follow-up part to remove remaining
>    bash-isms to complete this patch (the last part of the patch is
>    from <5178C583.6000703@viscovery.net> and we can take half the
>    log message from there);

The patch below doesn't remove the bash dependency, yet, but it addresses
the problematic mismatch you noticed without the need for $LF. Can you
please queue it to move the topic forward?

Removing the remaining bashisms and the following two can come later:

>  - Rename it to git-remote-testgit.sh and tell Makefile to replace
>    the shebang line with SHELL_PATH like other scripts;
> 
>  - Remove the "we need to have bash because we will run remote-testgit"
>    logic from t5801

Here's my

Signed-off-by: Johannes Sixt <j6t@kdbg.org>

for this part in case someone wants to pick it up:

> diff --git a/git-remote-testgit b/git-remote-testgit
> index b395c8d..ffac950 100755
> --- a/git-remote-testgit
> +++ b/git-remote-testgit
> @@ -1,4 +1,4 @@
> -#!/usr/bin/env bash
> +#!/bin/sh
>  # Copyright (c) 2012 Felipe Contreras
>  
>  alias=$1
> @@ -23,7 +23,6 @@ then
>  	testgitmarks="$dir/testgit.marks"
>  	test -e "$gitmarks" || >"$gitmarks"
>  	test -e "$testgitmarks" || >"$testgitmarks"
> -	testgitmarks_args=( "--"{import,export}"-marks=$testgitmarks" )
>  fi
>  
>  while read line
> @@ -62,22 +61,31 @@ do
>  			echo "feature export-marks=$gitmarks"
>  		fi
>  		echo "feature done"
> -		git fast-export "${testgitmarks_args[@]}" $refs |
> +		git fast-export \
> +			${testgitmarks:+"--import-marks=$testgitmarks"} \
> +			${testgitmarks:+"--export-marks=$testgitmarks"} \
> +			$refs |
>  		sed -e "s#refs/heads/#${prefix}/heads/#g"
>  		echo "done"
>  		;;
>  	export)
>  		before=$(git for-each-ref --format='%(refname) %(objectname)')
>  
> -		git fast-import "${testgitmarks_args[@]}" --quiet
> +		git fast-import \
> +			${testgitmarks:+"--import-marks=$testgitmarks"} \
> +			${testgitmarks:+"--export-marks=$testgitmarks"} \
> +			--quiet
>  

--- 8< ---
Subject: [PATCH] git-remote-testgit: avoid process substitution

The implementation of bash on Windows does not offer process substitution.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 git-remote-testgit | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/git-remote-testgit b/git-remote-testgit
index 23c9d40..979b13e 100755
--- a/git-remote-testgit
+++ b/git-remote-testgit
@@ -87,17 +87,18 @@ do
 			exit 1
 		fi
 
-		before=$(git for-each-ref --format='%(refname) %(objectname)')
+		before=$(git for-each-ref --format=' %(refname) %(objectname) ')
 
 		git fast-import "${testgitmarks_args[@]}" --quiet
 
-		after=$(git for-each-ref --format='%(refname) %(objectname)')
-
 		# figure out which refs were updated
-		join -e 0 -o '0 1.2 2.2' -a 2 <(echo "$before") <(echo "$after") |
-		while read ref a b
+		git for-each-ref --format='%(refname) %(objectname)' |
+		while read ref a
 		do
-			test $a == $b && continue
+			case "$before" in
+			*" $ref $a "*)
+				continue ;;	# unchanged
+			esac
 			echo "ok $ref"
 		done
 
-- 
1.8.2.388.g36592d7

Re: Re* [PATCH] git-remote-testgit: avoid process substitution

[Junio C Hamano]

Johannes Sixt <j6t@kdbg.org> writes:

> The patch below doesn't remove the bash dependency, yet, but it addresses
> the problematic mismatch you noticed without the need for $LF. Can you
> please queue it to move the topic forward?

I'll send three-patch series I have (including the two discussed in
the thread) on top of fc/transport-helper-error-reporting as a reply
to this message.  It seems to pass "make SHELL_PATH=/bin/dash test".

[PATCH 0/3] De-bashing remote-testgit

[Junio C Hamano]

The two from J6t are what were discussed on the list.  The last one
is to teach git-remote-testgit to honor SHELL_PATH like all the
other shell scripts.

Johannes Sixt (2):
  git-remote-testgit: avoid process substitution
  git-remote-testgit: further remove some bashisms

Junio C Hamano (1):
  git-remote-testgit: build it to run under $SHELL_PATH

 .gitignore                                  |  1 +
 Makefile                                    |  1 +
 git-remote-testgit => git-remote-testgit.sh | 26 ++++++++++++++++----------
 t/t5801-remote-helpers.sh                   |  5 -----
 4 files changed, 18 insertions(+), 15 deletions(-)
 rename git-remote-testgit => git-remote-testgit.sh (77%)

-- 
1.8.3-rc0-121-gda9b90f

[PATCH 1/3] git-remote-testgit: avoid process substitution

[Junio C Hamano]

From: Johannes Sixt <j6t@kdbg.org>

The implementation of bash on Windows does not offer process substitution.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 git-remote-testgit | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/git-remote-testgit b/git-remote-testgit
index 5fd09f9..643e4ae 100755
--- a/git-remote-testgit
+++ b/git-remote-testgit
@@ -86,17 +86,18 @@ do
 			exit 1
 		fi
 
-		before=$(git for-each-ref --format='%(refname) %(objectname)')
+		before=$(git for-each-ref --format=' %(refname) %(objectname) ')
 
 		git fast-import "${testgitmarks_args[@]}" --quiet
 
-		after=$(git for-each-ref --format='%(refname) %(objectname)')
-
 		# figure out which refs were updated
-		join -e 0 -o '0 1.2 2.2' -a 2 <(echo "$before") <(echo "$after") |
-		while read ref a b
+		git for-each-ref --format='%(refname) %(objectname)' |
+		while read ref a
 		do
-			test $a == $b && continue
+			case "$before" in
+			*" $ref $a "*)
+				continue ;;	# unchanged
+			esac
 			echo "ok $ref"
 		done
 
-- 
1.8.3-rc0-121-gda9b90f

[PATCH 2/3] git-remote-testgit: further remove some bashisms

[Junio C Hamano]

From: Johannes Sixt <j.sixt@viscovery.net>

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 git-remote-testgit | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/git-remote-testgit b/git-remote-testgit
index 643e4ae..b528949 100755
--- a/git-remote-testgit
+++ b/git-remote-testgit
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # Copyright (c) 2012 Felipe Contreras
 
 alias=$1
@@ -23,7 +23,6 @@ then
 	testgitmarks="$dir/testgit.marks"
 	test -e "$gitmarks" || >"$gitmarks"
 	test -e "$testgitmarks" || >"$testgitmarks"
-	testgitmarks_args=( "--"{import,export}"-marks=$testgitmarks" )
 fi
 
 while read line
@@ -69,7 +68,10 @@ do
 		fi
 
 		echo "feature done"
-		git fast-export "${testgitmarks_args[@]}" $refs |
+		git fast-export \
+			${testgitmarks:+"--import-marks=$testgitmarks"} \
+			${testgitmarks:+"--export-marks=$testgitmarks"} \
+			$refs |
 		sed -e "s#refs/heads/#${prefix}/heads/#g"
 		echo "done"
 		;;
@@ -88,7 +90,10 @@ do
 
 		before=$(git for-each-ref --format=' %(refname) %(objectname) ')
 
-		git fast-import "${testgitmarks_args[@]}" --quiet
+		git fast-import \
+			${testgitmarks:+"--import-marks=$testgitmarks"} \
+			${testgitmarks:+"--export-marks=$testgitmarks"} \
+			--quiet
 
 		# figure out which refs were updated
 		git for-each-ref --format='%(refname) %(objectname)' |
-- 
1.8.3-rc0-121-gda9b90f

[PATCH 3/3] git-remote-testgit: build it to run under $SHELL_PATH

[Junio C Hamano]

Just like all the other shell scripts, replace the shebang line to
make sure it runs under the shell the user specified.

As this no longer depends on bashisms, t5801 does not have to say
bash must be available somewhere on the system.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 .gitignore                                  | 1 +
 Makefile                                    | 1 +
 git-remote-testgit => git-remote-testgit.sh | 0
 t/t5801-remote-helpers.sh                   | 5 -----
 4 files changed, 2 insertions(+), 5 deletions(-)
 rename git-remote-testgit => git-remote-testgit.sh (100%)

diff --git a/.gitignore b/.gitignore
index 6669bf0..10aee94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,6 +125,7 @@
 /git-remote-ftps
 /git-remote-fd
 /git-remote-ext
+/git-remote-testgit
 /git-remote-testpy
 /git-remote-testsvn
 /git-repack
diff --git a/Makefile b/Makefile
index 0f931a2..5f424a7 100644
--- a/Makefile
+++ b/Makefile
@@ -460,6 +460,7 @@ SCRIPT_SH += git-mergetool.sh
 SCRIPT_SH += git-pull.sh
 SCRIPT_SH += git-quiltimport.sh
 SCRIPT_SH += git-rebase.sh
+SCRIPT_SH += git-remote-testgit.sh
 SCRIPT_SH += git-repack.sh
 SCRIPT_SH += git-request-pull.sh
 SCRIPT_SH += git-stash.sh
diff --git a/git-remote-testgit b/git-remote-testgit.sh
similarity index 100%
rename from git-remote-testgit
rename to git-remote-testgit.sh
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index c956abd..0a83db8 100755
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -7,11 +7,6 @@ test_description='Test remote-helper import and export commands'
 
 . ./test-lib.sh
 
-if ! type "${BASH-bash}" >/dev/null 2>&1; then
-	skip_all='skipping remote-testgit tests, bash not available'
-	test_done
-fi
-
 compare_refs() {
 	git --git-dir="$1/.git" rev-parse --verify $2 >expect &&
 	git --git-dir="$3/.git" rev-parse --verify $4 >actual &&
-- 
1.8.3-rc0-121-gda9b90f