+

+ windows-meson-build:

+ name: win+Meson build

+ needs: ci-config

+ if: needs.ci-config.outputs.enabled == 'yes'

+ runs-on: windows-latest

+ concurrency:

+ group: windows-meson-build-${{ github.ref }}

+ cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}

+ steps:

+ - uses: actions/checkout@v4

+ - uses: actions/setup-python@v5

+ - name: Set up dependencies

+ shell: pwsh

+ run: pip install meson ninja

+ - name: Setup

+ shell: pwsh

+ run: meson setup build -Dperl=disabled

+ - name: Compile

+ shell: pwsh

+ run: meson compile -C build

+ - name: Upload build artifacts

+ uses: actions/upload-artifact@v4

+ with:

+ name: windows-meson-artifacts

+ path: build

+ windows-meson-test:

+ name: win+Meson test

+ runs-on: windows-latest

+ needs: [ci-config, windows-meson-build]

+ strategy:

+ fail-fast: false

+ matrix:

+ nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]

+ concurrency:

+ group: windows-meson-test-${{ matrix.nr }}-${{ github.ref }}

+ cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}

+ steps:

+ - uses: actions/checkout@v4

+ - uses: actions/setup-python@v5

+ - name: Set up dependencies

+ shell: pwsh

+ run: pip install meson ninja

+ - name: Download build artifacts

+ uses: actions/download-artifact@v4

+ with:

+ name: windows-meson-artifacts

+ path: build

+ - name: Test

+ shell: pwsh

+ run: meson test -C build --list | Select-Object -Skip 1 | Select-String .* | Group-Object -Property { $_.LineNumber % 10 } | Where-Object Name -EQ ${{ matrix.nr }} | ForEach-Object { meson test -C build --no-rebuild --print-errorlogs $_.Group }

+

+ CI_JOB_IMAGE: ${{matrix.vector.pool}}

+ - jobname: linux-sha256

+ image: ubuntu:rolling

+ cc: clang

+ - jobname: linux-reftable

+ image: ubuntu:rolling

+ cc: clang

+ - jobname: linux-TEST-vars

+ image: ubuntu:20.04

+ cc: gcc

+ cc_package: gcc-8

+ - jobname: linux-breaking-changes

+ cc: gcc

+ image: ubuntu:rolling

+ - jobname: linux-leaks

+ image: ubuntu:rolling

+ cc: gcc

+ - jobname: linux-reftable-leaks

+ image: ubuntu:rolling

+ cc: gcc

+ - jobname: linux-asan-ubsan

+ image: ubuntu:rolling

+ cc: clang

+ - jobname: linux-meson

+ image: ubuntu:rolling

+ cc: gcc

+ - jobname: linux-musl-meson

+ image: alpine:latest

+ image: fedora:latest

+ CC: ${{matrix.vector.cc}}

+ CI_JOB_IMAGE: ${{matrix.vector.image}}

+ - run: useradd builder --create-home

+ - run: chown -R builder .

+ - run: sudo --preserve-env --set-home --user=builder ci/run-build-and-tests.sh

+ run: sudo --preserve-env --set-home --user=builder ci/print-test-failures.sh

+ image: ubuntu:rolling

+ image: ubuntu:rolling

+ - jobname: linux-breaking-changes

+ image: ubuntu:rolling

+ image: ubuntu:rolling

+ image: ubuntu:rolling

+ - jobname: linux-musl-meson

+ - jobname: linux32

+ image: i386/ubuntu:20.04

+ image: ubuntu:rolling

+.msvc-meson:

+ tags:

+ - saas-windows-medium-amd64

+ before_script:

+ - choco install -y git meson ninja openssl

+ - Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1

+ - refreshenv

+ # The certificate store for Python on Windows is broken and fails to fetch

+ # certificates, see https://bugs.python.org/issue36011. This seems to

+ # mostly be an issue with how the GitLab image is set up as it is a

+ # non-issue on GitHub Actions. Work around the issue by importing

+ # cetrificates manually.

+ - Invoke-WebRequest https://curl.haxx.se/ca/cacert.pem -OutFile cacert.pem

+ - openssl pkcs12 -export -nokeys -in cacert.pem -out certs.pfx -passout "pass:"

+ - Import-PfxCertificate -CertStoreLocation Cert:\LocalMachine\Root -FilePath certs.pfx

+

+build:msvc-meson:

+ extends: .msvc-meson

+ stage: build

+ script:

+ - meson setup build -Dperl=disabled

+ - meson compile -C build

+ artifacts:

+ paths:

+ - build

+

+test:msvc-meson:

+ extends: .msvc-meson

+ stage: test

+ when: manual

+ timeout: 6h

+ needs:

+ - job: "build:msvc-meson"

+ artifacts: true

+ script:

+ - meson test -C build --list | Select-Object -Skip 1 | Select-String .* | Group-Object -Property { $_.LineNumber % $Env:CI_NODE_TOTAL + 1 } | Where-Object Name -EQ $Env:CI_NODE_INDEX | ForEach-Object { meson test -C build --no-rebuild --print-errorlogs $_.Group }

+ parallel: 10

+

+* Support for storing shorthands for remote URLs in "$GIT_COMMON_DIR/branches/"

+ and "$GIT_COMMON_DIR/remotes/" has been long superseded by storing remotes in

+ the repository configuration.

++

+The mechanism has originally been introduced in f170e4b39d ([PATCH] fetch/pull:

+short-hand notation for remote repositories., 2005-07-16) and was superseded by

+6687f8fea2 ([PATCH] Use .git/remote/origin, not .git/branches/origin.,

+2005-08-20), where we switched from ".git/branches/" to ".git/remotes/". That

+commit already mentions an upcoming deprecation of the ".git/branches/"

+directory, and starting with a1d4aa7424 (Add repository-layout document.,

+2005-09-01) we have also marked this layout as deprecated. Eventually we also

+started to migrate away from ".git/remotes/" in favor of config-based remotes,

+and we have marked the directory as legacy in 3d3d282146 (Documentation:

+Grammar correction, wording fixes and cleanup, 2011-08-23)

++

+As our documentation mentions, these directories are not to be found in modern

+repositories at all and most users aren't even aware of these mechanisms. They

+have been deprecated for almost 20 years and 14 years respectively, and we are

+not aware of any active users that have complained about this deprecation.

+Furthermore, the ".git/branches/" directory is nowadays misleadingly named and

