git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* What's cooking in git.git (Sep 2020, #05; Fri, 18)
@ 2020-09-19  1:41 Junio C Hamano
  2020-09-19 21:13 ` René Scharfe
  0 siblings, 1 reply; 7+ messages in thread
From: Junio C Hamano @ 2020-09-19  1:41 UTC (permalink / raw)
  To: git

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

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

* al/t3200-back-on-a-branch (2020-09-08) 1 commit
  (merged to 'next' on 2020-09-09 at 833e2fc60c)
 + t3200: clean side effect of git checkout --orphan

 Test fix.


* ea/blame-use-oideq (2020-09-08) 1 commit
  (merged to 'next' on 2020-09-09 at babefe4727)
 + blame.c: replace instance of !oidcmp for oideq

 Code cleanup.


* es/wt-add-detach (2020-09-06) 3 commits
  (merged to 'next' on 2020-09-10 at abd83f90e7)
 + git-worktree.txt: discuss branch-based vs. throwaway worktrees
 + worktree: teach `add` to recognize -d as shorthand for --detach
 + git-checkout.txt: document -d short option for --detach

 "git worktree add" learns that the "-d" is a synonym to "--detach"
 option to create a new worktree without being on a branch.


* hn/refs-ref-log-only-bit (2020-09-08) 1 commit
  (merged to 'next' on 2020-09-09 at f729cb2c81)
 + refs: move REF_LOG_ONLY to refs-internal.h

 A bit of API reshuffling to make sure stuff common to all backends
 are not defined only in files backend.


* jc/add-i-use-builtin-experimental (2020-09-08) 1 commit
  (merged to 'next' on 2020-09-09 at abcb7515dc)
 + add -i: use the built-in version when feature.experimental is set

 The "add -i/-p" machinery has been written in C but it is not used
 by default yet.  It is made default to those who are participating
 in feature.experimental experiment.


* jc/dist-tarball-tweak (2020-09-09) 1 commit
  (merged to 'next' on 2020-09-10 at 36cbe7ee9e)
 + Makefile: allow extra tweaking of distribution tarball

 Allow maintainers to tweak $(TAR) invocations done while making
 distribution tarballs.


* jc/quote-path-cleanup (2020-09-10) 7 commits
  (merged to 'next' on 2020-09-10 at 3bfde81846)
 + quote: turn 'nodq' parameter into a set of flags
 + quote: rename misnamed sq_lookup[] to cq_lookup[]
 + wt-status: consistently quote paths in "status --short" output
 + quote_path: code clarification
 + quote_path: optionally allow quoting a path with SP in it
 + quote_path: give flags parameter to quote_path()
 + quote_path: rename quote_path_relative() to quote_path()

 "git status --short" quoted a path with SP in it when tracked, but
 not those that are untracked, ignored or unmerged.  They are all
 shown quoted consistently.


* jk/add-i-fixes (2020-09-08) 2 commits
  (merged to 'next' on 2020-09-09 at 46ea071a7a)
 + add--interactive.perl: specify --no-color explicitly
 + add-patch: fix inverted return code of repo_read_index()

 "add -i/-p" fixes.


* mf/submodule-summary-with-correct-repository (2020-06-24) 2 commits
  (merged to 'next' on 2020-09-10 at 7853fe7e12)
 + submodule: use submodule repository when preparing summary
 + revision: use repository from rev_info when parsing commits

 "git diff/show" on a change that involves a submodule used to read
 the information on commits in the submodule from a wrong repository
 and gave a wrong information when the commit-graph is involved.
 cf. <xmqqzh667ca4.fsf@gitster.c.googlers.com>


* mt/config-fail-nongit-early (2020-09-09) 1 commit
  (merged to 'next' on 2020-09-10 at 6f77f65b4e)
 + config: complain about --worktree outside of a git repo

 Unlike "git config --local", "git config --worktree" did not fail
 early and cleanly when started outside a git repository.


* os/collect-changed-submodules-optim (2020-09-06) 1 commit
  (merged to 'next' on 2020-09-10 at b6d9ed060e)
 + submodule: suppress checking for file name and ref ambiguity for object ids

 Optimization around submodule handling.


* pb/clang-json-compilation-database (2020-09-06) 1 commit
  (merged to 'next' on 2020-09-09 at 9f5ea136f1)
 + Makefile: add support for generating JSON compilation database

 Developer support.


* pw/add-p-leakfix (2020-09-08) 1 commit
  (merged to 'next' on 2020-09-09 at 4206d0503c)
 + add -p: fix memory leak

 Leakfix.


* rs/misc-cleanups (2020-09-06) 3 commits
  (merged to 'next' on 2020-09-09 at 4a19ea9672)
 + pack-bitmap-write: use hashwrite_be32() in write_hash_cache()
 + midx: use hashwrite_u8() in write_midx_header()
 + fast-import: use write_pack_header()

 Misc cleanups.


* rs/parallel-read-cache-fix (2020-09-06) 1 commit
  (merged to 'next' on 2020-09-09 at 92953a75c4)
 + read-cache: fix mem-pool allocation for multi-threaded index loading

 A follow-up fix to a topic already in 'master'.


* rs/refspec-leakfix (2020-09-06) 2 commits
  (merged to 'next' on 2020-09-09 at 10741e90a5)
 + refspec: add and use refspec_appendf()
 + push: release strbufs used for refspec formatting

 Leakfix.


* so/log-tree-diff-cleanup (2020-09-06) 2 commits
  (merged to 'next' on 2020-09-09 at f8744b8e8a)
 + log_tree_diff: get rid of extra check for NULL
 + log_tree_diff: get rid of code duplication for first_parent_only

 Code cleanup.

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

* cs/don-t-pretend-a-failed-remote-set-head-succeeded (2020-09-17) 1 commit
  (merged to 'next' on 2020-09-18 at 51f73ca6dc)
 + remote: don't show success message when set-head fails

 "git remote set-head" that failed still said something that hints
 the operation went through, which was misleading.

 Will merge to 'master'.


* dl/diff-merge-base (2020-09-17) 10 commits
 - contrib/completion: complete `git diff --merge-base`
 - builtin/diff-tree: learn --merge-base
 - builtin/diff-index: learn --merge-base
 - t4068: add --merge-base tests
 - diff-lib: define diff_get_merge_base()
 - diff-lib: accept option flags in run_diff_index()
 - contrib/completion: extract common diff/difftool options
 - git-diff.txt: backtick quote command text
 - git-diff-index.txt: make --cached description a proper sentence
 - t4068: remove unnecessary >tmp

 "git diff A...B" learned "git diff --merge-base A B", which is a
 longer short-hand to say the same thing.

 Expecting a reroll.
 cf. <20200917181303.GA108156@coredump.intra.peff.net>,
 <xmqqh7rws5hm.fsf@gitster.c.googlers.com>, etc.


* jk/dont-count-existing-objects-twice (2020-09-17) 1 commit
  (merged to 'next' on 2020-09-18 at 73b30558b9)
 + packfile: actually set approximate_object_count_valid

 There is a logic to estimate how many objects are in the
 repository, which is mean to run once per process invocation, but
 it ran every time the estimated value was requested.

 Will merge to 'master'.


* dl/complete-format-patch-recent-features (2020-09-17) 1 commit
  (merged to 'next' on 2020-09-18 at c0ec1f7569)
 + contrib/completion: complete options that take refs for format-patch

 Update to command line completion (in contrib/)

 Will merge to 'master'.


* js/ignore-cmake-build-artifacts (2020-09-17) 1 commit
 - cmake: ignore generated files

 Running CMake based build with VS (in contrib/) from the top-level
 of the working tree leaves extra build crufts behind.  Add patterns
 to .gitignore

 Expecting a resolution in a better way.
 cf. <xmqq7dsrnjhi.fsf@gitster.c.googlers.com>
 It turns out that these crufts are visible only when the CMake
 based build procedure is used against the best practice.  A better
 alternative may be to prominently describe the recommended way to
 use the CMake-based build procedure.


* hx/push-atomic-with-cert (2020-09-18) 1 commit
 - send-pack: run GPG after atomic push checking

 "git push" that wants to be atomic and wants to send push
 certificate learned not to prepare and sign the push certificate
 when it fails the local check (hence due to atomicity it is known
 that no certificate is needed).

 Expecting a reroll.
 cf. <xmqqft7eljkz.fsf@gitster.c.googlers.com>

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

* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
 - Documentation/git-send-email.txt: Mention less secure app access might need to enable.

 Doc update.

 Expecting a reroll.
 cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
 cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>


* jc/war-on-dashed-git (2020-08-27) 1 commit
 - git: catch an attempt to run "git-foo"

 The first step to remove on-disk binaries for built-in subcommands
 by soliciting objections.

 On hold for now.


* dr/push-remoteref-fix (2020-04-23) 1 commit
 - remote.c: fix handling of %(push:remoteref)

 The "%(push:remoteref)" placeholder in the "--format=" argument of
 "git format-patch" (and friends) only showed what got explicitly
 configured, not what ref at the receiving end would be updated when
 "git push" was used, as it ignored the default behaviour (e.g. update
 the same ref as the source).

 Discard for now.
 cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
 cf. <20200911214358.acl3hy2e763begoo@feanor>


* mk/use-size-t-in-zlib (2018-10-15) 1 commit
 - zlib.c: use size_t for size

 The wrapper to call into zlib followed our long tradition to use
 "unsigned long" for sizes of regions in memory, which have been
 updated to use "size_t".

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

* kk/build-portability-fix (2020-09-09) 1 commit
  (merged to 'next' on 2020-09-16 at 63f2672632)
 + Fit to Plan 9's ANSI/POSIX compatibility layer

 Portability tweak for some shell scripts used while building.

 Will merge to 'master'.


* al/ref-filter-merged-and-no-merged (2020-09-18) 5 commits
  (merged to 'next' on 2020-09-18 at cc2a0039f3)
 + Doc: prefer more specific file name
 + ref-filter: make internal reachable-filter API more precise
  (merged to 'next' on 2020-09-16 at b04e306660)
 + ref-filter: allow merged and no-merged filters
 + Doc: cover multiple contains/no-contains filters
 + t3201: test multiple branch filter combinations

 "git for-each-ref" and friends that list refs used to allow only
 one --merged or --no-merged to filter them; they learned to take
 combination of both kind of filtering.

 Will merge to 'master'.


* bc/faq-misc (2020-09-14) 3 commits
 - docs: explain how to deal with files that are always modified
 - docs: explain why reverts are not always applied on merge
 - docs: explain why squash merges are broken with long-running branches

 More FAQ entries.

 Expecting a reroll.
 cf. <20200913171206.GO241078@camp.crustytoothpaste.net>


* sb/clone-origin (2020-09-11) 4 commits
 - clone: allow configurable default for `-o`/`--origin`
 - clone: validate --origin option before use
 - clone: call git_config before parse_options
 - clone: add tests for --template and some disallowed option pairs

 "git clone" learned clone.defaultremotename configuration variable
 to customize what nickname to use to call the remote the repository
 was cloned from.

 Expecting an update.


* sk/force-if-includes (2020-09-14) 8 commits
 - SQUASH???
 - t: add tests for "force-if-includes"
 - doc: add reference for "--[no-]force-if-includes"
 - builtin/push: add option "--[no-]force-if-includes"
 - transport-helper: update ref status for "force-if-includes"
 - send-pack: check ref status for "force-if-includes"
 - transport: add flag for "--[no-]force-if-includes"
 - remote: add reflog check for "force-if-includes"


* ab/mediawiki-fixes (2020-09-16) 15 commits
 - remote-mediawiki tests: annotate failing tests
 - remote-mediawiki: fix duplicate revisions being imported
 - remote-mediawiki tests: use CLI installer
 - remote-mediawiki tests: use inline PerlIO for readability
 - remote-mediawiki tests: replace deprecated Perl construct
 - remote-mediawiki tests: use a more idiomatic dispatch table
 - remote-mediawiki tests: use "$dir/" instead of "$dir."
 - remote-mediawiki tests: change `[]` to `test`
 - remote-mediawiki tests: guard test_cmp with test_path_is_file
 - remote-mediawiki tests: use test_cmp in tests
 - remote-mediawiki tests: use a 10 character password
 - remote-mediawiki tests: use the login/password variables
 - remote-mediawiki doc: bump recommended PHP version to 7.3
 - remote-mediawiki doc: link to MediaWiki's current version
 - remote-mediawiki doc: correct link to GitHub project

 Modernization and fixes to MediaWiki remote backend.

 Expecting a reroll.


* ar/fetch-ipversion-in-all (2020-09-15) 1 commit
 - fetch: pass --ipv4 and --ipv6 options to sub-fetches

 "git fetch --all --ipv4/--ipv6" forgot to pass the protocol options
 to instances of the "git fetch" that talk to individual remotes,
 which has been corrected.

 Will merge to 'next'.


* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
 - config: option transfer.ipversion to set transport protocol version for network fetches

 Adds transfer.ipversion configuration variable.

 Needs more work.


* bc/clone-with-git-default-hash-fix (2020-09-15) 1 commit
 - builtin/clone: avoid failure with GIT_DEFAULT_HASH

 "git clone" that clones from SHA-1 repository, while
 GIT_DEFAULT_HASH set to use SHA-256 already, resulted in an
 unusable repository that half-claims to be SHA-256 repository
 with SHA-1 objects and refs.  This has been corrected.

 Expecting a reroll.


* cd/commit-graph-doc (2020-09-15) 1 commit
  (merged to 'next' on 2020-09-16 at b0816b6eb0)
 + commit-graph-format.txt: fix no-parent value

 Doc update.

 Will merge to 'master'.


* hn/reftable (2020-09-16) 13 commits
 - reftable: "test-tool dump-reftable" command.
 - reftable: rest of library
 - reftable: file level tests
 - reftable: read reftable files
 - reftable: write reftable files
 - reftable: a generic binary tree implementation
 - reftable: reading/writing blocks
 - reftable: (de)serialization for the polymorphic record type.
 - reftable: utility functions
 - reftable: add a barebones unittest framework
 - vcxproj: adjust for the reftable changes
 - reftable: define the public API
 - reftable: add LICENSE


* bc/rev-parse-path-format (2020-09-08) 1 commit
 - rev-parse: add option for absolute or relative path formatting

 "git rev-parse" can be explicitly told to give output as absolute
 or relative path.


* ds/maintenance-part-3 (2020-09-17) 7 commits
 - maintenance: add troubleshooting guide to docs
 - maintenance: recommended schedule in register/start
 - maintenance: add start/stop subcommands
 - maintenance: add [un]register subcommands
 - for-each-repo: run subcommands on configured repos
 - maintenance: add --schedule option and config
 - maintenance: optionally skip --auto process
 (this branch uses ds/maintenance-part-1 and ds/maintenance-part-2.)

 Parts of "git maintenance" to ease writing crontab entries (and
 other scheduling system configuration) for it.


* es/format-patch-interdiff-cleanup (2020-09-08) 3 commits
  (merged to 'next' on 2020-09-16 at d919bb3d1f)
 + format-patch: use 'origin' as start of current-series-range when known
 + diff-lib: tighten show_interdiff()'s interface
 + diff: move show_interdiff() from its own file to diff-lib

 Code cleanup and teach "format-patch --range-diff=<prev>
 <origin>..HEAD" not ignore <origin> when <prev> is a single
 version.

 Will merge to 'master'.


* os/fetch-submodule-optim (2020-09-06) 1 commit
  (merged to 'next' on 2020-09-16 at fa39e3f211)
 + fetch: do not look for submodule changes in unchanged refs

 Optimization around submodule handling.

 Will merge to 'master'.


* pw/add-p-edit-ita-path (2020-09-09) 1 commit
  (merged to 'next' on 2020-09-16 at 7540ed3c0e)
 + add -p: fix editing of intent-to-add paths

 "add -p" did not allow editing paths that were only added in
 intent.

 Will merge to 'master'.


* hn/refs-trace-backend (2020-09-09) 1 commit
  (merged to 'next' on 2020-09-16 at f2e065ec17)
 + refs: add GIT_TRACE_REFS debugging mechanism

 Developer support.

 Will merge to 'master'.


* tb/bloom-improvements (2020-09-18) 13 commits
 - commit-graph: introduce 'commitGraph.maxNewFilters'
 - builtin/commit-graph.c: introduce '--max-new-filters=<n>'
 - commit-graph: rename 'split_commit_graph_opts'
 - bloom: encode out-of-bounds filters as non-empty
 - bloom/diff: properly short-circuit on max_changes
 - bloom: use provided 'struct bloom_filter_settings'
 - bloom: split 'get_bloom_filter()' in two
 - commit-graph.c: store maximum changed paths
 - commit-graph: respect 'commitGraph.readChangedPaths'
 - t/helper/test-read-graph.c: prepare repo settings
 - commit-graph: pass a 'struct repository *' in more places
 - t4216: use an '&&'-chain
 - commit-graph: introduce 'get_bloom_filter_settings()'

 "git commit-graph write" learned to limit the number of bloom
 filters that are computed from scratch with the --max-new-filters
 option.

 Will merge to 'next'.


* es/config-hooks (2020-09-09) 9 commits
 - run_commit_hook: take strvec instead of varargs
 - commit: use config-based hooks
 - hook: replace run-command.h:find_hook
 - hook: add 'run' subcommand
 - parse-options: parse into strvec
 - hook: add --porcelain to list command
 - hook: add list command
 - hook: scaffolding for git-hook subcommand
 - doc: propose hooks managed by the config

 The "hooks defined in config" topic.


* ls/mergetool-meld-auto-merge (2020-09-16) 1 commit
  (merged to 'next' on 2020-09-16 at 01985a671b)
 + mergetool: allow auto-merge for meld to follow the vim-diff behavior

 The 'meld' backend of the "git mergetool" learned to give the
 underlying 'meld' the '--auto-merge' option, which would help
 reduce the amount of text that requires manual merging.

 Will merge to 'master'.


* mt/grep-sparse-checkout (2020-09-10) 9 commits
 - config: add setting to ignore sparsity patterns in some cmds
 - grep: honor sparse checkout patterns
 - config: correctly read worktree configs in submodules
 - config: make do_git_config_sequence receive a 'struct repository'
 - t/helper/test-config: unify exit labels
 - t/helper/test-config: diagnose missing arguments
 - t/helper/test-config: be consistent with exit codes
 - t1308-config-set: avoid false positives when using test-config
 - doc: grep: unify info on configuration variables

 "git grep" has been tweaked to be limited to the sparse checkout
 paths.


* ew/decline-core-abbrev (2020-09-01) 1 commit
 - core.abbrev <off|false|no> disables abbreviations

 Allow the configuration to specify no abbreviation regardless of
 the hash algorithm.

 Expecting a reroll.  The intent is very good.


* mr/bisect-in-c-2 (2020-08-31) 13 commits
 - bisect--helper: retire `--bisect-autostart` subcommand
 - bisect--helper: retire `--write-terms` subcommand
 - bisect--helper: retire `--check-expected-revs` subcommand
 - bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C
 - bisect--helper: retire `--next-all` subcommand
 - bisect--helper: retire `--bisect-clean-state` subcommand
 - bisect--helper: finish porting `bisect_start()` to C
 - bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C
 - bisect: call 'clear_commit_marks_all()' in 'bisect_next_all()'
 - bisect--helper: reimplement `bisect_autostart` shell function in C
 - bisect--helper: introduce new `write_in_file()` function
 - bisect--helper: use '-res' in 'cmd_bisect__helper' return
 - bisect--helper: BUG() in cmd_*() on invalid subcommand

 Rewrite of the "git bisect" script in C continues.

 At v7; getting close
 cf. <nycvar.QRO.7.76.6.2009031403510.56@tvgsbejvaqbjf.bet>


* js/no-builtins-on-disk-option (2020-08-24) 3 commits
 - ci: stop linking built-ins to the dashed versions
 - install: optionally skip linking/copying the built-ins
 - msvc: copy the correct `.pdb` files in the Makefile target `install`

 The installation procedure learned to optionally omit "git-foo"
 executable files for each 'foo' built-in subcommand, which are only
 required by old timers that still rely on the age old promise that
 prepending "git --exec-path" output to PATH early in their script
 will keep the "git-foo" calls they wrote working.

 The old attempt to remove these executables from the disk failed in
 the 1.6 era; it may be worth attempting again, but I think it is
 worth to keep this topic separate from such a policy change to help
 it graduate early.

 Expecting a reroll to update log message for the last one.
 as it confused at least two reviewers.
 cf. <xmqqwo1baop3.fsf@gitster.c.googlers.com>
 cf. <20200903104537.GA27325@szeder.dev>


* jt/threaded-index-pack (2020-09-08) 7 commits
  (merged to 'next' on 2020-09-16 at 8542385cc0)
 + index-pack: make quantum of work smaller
 + index-pack: make resolve_delta() assume base data
 + index-pack: calculate {ref,ofs}_{first,last} early
 + index-pack: remove redundant child field
 + index-pack: unify threaded and unthreaded code
 + index-pack: remove redundant parameter
 + Documentation: deltaBaseCacheLimit is per-thread

 "git index-pack" learned to resolve deltified objects with greater
 parallelism.

 Will merge to 'master'.


* jk/refspecs-negative (2020-09-18) 2 commits
 - SQUASH???
 - refspec: add support for negative refspecs

 "negative refspecs"

 Expecting a reroll.
 cf. <nycvar.QRO.7.76.6.2008221528170.56@tvgsbejvaqbjf.bet>
 cf. <xmqqzh5onea1.fsf@gitster.c.googlers.com>


* jx/proc-receive-hook (2020-08-27) 10 commits
  (merged to 'next' on 2020-09-18 at 344c89be7e)
 + doc: add documentation for the proc-receive hook
 + transport: parse report options for tracking refs
 + t5411: test updates of remote-tracking branches
 + receive-pack: new config receive.procReceiveRefs
 + doc: add document for capability report-status-v2
 + New capability "report-status-v2" for git-push
 + receive-pack: feed report options to post-receive
 + receive-pack: add new proc-receive hook
 + t5411: add basic test cases for proc-receive hook
 + transport: not report a non-head push as a branch

 "git receive-pack" that accepts requests by "git push" learned to
 outsource most of the ref updates to the new "proc-receive" hook.

 Will merge to 'master'.


* ds/maintenance-part-2 (2020-09-17) 8 commits
 - maintenance: add incremental-repack auto condition
 - maintenance: auto-size incremental-repack batch
 - maintenance: add incremental-repack task
 - midx: use start_delayed_progress()
 - midx: enable core.multiPackIndex by default
 - maintenance: create auto condition for loose-objects
 - maintenance: add loose-objects task
 - maintenance: add prefetch task
 (this branch is used by ds/maintenance-part-3; uses ds/maintenance-part-1.)

 "git maintenance", an extended big brother of "git gc", continues
 to evolve.


* ds/maintenance-part-1 (2020-09-17) 11 commits
  (merged to 'next' on 2020-09-18 at 4c367d3cf6)
 + maintenance: add trace2 regions for task execution
 + maintenance: add auto condition for commit-graph task
 + maintenance: use pointers to check --auto
 + maintenance: create maintenance.<task>.enabled config
 + maintenance: take a lock on the objects directory
 + maintenance: add --task option
 + maintenance: add commit-graph task
 + maintenance: initialize task array
 + maintenance: replace run_auto_gc()
 + maintenance: add --quiet option
 + maintenance: create basic maintenance runner
 (this branch is used by ds/maintenance-part-2 and ds/maintenance-part-3.)

 A "git gc"'s big brother has been introduced to take care of more
 repository maintenance tasks, not limited to the object database
 cleaning.

 Will merge to 'master'.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: What's cooking in git.git (Sep 2020, #05; Fri, 18)
  2020-09-19  1:41 What's cooking in git.git (Sep 2020, #05; Fri, 18) Junio C Hamano
@ 2020-09-19 21:13 ` René Scharfe
  2020-09-19 21:23   ` [PATCH 1/3] archive: read short blobs in archive.c::write_archive_entry() René Scharfe
                     ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: René Scharfe @ 2020-09-19 21:13 UTC (permalink / raw)
  To: Junio C Hamano, git

Am 19.09.20 um 03:41 schrieb Junio C Hamano:
> * jc/dist-tarball-tweak (2020-09-09) 1 commit
>   (merged to 'next' on 2020-09-10 at 36cbe7ee9e)
>  + Makefile: allow extra tweaking of distribution tarball
>
>  Allow maintainers to tweak $(TAR) invocations done while making
>  distribution tarballs.

Just noticed this one.  It reminds me of an alternative solution for
archives containing both tracked and untracked files gathering dust on
my disk because I didn't see much demand.  It goes the other way and
gives untracked files the same meta data as tracked ones.  Interested?

  archive: read short blobs in archive.c::write_archive_entry()
  archive: add --add-file
  Makefile: use git-archive --add-file

 Documentation/git-archive.txt |   6 ++
 Makefile                      |  41 ++++++------
 archive-tar.c                 |  22 +------
 archive-zip.c                 |  22 ++-----
 archive.c                     | 117 +++++++++++++++++++++++++++++++---
 archive.h                     |   9 ++-
 t/t5000-tar-tree.sh           |  29 +++++++++
 t/t5003-archive-zip.sh        |  28 ++++++++
 8 files changed, 203 insertions(+), 71 deletions(-)

--
2.28.0

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/3] archive: read short blobs in archive.c::write_archive_entry()
  2020-09-19 21:13 ` René Scharfe
