git

git:seen

Last commit made on 2021-11-25
Get this branch:
git clone -b seen https://git.launchpad.net/git

Branch merges

Branch information

Name:
seen
Repository:
lp:git

Recent commits

364565c... by Junio C Hamano <email address hidden>

Merge branch 'js/scalar' into seen

Add pieces from "scalar" to contrib/.

* js/scalar:
  scalar: implement the `version` command
  scalar: implement the `delete` command
  scalar: teach 'reconfigure' to optionally handle all registered enlistments
  scalar: allow reconfiguring an existing enlistment
  scalar: implement the `run` command
  scalar: teach 'clone' to support the --single-branch option
  scalar: implement the `clone` subcommand
  scalar: implement 'scalar list'
  scalar: let 'unregister' handle a deleted enlistment directory gracefully
  scalar: 'unregister' stops background maintenance
  scalar: 'register' sets recommended config and starts maintenance
  ci: also run the `scalar` tests
  cmake: optionally build `scalar`, too
  scalar: create test infrastructure
  scalar: start documenting the command
  scalar: create a rudimentary executable
  scalar: add a README with a roadmap

0ec63e1... by Junio C Hamano <email address hidden>

Merge branch 'ab/ci-updates' into seen

* ab/ci-updates:
  CI: don't run "make test" twice in one job
  CI: use "$runs_on_pool", not "$jobname" to select packages & config
  CI: rename the "Linux32" job to lower-case "linux32"
  CI: use shorter names that fit in UX tooltips
  CI: remove Travis CI support

fed5ebe... by Junio C Hamano <email address hidden>

Merge branch 'hn/reflog-tests' into seen

* hn/reflog-tests:
  t1400: use test-helper ref-store to inspect reflog contents
  test-ref-store: tweaks to for-each-reflog-ent format
  refs: trim newline from reflog message
  show-branch: show reflog message

141ada7... by Junio C Hamano <email address hidden>

Merge branch 'ab/make-dependency' into seen

* ab/make-dependency: (23 commits)
  Makefile: move ".SUFFIXES" rule to shared.mak
  Makefile: define $(LIB_H) in terms of $(FIND_SOURCE_FILES)
  Makefile: disable GNU make built-in wildcard rules
  Makefile: use $(file) I/O instead of "FORCE" when possible
  Makefile: correct the dependency graph of hook-list.h
  Makefiles: add and use wildcard "mkdir -p" template
  Makefile: use $(wspfx) for $(QUIET...) in shared.mak
  Makefile: add "$(QUIET)" boilerplate to shared.mak
  Makefile: add a "TRACK_template" for GIT-*{FLAGS,DEFINES,...}
  Makefile: re-add and use the "shellquote" macros
  Makefile: move $(comma), $(empty) and $(space) to shared.mak
  Makefiles: add "shared.mak", move ".DELETE_ON_ERROR" to it
  Makefile: stop needing @@GIT_VERSION@@ in *.perl scripts
  Makefile: create a GIT-PYTHON-DEFINES, like "PERL"
  Makefile: correct "GIT-PERL-{DEFINES,HEADER}" dependency graph
  Makefile: adjust Perl-related comments & whitespace
  Makefile: change "ifndef NO_PERL" to "ifdef NO_PERL"
  Makefile: guard Perl-only variable assignments
  Makefile: remove "mv $@ $@+" dance redundant to .DELETE_ON_ERROR
  Makefile: clean perl/build/ even with NO_PERL=Y
  ...

bb0047d... by Junio C Hamano <email address hidden>

Merge branch 'ab/parse-options-cleanup' into seen

Change the type of an internal function to return an enum (instead
of int) and replace -2 that was used to signal an error with -1.

* ab/parse-options-cleanup:
  parse-options.c: use "enum parse_opt_result" for parse_nodash_opt()

e980219... by Junio C Hamano <email address hidden>

Merge branch 'rj/receive-pack-avoid-sigpipe-during-status-reporting' into seen

When the "git push" command is killed while the receiving end is
trying to report what happened to the ref update proposals, the
latter used to die, due to SIGPIPE. The code now ignores SIGPIPE
to increase our chances to run the post-receive hook after it
happens.