+may cause confusion as "branches" are almost exclusively used in the context of

+references.

++

+These features will be removed.

+

+Git v2.49 Release Notes

+=======================

+

+UI, Workflows & Features

+------------------------

+

+ * Completion script updates for zsh

+

+

+Performance, Internal Implementation, Development Support etc.

+--------------------------------------------------------------

+

+ * More -Wsign-compare fixes.

+

+ * meson-based build now supports the unsafe-sha1 build knob.

+

+ * The code to check LSan results has been simplified and made more

+ robust.

+ (merge 164a2516eb jk/lsan-race-ignore-false-positive later to maint).

+

+ * More code paths have a repository passed through the callchain,

+ instead of assuming the primary the_repository object.

+

+ * Move a few more unit tests to the clar test framework.

+

+ * Introduce a new API to visit objects in batches based on a common

+ path, or by type.

+

+ * Following the procedure we established to introduce breaking

+ changes for Git 3.0, allow an early opt-in for removing support of

+ $GIT_DIR/branches/ and $GIT_DIR/remotes/ directories to configure

+ remotes.

+

+ * The code paths to interact with zlib has been cleaned up in

+ preparation for building with zlib-ng.

+

+

+Fixes since v2.48

+-----------------

+

+ * "git submodule" learned various ways to spell the same option,

+ e.g. "--branch=B" can be spelled "--branch B" or "-bB".

+ (merge b86f0f9071 re/submodule-parse-opt later to maint).

+

+ * Tweak the help text used for the option value placeholders by

+ parse-options API so that translations can customize the "<>"

+ placeholder signal (e.g. "--option=<value>").

+ (merge 5b34dd08d0 as/long-option-help-i18n later to maint).

+

+ * CI jobs gave sporadic failures, which turns out that that the

+ object finalization code was giving an error when it did not have

+ to.

+ (merge d7fcbe2c56 ps/object-collision-check later to maint).

+

+ * The code to compute "unique" name used git_rand() which can fail or

+ get stuck; the callsite does not require cryptographic security.

+ Introduce the "insecure" mode and use it appropriately.

+ (merge 0b4f8afef6 ps/reftable-get-random-fix later to maint).

+

+ * A misconfigured "fsck.skiplist" configuration variable was not

+ diagnosed as an error, which has been corrected.

+ (merge ca7158076f jt/fsck-skiplist-parse-fix later to maint).

+

+ * Extended SHA-1 expression parser did not work well when a branch

+ with an unusual name (e.g. "foo{bar") is involved.

+ (merge 191f0c8db2 en/object-name-with-funny-refname-fix later to maint).

+

+ * The meson build procedure looked for the 'version-def.h' file in a

+ wrong directory, which has been corrected.

+ (merge 4771501c0a tc/meson-use-our-version-def-h later to maint).

+

+ * The meson build procedure for Documentation/technical/ hierarchy was

+ missing necessary dependencies, which has been corrected.

+ (merge 1dca492edd sj/meson-doc-technical-dependency-fix later to maint).

+

+ * The "instaweb" bound only to local IP address without "--local" and

+ to all addresses with "--local", which was the other way around, when

+ using Python's http.server class, which has been corrected.

+ (merge 76baf97fa1 ak/instaweb-python-port-binding-fix later to maint).

+

+ * Document that it is insecure to use Personal Access Tokens, which

+ some hosting providers take as username/password, embedded in URLs.

+ (merge a90ff409f0 mh/doc-credential-helpers-with-pat later to maint).

+

+ * The help text from "git $cmd -h" appear on the standard output for

+ some $cmd and the standard error for others. The built-in commands

+ have been fixed to show them on the standard output consistently.

+ (merge f66d1423f5 jc/show-usage-help later to maint).

+

+ * The meson-driven build is now aware of "git-subtree" housed in

+ contrib/subtree hierarchy.

+ (merge 8454b42f94 ps/build-meson-subtree later to maint).

+

+ * It was possible for "git unpack-objects" and "git index-pack" to

+ make an unaligned access, which has been corrected.

+ (merge 98046591b9 jk/pack-header-parse-alignment-fix later to maint).

+

+ * The "cache" credential back-end did not handle authtype correctly,

+ which has been corrected.

+ (merge 0b43274850 mh/credential-cache-authtype-request-fix later to maint).

+

+ * "git branch --sort=..." and "git for-each-ref --format=... --sort=..."

+ did not work as expected with some atoms, which has been corrected.

+ (merge c5490ce9d1 rs/ref-fitler-used-atoms-value-fix later to maint).

+

+ * reflog entries for symbolic ref updates were broken, which has been

+ corrected.

+ (merge 3519492430 kn/reflog-symref-fix later to maint).

+

+ * The trace2 code was not prepared to show a configuration variable

+ that is set to true using the valueless true syntax, which has been

+ corrected.

+ (merge 2fd367cf63 am/trace2-with-valueless-true later to maint).

+

+ * The "git refs migrate" command did not migrate the reflog for

+ refs/stash, which is the contents of the stashes, which has been

+ corrected.

+ (merge a0bea0978f ps/reflog-migration-with-logall-fix later to maint).

+

+ * Doc and short-help text for "show-index" has been clarified to

+ stress that the command reads its data from the standard input.

+ (merge 49edce4ff9 jc/show-index-h-update later to maint).

+

+ * The API around choosing to use unsafe variant of SHA-1

+ implementation has been updated in an attempt to make it harder to

+ abuse.

+ (merge 04292c3796 tb/unsafe-hash-cleanup later to maint).

+

+ * Fix bugs in an earlier attempt to fix "git refs migration".

+ (merge f11f0a5a2d kn/reflog-migration-fix-fix later to maint).

+

+ * The code path used when "git fetch" fetches from a bundle file

+ closed the same file descriptor twice, which sometimes broke things

+ unexpectedly when the file descriptor was reused, which has been

+ corrected.

+ (merge 9a84794ad8 js/bundle-unbundle-fd-reuse-fix later to maint).

+

+ * Other code cleanup, docfix, build fix, etc.

+ (merge ddb5287894 jk/t7407-use-test-grep later to maint).

+ (merge 21e1b44865 aj/difftool-config-doc-fix later to maint).

+ (merge 6a63995335 mh/gitattr-doc-markup-fix later to maint).

+ (merge 43850dcf9c sk/unit-test-hash later to maint).

+ (merge 4ad47d2de3 jc/cli-doc-option-and-config later to maint).