@ 2020-09-19 21:23   ` René Scharfe
  2020-09-19 21:23   ` [PATCH 2/3] archive: add --add-file René Scharfe
                     ` (2 subsequent siblings)
  3 siblings, 0 replies; 7+ messages in thread
From: René Scharfe @ 2020-09-19 21:23 UTC (permalink / raw)
  To: Junio C Hamano, git

Centralize reading of symlink destinations and the contents of regular
files that are too small to be streamed.  This reduces code duplication
and allows future patches to add support for adding non-tracked files to
archives.  The backends are expected to stream blobs if buffer is NULL.

object_file_to_archive() is only called from archive.c and thus no
longer exported.

Signed-off-by: René Scharfe <l.s.r@web.de>
---
 archive-tar.c | 22 +++-------------------
 archive-zip.c | 22 +++++-----------------
 archive.c     | 31 ++++++++++++++++++++++++-------
 archive.h     |  7 ++-----
 4 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/archive-tar.c b/archive-tar.c
index 5ceec3684b..f1a1447ebd 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -242,13 +242,12 @@ static void write_extended_header(struct archiver_args *args,
 static int write_tar_entry(struct archiver_args *args,
 			   const struct object_id *oid,
 			   const char *path, size_t pathlen,
-			   unsigned int mode)
+			   unsigned int mode,
+			   void *buffer, unsigned long size)
 {
 	struct ustar_header header;
 	struct strbuf ext_header = STRBUF_INIT;
-	unsigned int old_mode = mode;
-	unsigned long size, size_in_header;
-	void *buffer;
+	unsigned long size_in_header;
 	int err = 0;

 	memset(&header, 0, sizeof(header));
@@ -282,20 +281,6 @@ static int write_tar_entry(struct archiver_args *args,
 	} else
 		memcpy(header.name, path, pathlen);

-	if (S_ISREG(mode) && !args->convert &&
-	    oid_object_info(args->repo, oid, &size) == OBJ_BLOB &&
-	    size > big_file_threshold)
-		buffer = NULL;
-	else if (S_ISLNK(mode) || S_ISREG(mode)) {
-		enum object_type type;
-		buffer = object_file_to_archive(args, path, oid, old_mode, &type, &size);
-		if (!buffer)
-			return error(_("cannot read %s"), oid_to_hex(oid));
-	} else {
-		buffer = NULL;
-		size = 0;
-	}
-
 	if (S_ISLNK(mode)) {
 		if (size > sizeof(header.linkname)) {
 			xsnprintf(header.linkname, sizeof(header.linkname),
@@ -326,7 +311,6 @@ static int write_tar_entry(struct archiver_args *args,
 		else
 			err = stream_blocked(args->repo, oid);
 	}
-	free(buffer);
 	return err;
 }

diff --git a/archive-zip.c b/archive-zip.c
index e9f426298b..2961e01c75 100644
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -285,7 +285,8 @@ static int entry_is_binary(struct index_state *istate, const char *path,
 static int write_zip_entry(struct archiver_args *args,
 			   const struct object_id *oid,
 			   const char *path, size_t pathlen,
-			   unsigned int mode)
+			   unsigned int mode,
+			   void *buffer, unsigned long size)
 {
 	struct zip_local_header header;
 	uintmax_t offset = zip_offset;
@@ -299,10 +300,8 @@ static int write_zip_entry(struct archiver_args *args,
 	enum zip_method method;
 	unsigned char *out;
 	void *deflated = NULL;
-	void *buffer;
 	struct git_istream *stream = NULL;
 	unsigned long flags = 0;
-	unsigned long size;
 	int is_binary = -1;
 	const char *path_without_prefix = path + args->baselen;
 	unsigned int creator_version = 0;
@@ -328,13 +327,8 @@ static int write_zip_entry(struct archiver_args *args,
 		method = ZIP_METHOD_STORE;
 		attr2 = 16;
 		out = NULL;
-		size = 0;
 		compressed_size = 0;
-		buffer = NULL;
 	} else if (S_ISREG(mode) || S_ISLNK(mode)) {
-		enum object_type type = oid_object_info(args->repo, oid,
-							&size);
-
 		method = ZIP_METHOD_STORE;
 		attr2 = S_ISLNK(mode) ? ((mode | 0777) << 16) :
 			(mode & 0111) ? ((mode) << 16) : 0;
@@ -343,21 +337,16 @@ static int write_zip_entry(struct archiver_args *args,
 		if (S_ISREG(mode) && args->compression_level != 0 && size > 0)
 			method = ZIP_METHOD_DEFLATE;

-		if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert &&
-		    size > big_file_threshold) {
+		if (!buffer) {
+			enum object_type type;
 			stream = open_istream(args->repo, oid, &type, &size,
 					      NULL);
 			if (!stream)
 				return error(_("cannot stream blob %s"),
 					     oid_to_hex(oid));
 			flags |= ZIP_STREAM;
-			out = buffer = NULL;
+			out = NULL;
 		} else {
-			buffer = object_file_to_archive(args, path, oid, mode,
-							&type, &size);
-			if (!buffer)
-				return error(_("cannot read %s"),
-					     oid_to_hex(oid));
 			crc = crc32(crc, buffer, size);
 			is_binary = entry_is_binary(args->repo->index,
 						    path_without_prefix,
@@ -511,7 +500,6 @@ static int write_zip_entry(struct archiver_args *args,
 	}

 	free(deflated);
-	free(buffer);

 	if (compressed_size > 0xffffffff || size > 0xffffffff ||
 	    offset > 0xffffffff) {
diff --git a/archive.c b/archive.c
index 0de6048bfc..4fbe5329c5 100644
--- a/archive.c
+++ b/archive.c
@@ -70,10 +70,12 @@ static void format_subst(const struct commit *commit,
 	free(to_free);
 }

-void *object_file_to_archive(const struct archiver_args *args,
-			     const char *path, const struct object_id *oid,
-			     unsigned int mode, enum object_type *type,
-			     unsigned long *sizep)
+static void *object_file_to_archive(const struct archiver_args *args,
+				    const char *path,
+				    const struct object_id *oid,
+				    unsigned int mode,
+				    enum object_type *type,
+				    unsigned long *sizep)
 {
 	void *buffer;
 	const struct commit *commit = args->convert ? args->commit : NULL;
@@ -145,6 +147,9 @@ static int write_archive_entry(const struct object_id *oid, const char *base,
 	write_archive_entry_fn_t write_entry = c->write_entry;
 	int err;
 	const char *path_without_prefix;
+	unsigned long size;
+	void *buffer;
+	enum object_type type;

 	args->convert = 0;
 	strbuf_reset(&path);
@@ -167,7 +172,7 @@ static int write_archive_entry(const struct object_id *oid, const char *base,
 	if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
 		if (args->verbose)
 			fprintf(stderr, "%.*s\n", (int)path.len, path.buf);
-		err = write_entry(args, oid, path.buf, path.len, mode);
+		err = write_entry(args, oid, path.buf, path.len, mode, NULL, 0);
 		if (err)
 			return err;
 		return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
@@ -175,7 +180,19 @@ static int write_archive_entry(const struct object_id *oid, const char *base,

 	if (args->verbose)
 		fprintf(stderr, "%.*s\n", (int)path.len, path.buf);
-	return write_entry(args, oid, path.buf, path.len, mode);
+
+	/* Stream it? */
+	if (S_ISREG(mode) && !args->convert &&
+	    oid_object_info(args->repo, oid, &size) == OBJ_BLOB &&
+	    size > big_file_threshold)
+		return write_entry(args, oid, path.buf, path.len, mode, NULL, size);
+
+	buffer = object_file_to_archive(args, path.buf, oid, mode, &type, &size);
+	if (!buffer)
+		return error(_("cannot read %s"), oid_to_hex(oid));
+	err = write_entry(args, oid, path.buf, path.len, mode, buffer, size);
+	free(buffer);
+	return err;
 }

 static void queue_directory(const unsigned char *sha1,
@@ -265,7 +282,7 @@ int write_archive_entries(struct archiver_args *args,
 		if (args->verbose)
 			fprintf(stderr, "%.*s\n", (int)len, args->base);
 		err = write_entry(args, &args->tree->object.oid, args->base,
-				  len, 040777);
+				  len, 040777, NULL, 0);
 		if (err)
 			return err;
 	}
diff --git a/archive.h b/archive.h
index 3bd96bf6bb..d83b41a01f 100644
--- a/archive.h
+++ b/archive.h
@@ -49,12 +49,9 @@ void init_archivers(void);
 typedef int (*write_archive_entry_fn_t)(struct archiver_args *args,
 					const struct object_id *oid,
 					const char *path, size_t pathlen,
-					unsigned int mode);
+					unsigned int mode,
+					void *buffer, unsigned long size);

 int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry);
-void *object_file_to_archive(const struct archiver_args *args,
-			     const char *path, const struct object_id *oid,
-			     unsigned int mode, enum object_type *type,
-			     unsigned long *sizep);

 #endif	/* ARCHIVE_H */
--
2.28.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 2/3] archive: add --add-file
  2020-09-19 21:13 ` René Scharfe
  2020-09-19 21:23   ` [PATCH 1/3] archive: read short blobs in archive.c::write_archive_entry() René Scharfe
@ 2020-09-19 21:23   ` René Scharfe
  2020-09-19 21:23   ` [PATCH 3/3] Makefile: use git-archive --add-file René Scharfe
  2020-09-19 22:35   ` What's cooking in git.git (Sep 2020, #05; Fri, 18) Junio C Hamano
  3 siblings, 0 replies; 7+ messages in thread
