Skip to content

Rebase to v2.51.0-rc1 #781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 302 commits into
base: vfs-2.51.0-rc1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
302 commits
Select commit Hold shift + click to select a range
a43bde2
fsck: avoid using an uninitialized variable
dscho Dec 16, 2022
7cb8b3c
clar(clar__assert_equal): do in-bounds check before accessing element
dscho Mar 21, 2025
1c35a3b
load_revindex_from_disk(): avoid accessing uninitialized data
dscho Dec 16, 2022
bfffcac
clar(clar_summary_testsuite): avoid thread-unsafe `localtime()`
dscho Mar 21, 2025
8c16ef8
load_pack_mtimes_file(): avoid accessing uninitialized data
dscho Dec 16, 2022
0ea9dcd
revision: defensive programming
dscho Dec 16, 2022
aba0c0f
get_parent(): defensive programming
dscho Dec 16, 2022
4cb0912
fetch-pack: defensive programming
dscho Dec 16, 2022
765a31d
unparse_commit(): defensive programming
dscho Dec 16, 2022
b5bb46b
verify_commit_graph(): defensive programming
dscho Dec 16, 2022
e9ad531
stash: defensive programming
dscho Dec 16, 2022
7c690c0
stash: defensive programming
dscho Dec 16, 2022
8a8c958
push: defensive programming
dscho Dec 16, 2022
15b818a
fetch: defensive programming
dscho Dec 16, 2022
3c874f7
describe: defensive programming
dscho Dec 16, 2022
e6987d3
inherit_tracking(): defensive programming
dscho Dec 16, 2022
80fa88e
codeql: run static analysis as part of CI builds
dscho Aug 9, 2022
0eb8723
fetch: silence a CodeQL alert about a local variable's address' use a…
dscho Dec 14, 2022
dc89f56
codeql: publish the sarif file as build artifact
dscho Mar 22, 2023
be49bd8
submodule: check return value of `submodule_from_path()`
dscho Dec 16, 2022
2be22c6
codeql: disable a couple of non-critical queries for now
dscho Mar 21, 2025
a85e41e
test-tool repository: check return value of `lookup_commit()`
dscho Dec 16, 2022
28b12cf
date: help CodeQL understand that there are no leap-year issues here
dscho Jul 23, 2025
aa32ccd
shallow: handle missing shallow commits gracefully
dscho Dec 16, 2022
353f699
help: help CodeQL understand that consuming envvars is okay here
dscho Jul 23, 2025
c25505f
commit-graph: suppress warning about using a stale stack addresses
dscho Dec 17, 2022
be75e7f
ctype: help CodeQL understand that `sane_istest()` does not access ar…
dscho Jul 23, 2025
021ddf8
ctype: accommodate for CodeQL misinterpreting the `z` in `mallocz()`
dscho Jul 23, 2025
0bb7d99
strbuf_read: help with CodeQL misunderstanding that `strbuf_read()` d…
dscho Jul 23, 2025
e55ca89
codeql: also check JavaScript code
dscho Jul 24, 2025
ef3bb01
Merge branch 'clar'
dscho Mar 21, 2025
66039f8
Merge branch 'uninitialized-variables'
dscho Oct 27, 2022
c5449c0
Merge branch 'defensive-programming'
dscho Mar 21, 2025
61f757b
Merge branch 'codeql-fixes'
dscho Mar 21, 2025
6f7f86c
Merge branch 'codeql'
dscho Mar 21, 2025
78e7b66
worktree: allow in Scalar repositories
derrickstolee Sep 30, 2022
7448601
sparse-checkout: avoid writing entries with the skip-worktree bit
Mar 1, 2017
9c5dcef
Do not remove files outside the sparse-checkout
Apr 5, 2017
f66dc27
send-pack: do not check for sha1 file when GVFS_MISSING_OK set
Nov 16, 2018
6699fe8
cache-tree: remove use of strbuf_addf in update_one
Jul 3, 2017
d13f97b
gvfs: block unsupported commands when running in a GVFS repo
benpeart Dec 6, 2018
f6ff978
gvfs: allow overriding core.gvfs
derrickstolee Apr 15, 2020
d991bc6
Add virtual file system settings and hook proc
benpeart Jan 11, 2018
3a93fab
BRANCHES.md: Add explanation of branches and using forks
Jul 27, 2018
f236513
virtualfilesystem: don't run the virtual file system hook if the inde…
benpeart Aug 1, 2018
585b118
virtualfilesystem: check if directory is included
Oct 9, 2018
4c442fc
backwards-compatibility: support the post-indexchanged hook
dscho May 28, 2019
b063dec
gvfs: verify that the built-in FSMonitor is disabled
dscho Jun 18, 2021
3019a43
wt-status: add trace2 data for sparse-checkout percentage
jeffhostetler Jun 21, 2024
6f6c6ca
wt-status: add VFS hydration percentage to normal `git status` output
jeffhostetler Jun 24, 2024
1605ecb
status: add status serialization mechanism
jeffhostetler Aug 22, 2017
9bccb63
Teach ahead-behind and serialized status to play nicely together
jamill Jan 10, 2018
c3e3764
status: serialize to path
jeffhostetler Feb 2, 2018
77b841a
status: reject deserialize in V2 and conflicts
jeffhostetler Feb 7, 2018
d8a6dd0
serialize-status: serialize global and repo-local exclude file metadata
jeffhostetler Jul 20, 2018
45a339d
status: deserialization wait
jeffhostetler Jul 25, 2018
9e1cc29
status: deserialize with -uno does not print correct hint
jeffhostetler Jun 25, 2019
689b4ec
fsmonitor: check CE_FSMONITOR_VALID in ce_uptodate
kewillford Nov 21, 2019
be47d60
fsmonitor: add script for debugging and update script for tests
kewillford Nov 21, 2019
46fe840
status: disable deserialize when verbose output requested.
jeffhostetler Apr 11, 2020
a17803b
t7524: add test for verbose status deserialzation
jeffhostetler Apr 11, 2020
e953eb7
deserialize-status: silently fallback if we cannot read cache file
jeffhostetler May 13, 2020
641b94d
gvfs:trace2:data: add trace2 tracing around read_object_process
jeffhostetler Sep 26, 2018
54ba937
gvfs:trace2:data: status deserialization information
jeffhostetler Sep 26, 2018
eeeec93
gvfs:trace2:data: status serialization
jeffhostetler Jan 7, 2019
886b4b8
gvfs:trace2:data: add vfs stats
jeffhostetler Nov 19, 2018
a49fbf8
trace2: refactor setting process starting time
jeffhostetler Apr 15, 2019
474de59
trace2:gvfs:experiment: clear_ce_flags_1
jeffhostetler Apr 30, 2019
0333672
trace2:gvfs:experiment: report_tracking
jeffhostetler Apr 30, 2019
b386bba
trace2:gvfs:experiment: read_cache: annotate thread usage in read-cache
jeffhostetler Jun 14, 2019
cfeec8e
trace2:gvfs:experiment: read-cache: time read/write of cache-tree ext…
jeffhostetler Jul 9, 2019
7ebf901
trace2:gvfs:experiment: add region to apply_virtualfilesystem()
jeffhostetler Jul 16, 2019
46e79dd
trace2:gvfs:experiment: add region around unpack_trees()
jeffhostetler Jul 16, 2019
78a860f
trace2:gvfs:experiment: add region to cache_tree_fully_valid()
jeffhostetler Jul 16, 2019
fccc45d
trace2:gvfs:experiment: add unpack_entry() counter to unpack_trees() …
jeffhostetler Jul 16, 2019
3f9a101
trace2:gvfs:experiment: increase default event depth for unpack-tree …
jeffhostetler Jul 25, 2019
7def48c
trace2:gvfs:experiment: add data for check_updates() in unpack_trees()
jeffhostetler Jul 25, 2019
a02e9d9
Trace2:gvfs:experiment: capture more 'tracking' details
jeffhostetler Jul 26, 2019
5dafe37
credential: set trace2_child_class for credential manager children
jeffhostetler Oct 3, 2019
1a48c17
sub-process: do not borrow cmd pointer from caller
jeffhostetler Sep 18, 2019
d017045
sub-process: add subprocess_start_argv()
jeffhostetler Sep 18, 2019
7d12b6e
sha1-file: add function to update existing loose object cache
jeffhostetler Sep 24, 2019
db8f5b2
packfile: add install_packed_git_and_mru()
jeffhostetler Sep 25, 2019
4675e0b
index-pack: avoid immediate object fetch while parsing packfile
jeffhostetler Sep 24, 2019
e6c52ec
gvfs-helper: create tool to fetch objects using the GVFS Protocol
jeffhostetler Aug 13, 2019
ff9156d
sha1-file: create shared-cache directory if it doesn't exist
jeffhostetler Oct 7, 2019
22c79d1
gvfs-helper: better handling of network errors
jeffhostetler Oct 8, 2019
d184263
gvfs-helper-client: properly update loose cache with fetched OID
jeffhostetler Oct 8, 2019
caeaa78
gvfs-helper: V2 robust retry and throttling
jeffhostetler Oct 10, 2019
dacb6d2
gvfs-helper: expose gvfs/objects GET and POST semantics
jeffhostetler Oct 21, 2019
25c4456
gvfs-helper: dramatically reduce progress noise
derrickstolee Oct 24, 2019
a527370
gvfs-helper: handle pack-file after single POST request
derrickstolee Nov 11, 2019
cf6213e
test-gvfs-prococol, t5799: tests for gvfs-helper
jeffhostetler Oct 25, 2019
6797785
gvfs-helper: move result-list construction into install functions
jeffhostetler Nov 13, 2019
930ef88
t5799: add support for POST to return either a loose object or packfile
jeffhostetler Nov 13, 2019
e10b4c8
t5799: cleanup wc-l and grep-c lines
jeffhostetler Nov 13, 2019
366fcbc
gvfs-helper: verify loose objects after write
derrickstolee Sep 18, 2020
56d551e
t7599: create corrupt blob test
jeffhostetler Sep 18, 2020
4d6957d
gvfs-helper: add prefetch support
jeffhostetler Nov 11, 2019
031b41c
gvfs-helper: add prefetch .keep file for last packfile
jeffhostetler Nov 26, 2019
04a0d69
gvfs-helper: do one read in my_copy_fd_len_tail()
derrickstolee Dec 16, 2019
73c4abc
gvfs-helper: move content-type warning for prefetch packs
derrickstolee Dec 16, 2019
3f134ac
fetch: use gvfs-helper prefetch under config
derrickstolee Dec 17, 2019
3e6c90e
gvfs-helper: better support for concurrent packfile fetches
jeffhostetler Dec 18, 2019
0c3da89
remote-curl: do not call fetch-pack when using gvfs-helper
derrickstolee Feb 3, 2020
2560448
fetch: reprepare packs before checking connectivity
derrickstolee Mar 12, 2020
f8166e0
gvfs-helper: retry when creating temp files
derrickstolee Dec 26, 2019
15cb933
gvfs-helper: add --max-retries to prefetch verb
jeffhostetler Apr 12, 2023
e970c84
sparse: avoid warnings about known cURL issues in gvfs-helper.c
derrickstolee Aug 3, 2021
17ce06c
t5799: add tests to detect corrupt pack/idx files in prefetch
jeffhostetler Apr 13, 2023
85cff8d
gvfs-helper: ignore .idx files in prefetch multi-part responses
jeffhostetler Apr 13, 2023
2a251e3
t5799: explicitly test gvfs-helper --fallback and --no-fallback
jeffhostetler Jun 28, 2024
b2ac7d9
gvfs-helper: don't fallback with new config
derrickstolee Jun 27, 2024
e1c0ed0
test-gvfs-protocol: add cache_http_503 to mayhem
jeffhostetler Jun 28, 2024
84b52a0
t5799: add unit tests for new `gvfs.fallback` config setting
jeffhostetler Jun 28, 2024
42b818a
maintenance: care about gvfs.sharedCache config
derrickstolee Dec 15, 2020
f924de2
unpack-trees:virtualfilesystem: Improve efficiency of clear_ce_flags
neerajsi-msft2 Feb 6, 2021
a4577d0
homebrew: add GitHub workflow to release Cask
mjcheetham Jul 24, 2020
277b10c
Adding winget workflows
Apr 29, 2021
8444657
Disable the `monitor-components` workflow in msft-git
dscho May 13, 2022
3684801
.github: enable windows builds on microsoft fork
derrickstolee Mar 8, 2023
3184b3d
.github/actions/akv-secret: add action to get secrets
mjcheetham Apr 1, 2025
bcfec90
release: create initial Windows installer build workflow
vdye Jul 16, 2021
7dc327c
release: create initial Windows installer build workflow
mjcheetham Mar 21, 2025
175bd6e
help: special-case HOST_CPU `universal`
jeffhostetler Oct 17, 2023
1a75f6b
release: add Mac OSX installer build
vdye Jul 16, 2021
0ec2fa8
release: build unsigned Ubuntu .deb package
vdye Jul 16, 2021
b2f3d93
release: add signing step for .deb package
vdye Jul 16, 2021
230066d
release: create draft GitHub release with packages & installers
vdye Jul 16, 2021
dc9982b
build-git-installers: publish gpg public key
ldennington Oct 24, 2023
3f594ac
release: continue pestering until user upgrades
derrickstolee Oct 6, 2021
429c764
dist: archive HEAD instead of HEAD^{tree}
vdye Dec 2, 2021
598d081
release: include GIT_BUILT_FROM_COMMIT in MacOS build
vdye Dec 2, 2021
3ad2e4b
release: add installer validation
ldennington Aug 17, 2022
e0dff9c
update-microsoft-git: create barebones builtin
derrickstolee Apr 29, 2021
03ba50e
update-microsoft-git: Windows implementation
derrickstolee Apr 29, 2021
56db279
update-microsoft-git: use brew on macOS
derrickstolee Apr 29, 2021
7aba314
.github: reinstate ISSUE_TEMPLATE.md for microsoft/git
derrickstolee Mar 16, 2022
e13efec
.github: update PULL_REQUEST_TEMPLATE.md
derrickstolee Mar 16, 2022
9f417ec
Adjust README.md for microsoft/git
May 4, 2021
dc37377
Merge branch 'microsoft/vfs-2.35.0'
dscho Oct 7, 2021
0e155a3
Merge branch 'scalar'
dscho Aug 24, 2021
3fab670
scalar: implement a minimal JSON parser
dscho Apr 26, 2021
1822022
scalar clone: support GVFS-enabled remote repositories
dscho Aug 24, 2021
990c6b1
test-gvfs-protocol: also serve smart protocol
dscho Apr 16, 2021
790823e
gvfs-helper: add the `endpoint` command
dscho Apr 26, 2021
d51400c
dir_inside_of(): handle directory separators correctly
dscho May 14, 2021
40b4a20
scalar: disable authentication in unattended mode
dscho May 6, 2021
b0f6df4
scalar: do initialize `gvfs.sharedCache`
dscho May 3, 2021
8cda0eb
scalar diagnose: include shared cache info
dscho Jun 1, 2021
d7fc26b
scalar: only try GVFS protocol on https:// URLs
dscho Apr 28, 2021
dffce17
scalar: verify that we can use a GVFS-enabled repository
dscho Apr 16, 2021
4b25bc2
scalar: add the `cache-server` command
dscho Apr 23, 2021
ccbd379
scalar: add a test toggle to skip accessing the vsts/info endpoint
dscho May 12, 2021
c555193
scalar: adjust documentation to the microsoft/git fork
dscho Jan 25, 2022
8612828
scalar: enable untracked cache unconditionally
derrickstolee Jun 21, 2021
38d57c4
scalar: parse `clone --no-fetch-commits-and-trees` for backwards comp…
dscho Aug 24, 2021
baeb576
scalar: make GVFS Protocol a forced choice
derrickstolee May 1, 2024
45fda45
scalar: work around GVFS Protocol HTTP/2 failures
Copilot May 22, 2025
9f6983b
scalar diagnose: accommodate Scalar's Functional Tests
dscho May 9, 2022
1ff70b3
ci: run Scalar's Functional Tests
dscho Jun 8, 2021
70305e1
scalar: upgrade to newest FSMonitor config setting
vdye Apr 5, 2022
d17d6e0
abspath: make strip_last_path_component() global
derrickstolee Oct 4, 2022
9a52cd9
scalar: .scalarCache should live above enlistment
derrickstolee Sep 30, 2022
9694d13
Merge branch 'scalar-with-gvfs'
dscho May 3, 2021
a467b2d
Merge branch 'run-scalar-functional-tests'
dscho Nov 16, 2021
5498ddb
Merge branch 'scalar-reconfigure'
dscho Jun 1, 2021
e6847f0
Merge pull request #536: Allow --no-src during clones and git worktre…
dscho Oct 4, 2022
97b8530
add/rm: allow adding sparse entries when virtual
derrickstolee Jun 29, 2021
cd6b23c
sparse-checkout: add config to disable deleting dirs
derrickstolee Aug 22, 2021
f2d63eb
diff: ignore sparse paths in diffstat
derrickstolee Jul 26, 2021
2b0ccf7
repo-settings: enable sparse index by default
derrickstolee Jun 15, 2021
84fc7ab
Merge pull request #392: add: allow adding sparse entries when virtual
derrickstolee Jul 1, 2021
19377d5
Merge pull request #410: Sparse Index: latest integrations
derrickstolee Aug 24, 2021
8093105
Merge pull request #414: Make sparse index the default
derrickstolee Aug 26, 2021
265f2d4
diff(sparse-index): verify with partially-sparse
ldennington Sep 10, 2021
4ea711d
Merge pull request #419 from ldennington/sparse-index-diff
ldennington Sep 12, 2021
ebea5eb
stash: expand testing for `git stash -u`
vdye Sep 22, 2021
855bc6c
Merge pull request #430 from vdye/sparse-index/clean
vdye Sep 23, 2021
646ce58
Merge pull request #432: sequencer: avoid progress when stderr is red…
derrickstolee Sep 23, 2021
aaf3ac1
sparse: add vfs-specific precautions
derrickstolee Oct 31, 2021
024a07a
reset: fix mixed reset when using virtual filesystem
Mar 15, 2017
663d028
Merge pull request #494: reset: fix mixed reset when using virtual fi…
derrickstolee Apr 4, 2022
8894896
Merge advanced VFS-specific features
dscho Jun 11, 2018
850ac00
Merge virtualfilesystem hook
dscho Jun 11, 2018
69d2ee0
Merge updates to serialized status
dscho Jun 11, 2018
89f644a
Merge trace2 experimental regions
jeffhostetler Apr 23, 2019
b525093
Merge first wave of gvfs-helper feature
jeffhostetler Nov 14, 2019
3ff6d8e
Merge gvfs-helper prefetch feature
derrickstolee Dec 17, 2019
f8584f3
Harden gvfs-helper to validate the packfiles in a multipart prefetch …
jeffhostetler Apr 17, 2023
356effb
gvfs-helper: add gvfs.fallback and unit tests (#665)
dscho Jul 1, 2024
af8ccc5
Merge pull request #301: Update 'git maintenance' to match upstream
derrickstolee Dec 15, 2020
06e1ebc
Merge pull request #315: unpack-trees:virtualfilesystem: Improve effi…
derrickstolee Feb 16, 2021
a18b52c
Merge branch 'add-workflows'
derrickstolee Apr 30, 2021
ea70998
Merge branch 'adjust-g4w-workflows'
dscho May 13, 2022
9e88f52
Merge pull request #399 from vdye/feature/build-installers
vdye Jul 29, 2021
d108989
Merge pull request #472 from vdye/ms/macos-build-options
vdye Dec 6, 2021
900e53b
Merge pull request #329: Add `git update-microsoft-git`
derrickstolee Apr 30, 2021
ce4674f
Merge pull request #333: update microsoft/git README
derrickstolee May 17, 2021
2f1ee9a
Merge pull request #371 from dscho/run-scalar-functional-tests-and-fi…
dscho Jun 9, 2021
865477b
Merge branch 'sparse-index-stuff'
dscho Jun 17, 2022
a39df43
sparse-index: add ensure_full_index_with_reason()
derrickstolee Sep 30, 2024
f73dfc2
treewide: add reasons for expanding index
derrickstolee Sep 30, 2024
ee986cf
treewide: custom reasons for expanding index
derrickstolee Sep 30, 2024
16e5e46
sparse-index: add macro for unaudited expansions
derrickstolee Sep 30, 2024
326d69e
Docs: update sparse index plan with logging
derrickstolee Sep 30, 2024
5e40c29
sparse-index: log failure to clear skip-worktree
derrickstolee Sep 30, 2024
e65e558
Sparse Index: log why the index is being expanded (#691)
dscho Oct 9, 2024
4a8e03b
stash: use -f in checkout-index child process
derrickstolee Sep 30, 2024
bc37d08
sparse-index: do not copy hashtables during expansion
derrickstolee Sep 27, 2024
5a42cef
Fix rare segfault in sparse-index (#690)
dscho Oct 9, 2024
e7e2be9
sparse-checkout: remove use of the_repository
derrickstolee Jul 7, 2025
648d5bb
sparse-checkout: add basics of 'clean' command
derrickstolee Jul 7, 2025
73078bd
sparse-checkout: match some 'clean' behavior
derrickstolee Jul 15, 2025
6781125
dir: add generic "walk all files" helper
derrickstolee Jul 15, 2025
5908996
sparse-checkout: add --verbose option to 'clean'
derrickstolee Jul 15, 2025
2567852
sparse-index: point users to new 'clean' action
derrickstolee Jul 7, 2025
aafdeed
t: expand tests around sparse merges and clean
derrickstolee Jul 16, 2025
61b104b
sparse-checkout: make 'clean' clear more files
derrickstolee Jul 16, 2025
d7cb614
sparse-checkout: mark 'clean' as experimental
derrickstolee Aug 5, 2025
9e6c353
Add 'git sparse-checkout clean' (#779)
dscho Aug 5, 2025
74aac4e
sub-process: avoid leaking `cmd`
dscho Dec 18, 2024
5c94575
remote-curl: release filter options before re-setting them
dscho Dec 18, 2024
db67630
transport: release object filter options
dscho Dec 18, 2024
9d7c1b9
Merge branch 'leak-fixes'
dscho Dec 18, 2024
825cb83
push: don't reuse deltas with path walk
derrickstolee Nov 16, 2024
925a395
pack-objects: don't reuse deltas with path walk (#707)
dscho Dec 19, 2024
a29e87e
t7900-maintenance.sh: reset config between tests
mjcheetham Jan 22, 2025
7502fb9
maintenance: add cache-local-objects maintenance task
mjcheetham Jan 14, 2025
95eb365
scalar.c: add cache-local-objects task
mjcheetham Jan 23, 2025
08958ae
maintenance: add new `cache-local-objects` maintenance task (#720)
mjcheetham Jan 31, 2025
40ff696
git.c: add VFS enabled cmd blocking
mjcheetham Mar 6, 2025
78a886d
git.c: permit repack cmd in Scalar repos
mjcheetham Mar 6, 2025
0d1e58f
git.c: permit fsck cmd in Scalar repos
mjcheetham Mar 13, 2025
9d038b5
git.c: permit prune cmd in Scalar repos
mjcheetham Mar 13, 2025
f8208e9
worktree: remove special case GVFS cmd blocking
mjcheetham Mar 6, 2025
24ee85e
builtin/repack.c: emit warning when shared cache is present
mjcheetham Mar 26, 2025
f815816
hooks: add custom post-command hook config
derrickstolee Mar 25, 2025
01797da
Docs: fix asciidoc failures from short delimiters
derrickstolee Mar 25, 2025
834836e
hooks: make hook logic memory-leak free
derrickstolee Mar 25, 2025
99483ea
Permit `repack` command in Scalar clones (#732)
mjcheetham Mar 31, 2025
9f9fffe
hooks: add custom post-command hook config (#736)
dscho Apr 7, 2025
d855545
t5309: create failing test for 'git index-pack'
derrickstolee Apr 23, 2025
e5919ad
Fix REF_DELTA chain bug in 'git index-pack' (#745)
dscho Apr 25, 2025
e5ed366
gvfs-helper: pass `long` values where expected
dscho Jun 6, 2025
c53053e
Merge branch 'curl-options-want-long-instead-of-int-msft-git'
dscho Jun 6, 2025
d750683
gvfs-helper-client: clean up server process(es)
derrickstolee May 23, 2025
01c7f92
gvfs-helper-client: clean up server process (#756)
dscho Jun 13, 2025
3fbefc5
Merge branch 'codeql'
dscho Mar 21, 2025
244d3fc
Merge branch 'codeql'
dscho Mar 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
- [ ] I was not able to find an [open](https://github.com/microsoft/git/issues?q=is%3Aopen)
or [closed](https://github.com/microsoft/git/issues?q=is%3Aclosed) issue matching
what I'm seeing, including in [the `git-for-windows/git` tracker](https://github.com/git-for-windows/git/issues).

### Setup

- Which version of `microsoft/git` are you using? Is it 32-bit or 64-bit?

```
$ git --version --build-options

** insert your machine's response here **
```

Are you using Scalar or VFS for Git?

** insert your answer here **

If VFS for Git, then what version?

```
$ gvfs version

** insert your machine's response here **
```

- Which version of Windows are you running? Vista, 7, 8, 10? Is it 32-bit or 64-bit?

```
$ cmd.exe /c ver

** insert your machine's response here **
```

- Any other interesting things about your environment that might be related
to the issue you're seeing?

** insert your response here **

### Details

- Which terminal/shell are you running Git from? e.g Bash/CMD/PowerShell/other

** insert your response here **

- What commands did you run to trigger this issue? If you can provide a
[Minimal, Complete, and Verifiable example](http://stackoverflow.com/help/mcve)
this will help us understand the issue.

```
** insert your commands here **
```
- What did you expect to occur after running these commands?

** insert here **

- What actually happened instead?

** insert here **

- If the problem was occurring with a specific repository, can you specify
the repository?

* [ ] Public repo: **insert URL here**
* [ ] Windows monorepo
* [ ] Office monorepo
* [ ] Other Microsoft-internal repo: **insert name here**
* [ ] Other internal repo.
105 changes: 0 additions & 105 deletions .github/ISSUE_TEMPLATE/bug-report.yml

This file was deleted.

1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/config.yml

This file was deleted.

28 changes: 8 additions & 20 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
Thanks for taking the time to contribute to Git!

Those seeking to contribute to the Git for Windows fork should see
http://gitforwindows.org/#contribute on how to contribute Windows specific
enhancements.

If your contribution is for the core Git functions and documentation
please be aware that the Git community does not use the github.com issues
or pull request mechanism for their contributions.

Instead, we use the Git mailing list ([email protected]) for code and
documentation submissions, code reviews, and bug reports. The
mailing list is plain text only (anything with HTML is sent directly
to the spam folder).

Nevertheless, you can use GitGitGadget (https://gitgitgadget.github.io/)
to conveniently send your Pull Requests commits to our mailing list.

For a single-commit pull request, please *leave the pull request description
empty*: your commit message itself should describe your changes.

Please read the "guidelines for contributing" linked above!
This fork contains changes specific to monorepo scenarios. If you are an
external contributor, then please detail your reason for submitting to
this fork:

* [ ] This is an early version of work already under review upstream.
* [ ] This change only applies to interactions with Azure DevOps and the
GVFS Protocol.
* [ ] This change only applies to the virtualization hook and VFS for Git.
54 changes: 54 additions & 0 deletions .github/actions/akv-secret/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Get Azure Key Vault Secrets

description: |
Get secrets from Azure Key Vault and store the results as masked step outputs,
environment variables, or files.

inputs:
vault:
required: true
description: Name of the Azure Key Vault.
secrets:
required: true
description: |
Comma- or newline-separated list of secret names in Azure Key Vault.
The output and encoding of secrets can be specified using this syntax:

SECRET ENCODING> $output:OUTPUT
SECRET ENCODING> $env:ENVAR
SECRET ENCODING> FILE

SECRET Name of the secret in Azure Key Vault.
ENCODING (optional) Encoding of the secret: base64.
OUTPUT Name of a step output variable.
ENVAR Name of an environment variable.
FILE File path (relative or absolute).

If no output format is specified the default is a step output variable
with the same name as the secret. I.e, SECRET > $output:SECRET.

Examples:

Assign output variable named `raw-var` to the raw value of the secret
`raw-secret`:

raw-secret > $output:raw-var

Assign output variable named `decoded-var` to the base64 decoded value
of the secret `encoded-secret`:

encoded-secret base64> $output:decoded-var

Download the secret named `tls-certificate` to the file path
`.certs/tls.cert`:

tls-certificate > .certs/tls.cert

Assign environment variable `ENV_SECRET` to the base64 decoded value of
the secret `encoded-secret`:

encoded-secret base64> $env:ENV_SECRET

runs:
using: node20
main: index.js
Loading
Loading