+ (merge 2d0ff147e5 jp/t8002-printf-fix later to maint).

+ (merge 69666e6746 ja/doc-restore-markup-update later to maint).

+ (merge d11d003ba5 sk/strlen-returns-size_t later to maint).

+ (merge 77b2d29e91 ja/doc-notes-markup-updates later to maint).

+ (merge 6979bf6f8f jk/combine-diff-cleanup later to maint).

+ (merge 8705c9bd13 kn/pack-write-with-reduced-globals later to maint).

+ (merge 087740d65a ps/leakfixes-0129 later to maint).

+ifdef::git-commit[]

+:see-git-commit:

+endif::git-commit[]

+ifndef::git-commit[]

+:see-git-commit: See linkgit:git-commit[1] for details.

+endif::git-commit[]

+`commit.cleanup`::

+ `git commit`. {see-git-commit} Changing the default can be useful

+ when you always want to keep lines that begin

+`commit.gpgSign`::

+`commit.status`::

+ message. Defaults to `true`.

+`commit.template`::

+`commit.verbose`::

+ {see-git-commit}

+include::{build_dir}/mergetools-diff.txt[]

+

+`notes.mergeStrategy`::

+`notes.<name>.mergeStrategy`::

+ `refs/notes/<name>`. This overrides the more general

+ `notes.mergeStrategy`. See the "NOTES MERGE STRATEGIES" section in

+`notes.displayRef`::

+ messages with the `git log` family of commands.

+This setting can be disabled by the `--no-notes` option to the linkgit:git-log[1]

+family of commands, or by the `--notes=<ref>` option accepted by

+The effective value of `core.notesRef` (possibly overridden by

+`GIT_NOTES_REF`) is also implicitly added to the list of refs to be

+`notes.rewrite.<command>`::

+ When rewriting commits with _<command>_ (currently `amend` or

+ `true`. See also `notes.rewriteRef` below.

+`notes.rewriteMode`::

+ `notes.rewrite.<command>` option), determines what to do if

+`notes.rewriteRef`::

+[synopsis]

+git commit [-a | --interactive | --patch] [-s] [-v] [-u[<mode>]] [--amend]

+the working tree, in which case `HEAD` is "detached" as described in

+ index before using the `commit` command (Note: even modified files

+ and the index, again before using the `commit` command;

+3. by listing files as arguments to the `commit` command

+ (without `--interactive` or `--patch` switch), in which

+4. by using the `-a` switch with the `commit` command to automatically

+5. by using the `--interactive` or `--patch` switches with the `commit` command

+that, you can recover from it with `git reset`.

+`-a`::

+`--all`::

+ Automatically stage files that have

+`-p`::

+`--patch`::

+`-C <commit>`::

+`--reuse-message=<commit>`::

+ Take an existing _<commit>_ object, and reuse the log message

+`-c <commit>`::

+`--reedit-message=<commit>`::

+ Like `-C`, but with `-c` the editor is invoked, so that

+`--fixup=[(amend|reword):]<commit>`::

+ Create a new commit which "fixes up" _<commit>_ when applied with

+ "fixup!" commit which changes the content of _<commit>_ but leaves

+ _<commit>_ with the log message of the "amend!" commit.

+ replaces the log message of _<commit>_ with its own log message

+ but makes no changes to the content of _<commit>_.

+composed of "fixup!" followed by the subject line from _<commit>_,

+"fixup!" commit is squashed into _<commit>_ by

+_<commit>_ is copied into the log message of the "amend!" commit and

+--autosquash` squashes the "amend!" commit into _<commit>_, the

+log message of _<commit>_ is replaced by the refined log message

+ --only`. It creates an "amend!" commit with only a log message

+rebase --autosquash`, it replaces the log message of _<commit>_

+_<commit>_ when applied by `git rebase --autosquash`.

+`--squash=<commit>`::

+ Construct a commit message for use with `git rebase --autosquash`.

+`--reset-author`::

+ When used with `-C`/`-c`/`--amend` options, or when committing after a

+`--short`::

+`--branch`::

+`--porcelain`::

+`--long`::

+`-z`::

+`--null`::

+ filename verbatim and terminate the entries with _NUL_, instead of _LF_.

+`-F <file>`::

+`--file=<file>`::

+ Take the commit message from _<file>_. Use '-' to

+`--author=<author>`::

+ standard `A U Thor <author@example.com>` format. Otherwise _<author>_

+ commit by that author (i.e. `git rev-list --all -i --author=<author>`);

+`--date=<date>`::

+`-m <msg>`::

+`--message=<msg>`::

+ Use _<msg>_ as the commit message.

+`-t <file>`::

+`--template=<file>`::

+ contents in _<file>_. The `commit.template` configuration

+`--trailer <token>[(=|:)<value>]`::

+ Specify a (_<token>_, _<value>_) pair that should be applied as a

+ <committer@example.com>"` will add the `Signed-off-by` trailer

+ and the `Helped-by` trailer to the commit message.)

+`-n`::

+`--[no-]verify`::

+ Bypass the `pre-commit` and `commit-msg` hooks.

+`--allow-empty`::

+`--allow-empty-message`::

+ Create a commit with an empty commit message without using plumbing

+ commands like linkgit:git-commit-tree[1]. Like `--allow-empty`, this

+ command is primarily for use by foreign SCM interface scripts.

+`--cleanup=<mode>`::

+ Determine how the supplied commit message should be

+`strip`::

+`whitespace`::

+`verbatim`::

+`scissors`::

+ "`#`" can be customized with `core.commentChar`.

+`default`::

+`-e`::

+`--edit`::

+ Let the user further edit the message taken from _<file>_

+ with `-F <file>`, command line with `-m <message>`, and

+ from _<commit>_ with `-C <commit>`.

+`--no-edit`::

+`--amend`::

+`--no-post-rewrite`::

+ Bypass the `post-rewrite` hook.

+`-i`::

+`--include`::

+`-o`::

+`--only`::

+ `git commit` if any paths are given on the command line,

+`--pathspec-from-file=<file>`::

+ Pass pathspec in _<file>_ instead of commandline args. If

+ _<file>_ is exactly `-` then standard input is used. Pathspec

+ elements are separated by _LF_ or _CR_/_LF_. Pathspec elements can be

+`--pathspec-file-nul`::

+ separated with _NUL_ character and all other characters are taken

+`-u[<mode>]`::