From: René Scharfe @ 2020-09-19 21:23 UTC (permalink / raw)
  To: Junio C Hamano, git

Allow users to append non-tracked files.  This simplifies the generation
of source packages with a few extra files, e.g. containing version
information.  They get the same access times and user information as
tracked files.

Signed-off-by: René Scharfe <l.s.r@web.de>
---
 Documentation/git-archive.txt |  6 +++
 archive.c                     | 86 ++++++++++++++++++++++++++++++++++-
 archive.h                     |  2 +
 t/t5000-tar-tree.sh           | 29 ++++++++++++
 t/t5003-archive-zip.sh        | 28 ++++++++++++
 5 files changed, 150 insertions(+), 1 deletion(-)

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index cfa1e4ebe4..9f8172828d 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -55,6 +55,12 @@ OPTIONS
 --output=<file>::
 	Write the archive to <file> instead of stdout.

+--add-file=<file>::
+	Add a non-tracked file to the archive.  Can be repeated to add
+	multiple files.  The path of the file in the archive is built
+	by concatenating the value for `--prefix` (if any) and the
+	basename of <file>.
+
 --worktree-attributes::
 	Look for attributes in .gitattributes files in the working tree
 	as well (see <<ATTRIBUTES>>).
diff --git a/archive.c b/archive.c
index 4fbe5329c5..3c1541af9e 100644
--- a/archive.c
+++ b/archive.c
@@ -266,6 +266,11 @@ static int queue_or_write_archive_entry(const struct object_id *oid,
 				   stage, context);
 }