* rj/receive-pack-avoid-sigpipe-during-status-reporting:
  receive-pack: ignore SIGPIPE while reporting status to client

3921235... by Junio C Hamano <email address hidden>

Merge branch 'ab/mark-leak-free-tests-even-more' into seen

More tests are marked as leak-free.

* ab/mark-leak-free-tests-even-more:
  leak tests: mark some fast-import tests as passing with SANITIZE=leak
  leak tests: mark some config tests as passing with SANITIZE=leak
  leak tests: mark some status tests as passing with SANITIZE=leak
  leak tests: mark some clone tests as passing with SANITIZE=leak
  leak tests: mark some add tests as passing with SANITIZE=leak
  leak tests: mark some diff tests as passing with SANITIZE=leak
  leak tests: mark some apply tests as passing with SANITIZE=leak
  leak tests: mark some notes tests as passing with SANITIZE=leak
  leak tests: mark some update-index tests as passing with SANITIZE=leak
  leak tests: mark some rev-parse tests as passing with SANITIZE=leak
  leak tests: mark some rev-list tests as passing with SANITIZE=leak
  leak tests: mark some misc tests as passing with SANITIZE=leak
  leak tests: mark most gettext tests as passing with SANITIZE=leak
  leak tests: mark "sort" test as passing SANITIZE=leak
  leak tests: mark a read-tree test as passing SANITIZE=leak

f6ede8e... by Junio C Hamano <email address hidden>

Merge branch 'es/pretty-describe-more' into seen

Extend "git log --format=%(describe)" placeholder to allow passing
selected command-line options to the underlying "git describe"
command.

* es/pretty-describe-more:
  pretty: add abbrev option to %(describe)
  pretty: add tag option to %(describe)
  pretty.c: rework describe options parsing for better extensibility

2e1da36... by Junio C Hamano <email address hidden>

Merge branch 'jh/builtin-fsmonitor-part2' into seen

Built-in fsmonitor (part 2).

* jh/builtin-fsmonitor-part2: (29 commits)
  t7527: test status with untracked-cache and fsmonitor--daemon
  fsmonitor: force update index after large responses
  fsmonitor--daemon: use a cookie file to sync with file system
  fsmonitor--daemon: periodically truncate list of modified files
  t/perf/p7519: add fsmonitor--daemon test cases
  t/perf/p7519: speed up test on Windows
  t/helper/test-chmtime: skip directories on Windows
  t/perf: avoid copying builtin fsmonitor files into test repo
  t7527: create test for fsmonitor--daemon
  t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon
  help: include fsmonitor--daemon feature flag in version info
  fsmonitor--daemon: implement handle_client callback
  compat/fsmonitor/fsm-listen-darwin: implement FSEvent listener on MacOS
  compat/fsmonitor/fsm-listen-darwin: add macos header files for FSEvent
  compat/fsmonitor/fsm-listen-win32: implement FSMonitor backend on Windows
  fsmonitor--daemon: create token-based changed path cache
  fsmonitor--daemon: define token-ids
  fsmonitor--daemon: add pathname classification
  fsmonitor--daemon: implement 'start' command
  fsmonitor--daemon: implement 'run' command
  ...

a171ced... by Junio C Hamano <email address hidden>

Merge branch 'ab/config-based-hooks-2' into seen

More "config-based hooks".

* ab/config-based-hooks-2:
  run-command: remove old run_hook_{le,ve}() hook API
  receive-pack: convert push-to-checkout hook to hook.h
  read-cache: convert post-index-change to use hook.h
  commit: convert {pre-commit,prepare-commit-msg} hook to hook.h
  git-p4: use 'git hook' to run hooks
  send-email: use 'git hook run' for 'sendemail-validate'
  git hook run: add an --ignore-missing flag
  hooks: convert worktree 'post-checkout' hook to hook library
  hooks: convert non-worktree 'post-checkout' hook to hook library
  merge: convert post-merge to use hook.h
  am: convert applypatch-msg to use hook.h
  rebase: convert pre-rebase to use hook.h
  hook API: add a run_hooks_l() wrapper
  am: convert {pre,post}-applypatch to use hook.h
  gc: use hook library for pre-auto-gc hook
  hook API: add a run_hooks() wrapper
  hook: add 'run' subcommand