+`--untracked-files[=<mode>]`::

+The _<mode>_ parameter is optional (defaults to `all`), and is used to

+specify the handling of untracked files; when `-u` is not used, the

+default is `normal`, i.e. show untracked files and directories.

+`no`:: Show no untracked files

+`normal`:: Shows untracked files and directories

+`all`:: Also shows individual files in untracked directories.

+The default can be changed using the `status.showUntrackedFiles`

+`-v`::

+`--verbose`::

+ Show unified diff between the `HEAD` commit and what

+ lines prefixed with `#`. This diff will not be a part

+`-q`::

+`--quiet`::

+`--dry-run`::

+`--status`::

+ configuration variable `commit.status`.

+`--no-status`::

+`-S[<key-id>]`::

+`--gpg-sign[=<key-id>]`::

+`--no-gpg-sign`::

+ GPG-sign commits. The _<key-id>_ is optional and

+`--`::

+`<pathspec>...`::

+ When _<pathspec>_ is given on the command line, commit the contents of

+called the "index" with `git add`. A file can be

+which effectively reverts `git add` and prevents the changes to

+notices that you have modified `hello.c` and removed `goodbye.c`,

+After a merge (initiated by `git merge` or `git pull`) stops

+check which paths are conflicting with `git status`

+stage the result as usual with `git add`:

+ * `GIT_AUTHOR_NAME`

+ * `GIT_AUTHOR_EMAIL`

+ * `GIT_AUTHOR_DATE`

+ * `GIT_COMMITTER_NAME`

+ * `GIT_COMMITTER_EMAIL`

+ * `GIT_COMMITTER_DATE`

+present, the environment variable `EMAIL`, or, if that is not set,

+`GIT_EDITOR` environment variable, the `core.editor` configuration variable, the

+PERSONAL ACCESS TOKENS

+----------------------

+

+Some remotes accept personal access tokens, which are randomly

+generated and hard to memorise. They typically have a lifetime of weeks

+or months.

+

+git-credential-cache is inherently unsuitable for persistent storage of

+personal access tokens. The credential will be forgotten after the cache

+timeout. Even if you configure a long timeout, credentials will be

+forgotten if the daemon dies.

+

+To avoid frequently regenerating personal access tokens, configure a

+credential helper with persistent storage. Alternatively, configure an

+OAuth credential helper to generate credentials automatically. See

+linkgit:gitcredentials[7], sections "Available helpers" and "OAuth".

+

+[synopsis]

+git notes [list [<object>]]

+git notes add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]

+git notes copy [-f] ( --stdin | <from-object> [<to-object>] )

+git notes append [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]

+git notes edit [--allow-empty] [<object>] [--[no-]stripspace]

+git notes show [<object>]

+git notes merge [-v | -q] [-s <strategy> ] <notes-ref>

+git notes merge --commit [-v | -q]

+git notes merge --abort [-v | -q]

+git notes remove [--ignore-missing] [--stdin] [<object>...]

+git notes prune [-n] [-v]

+git notes get-ref

+changing the commit itself. Notes can be shown by `git log` along with

+message, after an unindented line saying "Notes (_<refname>_):" (or

+To change which notes are shown by `git log`, see the

+`notes.displayRef` discussion in <<CONFIGURATION,CONFIGURATION>>.

+See the `notes.rewrite.<command>` configuration for a way to carry

+`list`::

+ annotate (in the format "`<note-object> <annotated-object>`").

+`add`::

+ Add notes for a given object (defaults to `HEAD`). Abort if the

+`copy`::

+ `HEAD`). Abort if the second object already has notes, or if the first