+struct extra_file_info {
+	char *base;
+	struct stat stat;
+};
+
 int write_archive_entries(struct archiver_args *args,
 		write_archive_entry_fn_t write_entry)
 {
@@ -273,6 +278,10 @@ int write_archive_entries(struct archiver_args *args,
 	struct unpack_trees_options opts;
 	struct tree_desc t;
 	int err;
+	struct strbuf path_in_archive = STRBUF_INIT;
+	struct strbuf content = STRBUF_INIT;
+	struct object_id fake_oid = null_oid;
+	int i;

 	if (args->baselen > 0 && args->base[args->baselen - 1] == '/') {
 		size_t len = args->baselen;
@@ -318,6 +327,33 @@ int write_archive_entries(struct archiver_args *args,
 		free(context.bottom);
 		context.bottom = next;
 	}
+
+	for (i = 0; i < args->extra_files.nr; i++) {
+		struct string_list_item *item = args->extra_files.items + i;
+		char *path = item->string;
+		struct extra_file_info *info = item->util;
+
+		put_be64(fake_oid.hash, i + 1);
+
+		strbuf_reset(&path_in_archive);
+		if (info->base)
+			strbuf_addstr(&path_in_archive, info->base);
+		strbuf_addstr(&path_in_archive, basename(path));
+
+		strbuf_reset(&content);
+		if (strbuf_read_file(&content, path, info->stat.st_size) < 0)
+			err = error_errno(_("could not read '%s'"), path);
+		else
+			err = write_entry(args, &fake_oid, path_in_archive.buf,
+					  path_in_archive.len,
+					  info->stat.st_mode,
+					  content.buf, content.len);
+		if (err)
+			break;
+	}
+	strbuf_release(&path_in_archive);
+	strbuf_release(&content);
+
 	return err;
 }

@@ -457,6 +493,42 @@ static void parse_treeish_arg(const char **argv,
 	ar_args->time = archive_time;
 }

+static void extra_file_info_clear(void *util, const char *str)
+{
+	struct extra_file_info *info = util;
+	free(info->base);
+	free(info);
+}
+
+static int add_file_cb(const struct option *opt, const char *arg, int unset)
+{
+	struct archiver_args *args = opt->value;
+	const char **basep = (const char **)opt->defval;
+	const char *base = *basep;
+	char *path;
+	struct string_list_item *item;
+	struct extra_file_info *info;
+
+	if (unset) {
+		string_list_clear_func(&args->extra_files,
+				       extra_file_info_clear);
+		return 0;
+	}
+
+	if (!arg)
+		return -1;
+
+	path = prefix_filename(args->prefix, arg);
+	item = string_list_append_nodup(&args->extra_files, path);
+	item->util = info = xmalloc(sizeof(*info));
+	info->base = xstrdup_or_null(base);
+	if (stat(path, &info->stat))
+		die(_("File not found: %s"), path);
+	if (!S_ISREG(info->stat.st_mode))
+		die(_("Not a regular file: %s"), path);
+	return 0;
+}
+
 #define OPT__COMPR(s, v, h, p) \
 	OPT_SET_INT_F(s, NULL, v, h, p, PARSE_OPT_NONEG)
 #define OPT__COMPR_HIDDEN(s, v, p) \
@@ -481,6 +553,9 @@ static int parse_archive_args(int argc, const char **argv,
 		OPT_STRING(0, "format", &format, N_("fmt"), N_("archive format")),
 		OPT_STRING(0, "prefix", &base, N_("prefix"),
 			N_("prepend prefix to each pathname in the archive")),
+		{ OPTION_CALLBACK, 0, "add-file", args, N_("file"),
+		  N_("add untracked file to archive"), 0, add_file_cb,
+		  (intptr_t)&base },
 		OPT_STRING('o', "output", &output, N_("file"),
 			N_("write the archive to this file")),
 		OPT_BOOL(0, "worktree-attributes", &worktree_attributes,
@@ -515,6 +590,8 @@ static int parse_archive_args(int argc, const char **argv,
 		die(_("Option --exec can only be used together with --remote"));
 	if (output)
 		die(_("Unexpected option --output"));
+	if (is_remote && args->extra_files.nr)
+		die(_("Options --add-file and --remote cannot be used together"));

 	if (!base)
 		base = "";
@@ -561,11 +638,14 @@ int write_archive(int argc, const char **argv, const char *prefix,
 {
 	const struct archiver *ar = NULL;
 	struct archiver_args args;
+	int rc;

 	git_config_get_bool("uploadarchive.allowunreachable", &remote_allow_unreachable);
 	git_config(git_default_config, NULL);

 	args.repo = repo;
+	args.prefix = prefix;
+	string_list_init(&args.extra_files, 1);
 	argc = parse_archive_args(argc, argv, &ar, &args, name_hint, remote);
 	if (!startup_info->have_repository) {
 		/*
@@ -579,7 +659,11 @@ int write_archive(int argc, const char **argv, const char *prefix,
 	parse_treeish_arg(argv, &args, prefix, remote);
 	parse_pathspec_arg(argv + 1, &args);

-	return ar->write_archive(ar, &args);
+	rc = ar->write_archive(ar, &args);
+
+	string_list_clear_func(&args.extra_files, extra_file_info_clear);
+
+	return rc;
 }

 static int match_extension(const char *filename, const char *ext)
diff --git a/archive.h b/archive.h
index d83b41a01f..82b226011a 100644
--- a/archive.h
+++ b/archive.h
@@ -9,6 +9,7 @@ struct repository;
 struct archiver_args {
 	struct repository *repo;
 	const char *refname;
+	const char *prefix;
 	const char *base;
 	size_t baselen;
 	struct tree *tree;
@@ -20,6 +21,7 @@ struct archiver_args {
 	unsigned int worktree_attributes : 1;
 	unsigned int convert : 1;
 	int compression_level;
+	struct string_list extra_files;
 };

 /* main api */
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 37655a237c..3ebb0d3b65 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -94,6 +94,16 @@ check_tar() {
 	'
 }

+check_added() {
+	dir=$1
+	path_in_fs=$2
+	path_in_archive=$3
+
+	test_expect_success " validate extra file $path_in_archive" '
+		diff -r $path_in_fs $dir/$path_in_archive
+	'
+}
+
 test_expect_success 'setup' '
 	test_oid_cache <<-EOF
 	obj sha1:19f9c8273ec45a8938e6999cb59b3ff66739902a
@@ -164,6 +174,25 @@ test_expect_success 'git-archive --prefix=olde-' '

 check_tar with_olde-prefix olde-

+test_expect_success 'git archive --add-file' '
+	echo untracked >untracked &&
+	git archive --add-file=untracked HEAD >with_untracked.tar
+'
+
+check_tar with_untracked
+check_added with_untracked untracked untracked
+
+test_expect_success 'git archive --add-file twice' '
+	echo untracked >untracked &&
+	git archive --prefix=one/ --add-file=untracked \
+		--prefix=two/ --add-file=untracked \
+		--prefix= HEAD >with_untracked2.tar
+'
+
+check_tar with_untracked2
+check_added with_untracked2 untracked one/untracked
+check_added with_untracked2 untracked two/untracked
+
 test_expect_success 'git archive on large files' '
     test_config core.bigfilethreshold 1 &&
     git archive HEAD >b3.tar &&
diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh
index 3b76d2eb65..1e6d18b140 100755
--- a/t/t5003-archive-zip.sh
+++ b/t/t5003-archive-zip.sh
@@ -72,6 +72,16 @@ check_zip() {
 	"
 }

+check_added() {
+	dir=$1
+	path_in_fs=$2
+	path_in_archive=$3
+
+	test_expect_success UNZIP " validate extra file $path_in_archive" '
+		diff -r $path_in_fs $dir/$path_in_archive
+	'
+}
+
 test_expect_success \
     'populate workdir' \
     'mkdir a &&
@@ -188,4 +198,22 @@ test_expect_success 'git archive --format=zip on large files' '

 check_zip large-compressed

+test_expect_success 'git archive --format=zip --add-file' '
+	echo untracked >untracked &&
+	git archive --format=zip --add-file=untracked HEAD >with_untracked.zip
+'
+
+check_zip with_untracked
+check_added with_untracked untracked untracked
+
+test_expect_success 'git archive --format=zip --add-file twice' '
+	echo untracked >untracked &&
+	git archive --format=zip --prefix=one/ --add-file=untracked \
+		--prefix=two/ --add-file=untracked \
+		--prefix= HEAD >with_untracked2.zip
+'
+check_zip with_untracked2
+check_added with_untracked2 untracked one/untracked
+check_added with_untracked2 untracked two/untracked
+
 test_done
--
2.28.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 3/3] Makefile: use git-archive --add-file
  2020-09-19 21:13 ` René Scharfe
  2020-09-19 21:23   ` [PATCH 1/3] archive: read short blobs in archive.c::write_archive_entry() René Scharfe
  2020-09-19 21:23   ` [PATCH 2/3] archive: add --add-file René Scharfe
@ 2020-09-19 21:23   ` René Scharfe
  2020-09-19 22:35   ` What's cooking in git.git (Sep 2020, #05; Fri, 18) Junio C Hamano
  3 siblings, 0 replies; 7+ messages in thread
From: René Scharfe @ 2020-09-19 21:23 UTC (permalink / raw)
  To: Junio C Hamano, git

Add untracked files for the dist target directly using git archive
instead of calling tar cr to append them.  This reduces the dependency
on external tools and gives the untracked files the same access times
and user information as tracked ones, integrating them seamlessly.

Signed-off-by: René Scharfe <l.s.r@web.de>
---
 Makefile | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index f1b1bc8aa0..56bf12b238 100644
--- a/Makefile
+++ b/Makefile
@@ -3045,32 +3045,29 @@ quick-install-html:
 # With GNU tar, "--mode=u+rwX,og+rX,og-w" would be a good idea, for example.
 TAR_DIST_EXTRA_OPTS =
 GIT_TARNAME = git-$(GIT_VERSION)
+GIT_ARCHIVE_EXTRA_FILES = \
+	--prefix=$(GIT_TARNAME)/ \
+	--add-file=configure \
+	--add-file=$(GIT_TARNAME)/version \
+	--prefix=$(GIT_TARNAME)/git-gui/ \
+	--add-file=$(GIT_TARNAME)/git-gui/version
+ifdef DC_SHA1_SUBMODULE
+GIT_ARCHIVE_EXTRA_FILES += \
+	--prefix=$(GIT_TARNAME)/sha1collisiondetection/ \
+	--add-file=sha1collisiondetection/LICENSE.txt \
+	--prefix=$(GIT_TARNAME)/sha1collisiondetection/lib/ \
+	--add-file=sha1collisiondetection/lib/sha1.c \
+	--add-file=sha1collisiondetection/lib/sha1.h \
+	--add-file=sha1collisiondetection/lib/ubc_check.c \
+	--add-file=sha1collisiondetection/lib/ubc_check.h
+endif
 dist: git-archive$(X) configure
-	./git-archive --format=tar \
-		--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
 	@mkdir -p $(GIT_TARNAME)
-	@cp configure $(GIT_TARNAME)
 	@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
 	@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
-	$(TAR) rf $(GIT_TARNAME).tar $(TAR_DIST_EXTRA_OPTS) \
-		$(GIT_TARNAME)/configure \
-		$(GIT_TARNAME)/version \
-		$(GIT_TARNAME)/git-gui/version
-ifdef DC_SHA1_SUBMODULE
-	@mkdir -p $(GIT_TARNAME)/sha1collisiondetection/lib
-	@cp sha1collisiondetection/LICENSE.txt \
-		$(GIT_TARNAME)/sha1collisiondetection/
-	@cp sha1collisiondetection/LICENSE.txt \
-		$(GIT_TARNAME)/sha1collisiondetection/
-	@cp sha1collisiondetection/lib/sha1.[ch] \
-		$(GIT_TARNAME)/sha1collisiondetection/lib/
-	@cp sha1collisiondetection/lib/ubc_check.[ch] \
-		$(GIT_TARNAME)/sha1collisiondetection/lib/
-	$(TAR) rf $(GIT_TARNAME).tar $(TAR_DIST_EXTRA_OPTS) \
-		$(GIT_TARNAME)/sha1collisiondetection/LICENSE.txt \
-		$(GIT_TARNAME)/sha1collisiondetection/lib/sha1.[ch] \
-		$(GIT_TARNAME)/sha1collisiondetection/lib/ubc_check.[ch]
-endif
+	./git-archive --format=tar \
+		$(GIT_ARCHIVE_EXTRA_FILES) \
+		--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
 	@$(RM) -r $(GIT_TARNAME)
 	gzip -f -9 $(GIT_TARNAME).tar

--
2.28.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: What's cooking in git.git (Sep 2020, #05; Fri, 18)
  2020-09-19 21:13 ` René Scharfe
                     ` (2 preceding siblings ...)
  2020-09-19 21:23   ` [PATCH 3/3] Makefile: use git-archive --add-file René Scharfe
@ 2020-09-19 22:35   ` Junio C Hamano
  2020-09-20  7:58     ` René Scharfe
  3 siblings, 1 reply; 7+ messages in thread
From: Junio C Hamano @ 2020-09-19 22:35 UTC (permalink / raw)
  To: René Scharfe; +Cc: git

René Scharfe <l.s.r@web.de> writes:

> Am 19.09.20 um 03:41 schrieb Junio C Hamano:
>> * jc/dist-tarball-tweak (2020-09-09) 1 commit
>>   (merged to 'next' on 2020-09-10 at 36cbe7ee9e)
>>  + Makefile: allow extra tweaking of distribution tarball
>>
>>  Allow maintainers to tweak $(TAR) invocations done while making
>>  distribution tarballs.
>
> Just noticed this one.  It reminds me of an alternative solution for
> archives containing both tracked and untracked files gathering dust on
> my disk because I didn't see much demand.  It goes the other way and
> gives untracked files the same meta data as tracked ones.  Interested?
>
>   archive: read short blobs in archive.c::write_archive_entry()
>   archive: add --add-file
>   Makefile: use git-archive --add-file

Oooh, so is the idea that we do not have to use $(TAR) to append
untracked ones to "git archive" output, etc.?  If we can get rid of
all $(TAR) invocations from the build procedure, that would be an
interesting addition.

;-)

>
>  Documentation/git-archive.txt |   6 ++
>  Makefile                      |  41 ++++++------
>  archive-tar.c                 |  22 +------
>  archive-zip.c                 |  22 ++-----
>  archive.c                     | 117 +++++++++++++++++++++++++++++++---
>  archive.h                     |   9 ++-
>  t/t5000-tar-tree.sh           |  29 +++++++++
>  t/t5003-archive-zip.sh        |  28 ++++++++
>  8 files changed, 203 insertions(+), 71 deletions(-)
>
> --
> 2.28.0

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: What's cooking in git.git (Sep 2020, #05; Fri, 18)
  2020-09-19 22:35   ` What's cooking in git.git (Sep 2020, #05; Fri, 18) Junio C Hamano
@ 2020-09-20  7:58     ` René Scharfe
  0 siblings, 0 replies; 7+ messages in thread
From: René Scharfe @ 2020-09-20  7:58 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Am 20.09.20 um 00:35 schrieb Junio C Hamano:
> René Scharfe <l.s.r@web.de> writes:
>
>> Am 19.09.20 um 03:41 schrieb Junio C Hamano:
>>> * jc/dist-tarball-tweak (2020-09-09) 1 commit
>>>   (merged to 'next' on 2020-09-10 at 36cbe7ee9e)
>>>  + Makefile: allow extra tweaking of distribution tarball
>>>
>>>  Allow maintainers to tweak $(TAR) invocations done while making
>>>  distribution tarballs.
>>
>> Just noticed this one.  It reminds me of an alternative solution for
>> archives containing both tracked and untracked files gathering dust on
>> my disk because I didn't see much demand.  It goes the other way and
>> gives untracked files the same meta data as tracked ones.  Interested?
>>
>>   archive: read short blobs in archive.c::write_archive_entry()
>>   archive: add --add-file
>>   Makefile: use git-archive --add-file
>
> Oooh, so is the idea that we do not have to use $(TAR) to append
> untracked ones to "git archive" output, etc.?  If we can get rid of
> all $(TAR) invocations from the build procedure, that would be an
> interesting addition.

The remaining ones are used in the targets install and install-man-perl
for copying po files, Perl libraries and manpages; in artifacts-tar for
archiving binaries etc. and in dist-doc for archiving manpages and HTML
files.

git archive can only solve half of the copy use case at most, so $(TAR)
will still be used -- unless it's replaced by cp+chmod or something
else.

Not sure how to support artifacts-tar.  Allowing git-archive calls
without commit or tree might be a start.  Letting --add-file record the
full relative path of an untracked entry instead of its basename would
help, perhaps counterbalanced with an additional --strip option similar
to the one of patch(1).

dist-doc tars up directories.  This would require adding support for
reading directories to --add-file or adding --add-directory.

René

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-09-20  8:03 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-19  1:41 What's cooking in git.git (Sep 2020, #05; Fri, 18) Junio C Hamano
2020-09-19 21:13 ` René Scharfe
2020-09-19 21:23   ` [PATCH 1/3] archive: read short blobs in archive.c::write_archive_entry() René Scharfe
2020-09-19 21:23   ` [PATCH 2/3] archive: add --add-file René Scharfe
2020-09-19 21:23   ` [PATCH 3/3] Makefile: use git-archive --add-file René Scharfe
2020-09-19 22:35   ` What's cooking in git.git (Sep 2020, #05; Fri, 18) Junio C Hamano
2020-09-20  7:58     ` René Scharfe

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).