+ object has none (use `-f` to overwrite existing notes to the

+on standard input, and copy the notes from each _<from-object>_ to its

+corresponding _<to-object>_. (The optional _<rest>_ is ignored so that

+`append`::

+ exist, for the object (defaults to `HEAD`). When appending to

+`edit`::

+ Edit the notes for a given object (defaults to `HEAD`).

+`show`::

+ Show the notes for a given object (defaults to `HEAD`).

+`merge`::

+the `manual` resolver is used. This resolver checks out the

+`git notes merge --commit`, or abort the merge with

+`git notes merge --abort`.

+`remove`::

+ Remove the notes for given objects (defaults to `HEAD`). When

+`prune`::

+`get-ref`::

+`-f`::

+`--force`::

+`-m <msg>`::

+`--message=<msg>`::

+`-F <file>`::

+`--file=<file>`::

+ Take the note message from the given file. Use `-` to

+`-C <object>`::

+`--reuse-message=<object>`::

+ between paragraphs, use with `--stripspace` option.

+`-c <object>`::

+`--reedit-message=<object>`::

+ Like `-C`, but with `-c` the editor is invoked, so that

+`--allow-empty`::

+`--[no-]separator`::

+`--separator=<paragraph-break>`::

+`--[no-]stripspace`::

+`--ref <ref>`::

+ Manipulate the notes tree in _<ref>_. This overrides

+ `GIT_NOTES_REF` and the `core.notesRef` configuration. The ref

+`--ignore-missing`::

+`--stdin`::

+`-n`::

+`--dry-run`::

+`-s <strategy>`::

+`--strategy=<strategy>`::

+ strategy. The following strategies are recognized: `manual`

+ (default), `ours`, `theirs`, `union` and `cat_sort_uniq`.

+ This option overrides the `notes.mergeStrategy` configuration setting.

+`--commit`::

+ Finalize an in-progress `git notes merge`. Use this option

+ when you have resolved the conflicts that `git notes merge`

+ stored in `.git/NOTES_MERGE_WORKTREE`. This amends the partial

+ merge commit created by `git notes merge` (stored in

+ `.git/NOTES_MERGE_PARTIAL`) by adding the notes in

+ `.git/NOTES_MERGE_WORKTREE`. The notes ref stored in the

+ `.git/NOTES_MERGE_REF` symref is updated to the resulting commit.

+

+`--abort`::

+ Abort/reset an in-progress `git notes merge`, i.e. a notes merge

+`-q`::

+`--quiet`::

+`-v`::

+`--verbose`::

+The default notes merge strategy is `manual`, which checks out

+`git notes merge --commit`, or abort the merge with

+`git notes merge --abort`.

+either `-s`/`--strategy` option or configuring `notes.mergeStrategy` accordingly:

+`ours` automatically resolves conflicting notes in favor of the local

+`theirs` automatically resolves notes conflicts in favor of the remote

+`union` automatically resolves notes conflicts by concatenating the

+`cat_sort_uniq` is similar to `union`, but in addition to concatenating

+arbitrary files using `git hash-object`:

+with `git log`, so if you use such notes, you'll probably need to write

+`core.notesRef`::

+[synopsis]

+git restore [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...

+git restore [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]

+git restore (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [--] [<pathspec>...]

+`-s <tree>`::

+`--source=<tree>`::

+As a special case, you may use `"<rev-A>...<rev-B>"` as a shortcut for the

+merge base of _<rev-A>_ and _<rev-B>_ if there is exactly one merge base. You can

+leave out at most one of _<rev-A>__ and _<rev-B>_, in which case it defaults to `HEAD`.

+`-p`::

+`--patch`::

+ restore source and the restore location. See the "Interactive

+ Mode" section of linkgit:git-add[1] to learn how to operate

+`-W`::

+`--worktree`::

+`-S`::

+`--staged`::

+`-q`::

+`--quiet`::

+`--progress`::

+`--no-progress`::

+`--ours`::

+`--theirs`::

+ stage #2 (`ours`) or #3 (`theirs`) for unmerged paths.

+Note that during `git rebase` and `git pull --rebase`, `ours` and

+`theirs` may appear swapped. See the explanation of the same options

+`-m`::

+`--merge`::

+`--conflict=<style>`::

+ are `merge` (default), `diff3`, and `zdiff3`.

+`--ignore-unmerged`::

+`--ignore-skip-worktree-bits`::

+ matched by _<pathspec>_ and sparse patterns in

+ `$GIT_DIR/info/sparse-checkout`. This option ignores the sparse

+ _<pathspec>_.

+`--recurse-submodules`::

+`--no-recurse-submodules`::

+ If _<pathspec>_ names an active submodule and the restore location

+`--overlay`::

+`--no-overlay`::

+ In overlay mode, never remove files when restoring. In no-overlay mode,

+ remove tracked files that do not appear in the _<tree>_ of

+ `--source=<tree>`, to make them match _<tree>_ exactly. The default

+ is no-overlay mode.

+

+`--pathspec-from-file=<file>`::

+ Pathspec is passed in _<file>_ instead of commandline args. If

+ _<file>_ is exactly `-` then standard input is used. Pathspec

+ elements are separated by _LF_ or _CR_/_LF_. Pathspec elements can be

+`--pathspec-file-nul`::

+ separated with _NUL_ character and all other characters are taken

+`--`::

+`<pathspec>...`::

+`Makefile` to two revisions back, deletes `hello.c` by mistake, and gets

+<2> restore `hello.c` from the index

+'git show-index' [--object-format=<hash-algorithm>] < <pack-idx-file>

+using `%S`, `%X` and `%Y` respectively.

+Options trump configuration and environment

+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+

+When there is a configuration variable or an environment variable

+that tweak the behaviour of an aspect of a Git command, and also a

+command line option that tweaks the same, the command line option

+overrides what the configuration and/or environment variable say.

+

+For example, the `user.name` configuration variable is used to

+specify the human-readable name used by the `git commit` command to

+record the author and the committer name in a newly created commit.

+The `GIT_AUTHOR_NAME` environment variable, if set, takes precedence

+when deciding what author name to record. The `--author=<author>`

+command line option of the `git commit` command, when given, takes

+precedence over these two sources of information.

+

+

+To use a helper, you must first select one to use (see below for a list).

+Git currently includes the following helpers:

+

+cache::

+

+ Cache credentials in memory for a short period of time. See

+ linkgit:git-credential-cache[1] for details.

+

+store::

+

+ Store credentials indefinitely on disk. See

+ linkgit:git-credential-store[1] for details.

+

+Popular helpers with secure persistent storage include:

+

+ - git-credential-libsecret (Linux)

+

+ - git-credential-osxkeychain (macOS)

+

+ - git-credential-wincred (Windows)

+

+ - https://github.com/git-ecosystem/git-credential-manager[Git Credential Manager] (cross platform, included in Git for Windows)

+

+Popular helpers with OAuth support include:

+

+ - https://github.com/git-ecosystem/git-credential-manager[Git Credential Manager] (cross platform, included in Git for Windows)

+

+ - https://github.com/hickford/git-credential-oauth[git-credential-oauth] (cross platform, included in many Linux distributions)

+

+ A deprecated way to store shorthands to be used

++

+Git will stop reading remotes from this directory in Git 3.0.

++

+Git will stop reading remotes from this directory in Git 3.0.

+. `git commit` and `git commit-tree` issue

+. `git log`, `git show`, `git blame` and friends look at the

+`-s`::

+`--signoff`::

+`--no-signoff`::

+The `--no-signoff` option can be used to countermand an earlier `--signoff`

+Path-Walk API

+=============

+

+The path-walk API is used to walk reachable objects, but to visit objects

+in batches based on a common path they appear in, or by type.

+

+For example, all reachable commits are visited in a group. All tags are

+visited in a group. Then, all root trees are visited. At some point, all

+blobs reachable via a path `my/dir/to/A` are visited. When there are

+multiple paths possible to reach the same object, then only one of those

+paths is used to visit the object.

+

+Basics

+------

+

+To use the path-walk API, include `path-walk.h` and call

+`walk_objects_by_path()` with a customized `path_walk_info` struct. The

+struct is used to set all of the options for how the walk should proceed.

+Let's dig into the different options and their use.

+

+`path_fn` and `path_fn_data`::

+ The most important option is the `path_fn` option, which is a

+ function pointer to the callback that can execute logic on the

+ object IDs for objects grouped by type and path. This function

+ also receives a `data` value that corresponds to the

+ `path_fn_data` member, for providing custom data structures to

+ this callback function.

+

+`revs`::

+ To configure the exact details of the reachable set of objects,

+ use the `revs` member and initialize it using the revision

+ machinery in `revision.h`. Initialize `revs` using calls such as

+ `setup_revisions()` or `parse_revision_opt()`. Do not call

+ `prepare_revision_walk()`, as that will be called within

+ `walk_objects_by_path()`.

++

+It is also important that you do not specify the `--objects` flag for the

+`revs` struct. The revision walk should only be used to walk commits, and

+the objects will be walked in a separate way based on those starting

+commits.

+

+`commits`, `blobs`, `trees`, `tags`::

+ By default, these members are enabled and signal that the path-walk

+ API should call the `path_fn` on objects of these types. Specialized

+ applications could disable some options to make it simpler to walk

+ the objects or to have fewer calls to `path_fn`.

++

+While it is possible to walk only commits in this way, consumers would be

+better off using the revision walk API instead.

+

+`prune_all_uninteresting`::

+ By default, all reachable paths are emitted by the path-walk API.

+ This option allows consumers to declare that they are not

+ interested in paths where all included objects are marked with the

+ `UNINTERESTING` flag. This requires using the `boundary` option in

+ the revision walk so that the walk emits commits marked with the

+ `UNINTERESTING` flag.

+

+Examples

+--------

+

+See example usages in:

+ `t/helper/test-path-walk.c`

+ depends: documentation_deps,

+WITH_BREAKING_CHANGES=@WITH_BREAKING_CHANGES@

+DEF_VER=v2.48.GIT

+if test "$#" -lt 2 || test "$#" -gt 3

+ echo >&2 "USAGE: $0 <SOURCE_DIR> (--format=<STRING>|<INPUT>) [<OUTPUT>]"

+case "$2" in

+--format=*)

+ INPUT="${2#--format=}"

+ ;;

+*)

+ if ! test -f "$2"

+ then

+ echo >&2 "Input is not a file: $2"

+ exit 1

+ fi

+ INPUT=$(cat "$2")

+ ;;

+esac

+

+OUTPUT="$3"

+ VN=$(git -C "$SOURCE_DIR" describe --dirty --match="v[0-9]*" 2>/dev/null) &&

+REPLACED=$(printf "%s" "$INPUT" | sed -e "s|@GIT_VERSION@|$GIT_VERSION|" \

+ -e "s|@GIT_DATE@|$GIT_DATE|"

+)

+if test -z "$OUTPUT"

+ printf "%s\n" "$REPLACED"

+ printf "%s\n" "$REPLACED" >"$OUTPUT".$$+

+ if ! test -f "$OUTPUT" || ! cmp "$OUTPUT".$$+ "$OUTPUT" >/dev/null

+ then

+ mv "$OUTPUT".$$+ "$OUTPUT"

+ else

+ rm "$OUTPUT".$$+

+ fi

+# Define NO_DEFLATE_BOUND if your zlib does not have deflateBound. Define

+# ZLIB_NG if you want to use zlib-ng instead of zlib.

+TEST_BUILTINS_OBJS += test-path-walk.o

+LIB_OBJS += path-walk.o

+ifndef WITH_BREAKING_CHANGES

+endif

+CLAR_TEST_SUITES += u-hash

+CLAR_TEST_SUITES += u-mem-pool

+CLAR_TEST_SUITES += u-prio-queue

+CLAR_TEST_SUITES += u-reftable-tree

+ifdef ZLIB_NG

+ BASIC_CFLAGS += -DHAVE_ZLIB_NG

+ ifdef ZLIB_NG_PATH

+ BASIC_CFLAGS += -I$(ZLIB_NG_PATH)/include

+ EXTLIBS += $(call libpath_template,$(ZLIB_NG_PATH)/$(lib))

+ endif

+ EXTLIBS += -lz-ng

+else

+ ifdef ZLIB_PATH

+ BASIC_CFLAGS += -I$(ZLIB_PATH)/include

+ EXTLIBS += $(call libpath_template,$(ZLIB_PATH)/$(lib))

+ endif

+ EXTLIBS += -lz

+ifdef WITH_BREAKING_CHANGES

+ BASIC_CFLAGS += -DWITH_BREAKING_CHANGES

+endif

+

+ -e "s|@WITH_BREAKING_CHANGES@|\'$(WITH_BREAKING_CHANGES)\'|" \

+Documentation/RelNotes/2.49.0.txt \ No newline at end of file

+ repo_config_get_string(r, "interactive.difffilter",

+ &s->interactive_diff_filter);

+ repo_config_get_string(r, "diff.algorithm",

+ &s->interactive_diff_algorithm);

+ repo_config_get_bool(r, "interactive.singlekey", &s->use_single_key);

+ int is_initial = !refs_resolve_ref_unsafe(get_main_ref_store(r),

+ empty_tree_oid_hex(r->hash_algo) : oid_to_hex(&head_oid);

+ int is_initial = !refs_resolve_ref_unsafe(get_main_ref_store(s->r),

+ int is_initial = !refs_resolve_ref_unsafe(get_main_ref_store(s->r),

+ setup_pager(the_repository);

+#include "git-zlib.h"

+ size_t *rev_nr)

+ size_t i, n = 0;

+static enum bisect_error check_merge_bases(size_t rev_nr, struct commit **rev, int no_checkout)

+static int check_ancestors(struct repository *r, size_t rev_nr,

+ int fd;

+ size_t rev_nr;

+ setup_mailinfo(the_repository, &mi);

+ const char *pager = git_pager(the_repository, 1);

+ setup_pager(the_repository);

+ show_usage_with_options_if_asked(argc, argv, usage, options);

+ pi.progress = start_delayed_progress(the_repository,

+ _("Blaming lines"),

+ num_lines);

+ setup_pager(the_repository);

+ filter_ahead_behind(the_repository, &array);

+ show_usage_with_options_if_asked(argc, argv,

+ builtin_branch_usage, options);

+ if (create_diagnostics_archive(the_repository, &zip_path, diagnose))

+ show_usage_if_asked(argc, argv,

+ builtin_check_ref_format_usage);

+ show_usage_with_options_if_asked(argc, argv,

+ checkout_worker_usage,

+ checkout_worker_options);

+ show_usage_with_options_if_asked(argc, argv,

+ builtin_checkout_index_usage,

+ builtin_checkout_index_options);

+ the_repository,

+ show_usage_with_options_if_asked(argc, argv,

+ commit_tree_usage, options);

+ N_("git commit [-a | --interactive | --patch] [-s] [-v] [-u[<mode>]] [--amend]\n"

+ show_usage_with_options_if_asked(argc, argv,

+ builtin_status_usage, builtin_status_options);

+ show_usage_with_options_if_asked(argc, argv,

+ builtin_commit_usage, builtin_commit_options);

+ if (credential_has_capability(&c.capa_authtype, CREDENTIAL_OP_RESPONSE) && e->item.authtype)

+ if (credential_has_capability(&c.capa_authtype, CREDENTIAL_OP_RESPONSE) && e->item.credential)

+ show_usage_if_asked(argc, argv, usage_msg);

+ if (argc != 2)

+ credential_fill(the_repository, &c, 0);

+ credential_approve(the_repository, &c);

+ credential_reject(the_repository, &c);

+#define USE_THE_REPOSITORY_VARIABLE

+

+ if (create_diagnostics_archive(the_repository, &zip_path, mode))

+ show_usage_if_asked(argc, argv, diff_files_usage);

+ show_usage_if_asked(argc, argv, diff_cache_usage);

+ show_usage_if_asked(argc, argv, diff_tree_usage);

+ tmpfile = write_idx_file(the_hash_algo, NULL, idx, object_count,

+ &pack_idx_opts, pack_data->hash);

+ fixup_pack_header_footer(the_hash_algo, pack_data->pack_fd,

+ pack_data->hash, pack_data->pack_name,

+ object_count, cur_pack_oid.hash,

+ pack_size);

+ hashfile_checkpoint_init(pack_file, &checkpoint);

+ show_usage_if_asked(argc, argv, fast_import_usage);

+ show_usage_if_asked(argc, argv, fetch_pack_usage);

+

+ progress = start_delayed_progress(the_repository,

+ _("Checking connectivity"), 0);

+ progress = start_progress(the_repository,

+ _("Checking object directories"), 256);

+ progress = start_delayed_progress(the_repository,

+ "Verifying reverse pack-indexes", pack_count);

+ progress = start_progress(the_repository,

+ _("Checking objects"), total);

+ show_usage_with_options_if_asked(argc, argv,

+ builtin_fsmonitor__daemon_usage, options);

+ show_usage_with_options_if_asked(argc, argv,

+ builtin_gc_usage, builtin_gc_options);

+ return git_rand(0) % 60;

+ const char **argv,

+ show_usage_if_asked(argc, argv, builtin_get_tar_commit_id_usage);

+

+ show_in_pager = git_pager(the_repository, 1);

+ setup_pager(the_repository);

+ setup_pager(the_repository);

+ setup_pager(the_repository);

+ progress = start_delayed_progress(the_repository,

+ _("Checking objects"), max);

+ unsigned char *hdr = fill(sizeof(struct pack_header));

+ if (get_be32(hdr) != PACK_SIGNATURE)

+ hdr += 4;

+ if (!pack_version_ok_native(get_be32(hdr)))

+ get_be32(hdr));

+ hdr += 4;

+ nr_objects = get_be32(hdr);

+ the_repository,

+ progress = start_progress(the_repository,

+ _("Resolving deltas"),

+ fixup_pack_header_footer(the_hash_algo, output_fd, pack_hash,

+ show_usage_if_asked(argc, argv, index_pack_usage);

+ } else if (skip_prefix(arg, "--pack_header=", &arg)) {

+ if (parse_pack_header_option(arg,

+ input_buffer,

+ &input_len) < 0)

+ die(_("bad --pack_header: %s"), arg);

+ curr_index = write_idx_file(the_hash_algo, index_name, idx_objects,

+ nr_objects, &opts, pack_hash);

+ curr_rev_index = write_rev_file(the_hash_algo, rev_index_name,

+ idx_objects, nr_objects,

+ pack_hash, opts.flags);

+ for (size_t i = 0; i < ARRAY_SIZE(ref_namespace); i++) {

+ setup_pager(the_repository);

+ unsigned long offset = 0;

+ unsigned long new_offset = offset + 1;

+ int interesting_found = 0;

+ size_t idx;

+ for (size_t i = 0; i < rev->cmdline.nr; i++) {

+ if (interesting_found)

+ interesting_found = 1;

+ idx = i;

+ if (!interesting_found)

+ ref = rev->cmdline.rev[idx].name;

+ tip_oid = &rev->cmdline.rev[idx].item->oid;

+ size_t total)

+ int auto_select, die_on_failure, ret;

+ size_t i = 0, rev_nr = 0;

+ size_t total)

+ for (size_t i = 0; i < total; i++) {

+ size_t nr = 0, total, i;

+ if (cfg.log.fmt_patch_name_max <= cast_size_t_to_int(strlen("0000-") + strlen(fmt_patch_suffix)))

+ setup_pager(the_repository);

+ progress = start_delayed_progress(the_repository,

+ _("Generating patches"), total);

+ for (i = 0; i < nr; i++) {

+ size_t idx = nr - i - 1;

+

+ display_progress(progress, total - idx);

+ commit = list[idx];

+ rev.nr = total - idx + (start_number - 1);

+

+ show_usage_with_options_if_asked(argc, argv,

+ ls_files_usage, builtin_ls_files_options);

+ setup_mailinfo(the_repository, &mi);

+ show_usage_if_asked(argc, argv, git_mailsplit_usage);

+

+static int show_merge_base(struct commit **rev, size_t rev_nr, int show_all)

+ size_t rev_nr = 0;

+static const char usage_string[] =

+"git merge-index [-o] [-q] <merge-program> (-a | [--] [<filename>...])";

+

+ show_usage_if_asked(argc, argv, usage_string);

+

+ usage(usage_string);

+ show_usage_if_asked(argc, argv, builtin_merge_ours_usage);

+ if (argc == 2 && !strcmp(argv[1], "-h")) {

+ struct strbuf msg = STRBUF_INIT;

+ strbuf_addf(&msg, builtin_merge_recursive_usage, argv[0]);

+ show_usage_if_asked(argc, argv, msg.buf);

+ }

+

+ show_usage_with_options_if_asked(argc, argv,

+ builtin_merge_usage, builtin_merge_options);

+ progress_state = start_progress(the_repository,

+ _("Writing objects"), nr_result);

+ fixup_pack_header_footer(the_hash_algo, fd, hash,

+ pack_tmp_name, nr_written,

+ hash, offset);

+ stage_tmp_packfiles(the_hash_algo, &tmpname,

+ pack_tmp_name, written_list,

+ nr_written, &to_pack,

+ &pack_idx_opts, hash,

+ progress_state = start_progress(the_repository,

+ _("Counting objects"),

+ progress_state = start_progress(the_repository,

+ _("Compressing objects"),

+ progress_state = start_progress(the_repository,

+ _("Enumerating cruft objects"), 0);

+ progress_state = start_progress(the_repository,

+ _("Enumerating cruft objects"), 0);

+ progress_state = start_progress(the_repository,

+ _("Traversing cruft objects"), 0);

+ progress_state = start_progress(the_repository,

+ _("Enumerating objects"), 0);

+ show_usage_if_asked(argc, argv, pack_redundant_usage);

+ progress = start_delayed_progress(the_repository,

+ _("Checking connectivity"), 0);

+ show_usage_with_options_if_asked(argc, argv,

+ builtin_rebase_usage,

+ builtin_rebase_options);

+ return -1;

+ tmp_objdir = tmp_objdir_create(the_repository, "incoming");

+ lockfile = index_pack_lockfile(the_repository, child.out, NULL);

+ update_server_info(the_repository, 0);

+ show_usage_if_asked(argc, argv, usage_msg);

+

+ show_usage_if_asked(argc, argv, usage_msg);

+#ifndef WITH_BREAKING_CHANGES

+#endif /* WITH_BREAKING_CHANGES */

+ progress = start_progress(the_repository,

+ _("Renaming remote references"),

+ update_server_info(the_repository, 0);

+ show_usage_if_asked(argc, argv, rev_list_usage);

+ progress = start_delayed_progress(the_repository,

+ show_progress, 0);

+ show_usage_if_asked(argc, argv, builtin_rev_parse_usage);

+

+ ret = send_pack(the_repository, &args, fd, conn, remote_refs, &extra_have);

+ "git show-index [--object-format=<hash-algorithm>] < <pack-idx-file>",

+static const char usage_msg[] =

+"git unpack-file <blob>";

+

+ show_usage_if_asked(argc, argv, usage_msg);

+ if (argc != 2)

+ usage(usage_msg);

+#include "packfile.h"

+ unsigned char *hdr = fill(sizeof(struct pack_header));

+ if (get_be32(hdr) != PACK_SIGNATURE)

+ hdr += 4;

+ if (!pack_version_ok_native(get_be32(hdr)))

+ get_be32(hdr));

+ hdr += 4;

+ nr_objects = get_be32(hdr);

+ progress = start_progress(the_repository,

+ _("Unpacking objects"), nr_objects);

+ show_usage_if_asked(argc, argv, unpack_usage);

+

+ if (skip_prefix(arg, "--pack_header=", &arg)) {

+ if (parse_pack_header_option(arg,

+ buffer, &len) < 0)

+ die(_("bad --pack_header: %s"), arg);

+ show_usage_with_options_if_asked(argc, argv,

+ update_index_usage, options);

+ return !!update_server_info(the_repository, force);

+ show_usage_if_asked(argc, argv, upload_archive_usage);

+ if (argc != 2)

+ show_usage_if_asked(argc, argv, upload_archive_usage);

+#define USE_THE_REPOSITORY_VARIABLE

+

+ protocol_v2_advertise_capabilities(the_repository);

+ protocol_v2_serve_loop(the_repository, stateless_rpc);

+ const char *pgm = git_pager(the_repository, 1);

+ show_usage_if_asked(argc, argv, var_usage);

+ stage_tmp_packfiles(the_hash_algo, basename, pack_tmp_name,

+ written_list, nr_written, NULL, pack_idx_opts, hash,

+ &idx_tmp_name);

+ fixup_pack_header_footer(the_hash_algo, fd, hash, state->pack_tmp_name,

+ struct hashfile_checkpoint checkpoint;

+ if ((flags & HASH_WRITE_OBJECT) != 0) {

+ prepare_to_stream(state, flags);

+ hashfile_checkpoint_init(state->f, &checkpoint);

+ }

+

+ bulk_fsync_objdir = tmp_objdir_create(the_repository, "bulk-fsync");

+ if (verify_bundle(r, header, opts->flags)) {

+ close(bundle_fd);

+ }

+ *

+ * Note that the `bundle_fd` will be closed as part of the operation.

+ apk add --update shadow sudo meson ninja-build gcc libc-dev curl-dev openssl-dev expat-dev gettext \

+ zlib-ng-dev pcre2-dev python3 musl-libintl perl-utils ncurses \

+ dnf -yq install shadow-utils sudo make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null

+ubuntu-*|i386/ubuntu-*|debian-*)

+ i386/ubuntu-*)

+if test true = "$GITHUB_ACTIONS"

+

+ distro=$(echo "$CI_JOB_IMAGE" | tr : -)

+ *,alpine:*|*,fedora:*|*,ubuntu:*|*,i386/ubuntu:*)

+ export GIT_TEST_HTTPD=true

+ MESONFLAGS="$MESONFLAGS -DGIT_TEST_UTF8_LOCALE=C.UTF-8"

+linux-breaking-changes)

+ export WITH_BREAKING_CHANGES=YesPlease

+ --fatal-meson-warnings \

+ --wrap-mode nofallback \

+ -Dfuzzers=true \

+ $MESONFLAGS

+ p = combine_diff_path_new(q->queue[i]->two->path,

+ strlen(q->queue[i]->two->path),

+ q->queue[i]->two->mode,

+ &q->queue[i]->two->oid,

+ num_parent);

+ p->parent[n].path = xstrdup(q->queue[i]->one->path);

+ free(p->parent[j].path);

+ p->parent[n].path = xstrdup(q->queue[i]->one->path);

+ const char *path = elem->parent[i].path ?

+ elem->parent[i].path :

+ elem->path;

+ const char *path = p->parent[i].path ?

+ p->parent[i].path :

+ p->path;

+ write_name_quoted(path, stdout, inter_name_termination);

+ struct combine_diff_path *paths;

+ paths = diff_tree_paths(oid, parents_oid, nparent, &base, opt);

+ return paths;

+ free(tmp->parent[i].path);

+

+struct combine_diff_path *combine_diff_path_new(const char *path,

+ size_t path_len,

+ unsigned int mode,

+ const struct object_id *oid,

+ size_t num_parents)

+{

+ struct combine_diff_path *p;

+ size_t parent_len = st_mult(sizeof(p->parent[0]), num_parents);

+

+ p = xmalloc(st_add4(sizeof(*p), path_len, 1, parent_len));

+ p->path = (char *)&(p->parent[num_parents]);

+ memcpy(p->path, path, path_len);

+ p->path[path_len] = 0;

+ p->next = NULL;

+ p->mode = mode;

+ oidcpy(&p->oid, oid);

+

+ memset(p->parent, 0, parent_len);

+

+ return p;

+}

+ the_repository,

+ the_repository,

+ the_repository,

+ the_repository,

+ the_repository,

+ the_repository,

+ the_repository,