Merge pull request #598 from actions/joshmgross/exclude-hidden-files

Exclude hidden files by default
Add a warning about enabling include-hidden-files
2025-06-15 00:07:12 +02:00 · 2024-08-29 10:38:39 -04:00 · 2024-08-15 19:45:59 -04:00 · 2024-08-15 19:39:39 -04:00 · 2024-08-15 17:36:20 -04:00 · 2024-08-15 17:35:00 -04:00
20 changed files with 325 additions and 324 deletions
--- a/.licenses/npm/@actions/glob.dep.yml
+++ b/.licenses/npm/@actions/glob.dep.yml
@ -1,6 +1,6 @@
 ---
 name: "@actions/glob"
-version: 0.3.0
+version: 0.5.0
 type: npm
 summary: 
 homepage: 
--- a/README.md
+++ b/README.md
@ -16,7 +16,6 @@ See also [download-artifact](https://github.com/actions/download-artifact).
    - [Breaking Changes](#breaking-changes)
  - [Usage](#usage)
    - [Inputs](#inputs)
-      - [Uploading the `.git` directory](#uploading-the-git-directory)
    - [Outputs](#outputs)
  - [Examples](#examples)
    - [Upload an Individual File](#upload-an-individual-file)
@ -65,7 +64,7 @@ There is also a new sub-action, `actions/upload-artifact/merge`. For more info,
    Due to how Artifacts are created in this new version, it is no longer possible to upload to the same named Artifact multiple times. You must either split the uploads into multiple Artifacts with different names, or only upload once. Otherwise you _will_ encounter an error.

 3. Limit of Artifacts for an individual job. Each job in a workflow run now has a limit of 500 artifacts.
-4. With `v4.4` and later, the `.git` directory is excluded by default.
+4. With `v4.4` and later, hidden files are excluded by default.

 For assistance with breaking changes, see [MIGRATION.md](docs/MIGRATION.md).

@ -109,30 +108,12 @@ For assistance with breaking changes, see [MIGRATION.md](docs/MIGRATION.md).
    # Does not fail if the artifact does not exist.
    # Optional. Default is 'false'
    overwrite:
-```

-#### Uploading the `.git` directory
-
-By default, files in a `.git` directory are ignored in the uploaded artifact.
-This is intended to prevent accidentally uploading Git credentials into an artifact that could then
-be extracted.
-If files in the `.git` directory are needed, ensure that `actions/checkout` is being used with
-`persist-credentials: false`.
-
-```yaml
-jobs:
-  upload:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false # Ensure credentials are not saved in `.git/config`
-
-      - uses: actions/upload-artifact@v4
-        with:
-          path: .
-          include-git-directory: true
+    # Whether to include hidden files in the provided path in the artifact
+    # The file contents of any hidden files in the path should be validated before
+    # enabled this to avoid uploading sensitive information.
+    # Optional. Default is 'false'
+    include-hidden-files:
 ```

 ### Outputs
--- a/tests/search.test.ts
+++ b/tests/search.test.ts
@ -61,11 +61,19 @@ const lonelyFilePath = path.join(
  'lonely-file.txt'
 )

-const gitConfigPath = path.join(root, '.git', 'config')
-const gitHeadPath = path.join(root, '.git', 'HEAD')
-
-const nestedGitConfigPath = path.join(root, 'repository-name', '.git', 'config')
-const nestedGitHeadPath = path.join(root, 'repository-name', '.git', 'HEAD')
+const hiddenFile = path.join(root, '.hidden-file.txt')
+const fileInHiddenFolderPath = path.join(
+  root,
+  '.hidden-folder',
+  'folder-in-hidden-folder',
+  'file.txt'
+)
+const fileInHiddenFolderInFolderA = path.join(
+  root,
+  'folder-a',
+  '.hidden-folder-in-folder-a',
+  'file.txt'
+)

 describe('Search', () => {
  beforeAll(async () => {
@ -99,8 +107,11 @@ describe('Search', () => {
      recursive: true
    })

-    await fs.mkdir(path.join(root, '.git'))
-    await fs.mkdir(path.join(root, 'repository-name', '.git'), {
+    await fs.mkdir(
+      path.join(root, '.hidden-folder', 'folder-in-hidden-folder'),
+      {recursive: true}
+    )
+    await fs.mkdir(path.join(root, 'folder-a', '.hidden-folder-in-folder-a'), {
      recursive: true
    })

@ -122,17 +133,18 @@ describe('Search', () => {

    await fs.writeFile(lonelyFilePath, 'all by itself')

-    await fs.writeFile(gitConfigPath, 'git config file')
-    await fs.writeFile(gitHeadPath, 'git head file')
-    await fs.writeFile(nestedGitConfigPath, 'nested git config file')
-    await fs.writeFile(nestedGitHeadPath, 'nested git head file')
+    await fs.writeFile(hiddenFile, 'hidden file')
+    await fs.writeFile(fileInHiddenFolderPath, 'file in hidden directory')
+    await fs.writeFile(fileInHiddenFolderInFolderA, 'file in hidden directory')
    /*
      Directory structure of files that get created:
      root/
-          .git/
-              config
-              HEAD
+          .hidden-folder/
+              folder-in-hidden-folder/
+                  file.txt
          folder-a/
+              .hidden-folder-in-folder-a/
+                  file.txt
              folder-b/
                  folder-c/
                      search-item1.txt
@ -155,10 +167,7 @@ describe('Search', () => {
              folder-j/
                  folder-k/
                      lonely-file.txt
-          repository-name/
-            .git/
-                config
-                HEAD
+          .hidden-file.txt
          search-item5.txt
    */
  })
@ -376,17 +385,23 @@ describe('Search', () => {
    expect(searchResult.filesToUpload.includes(lonelyFilePath)).toEqual(true)
  })

-  it('Excludes .git directory by default', async () => {
-    const searchResult = await findFilesToUpload(root)
-    expect(searchResult.filesToUpload.length).toEqual(13)
-    expect(searchResult.filesToUpload).not.toContain(gitConfigPath)
+  it('Hidden files ignored by default', async () => {
+    const searchPath = path.join(root, '**/*')
+    const searchResult = await findFilesToUpload(searchPath)
+
+    expect(searchResult.filesToUpload).not.toContain(hiddenFile)
+    expect(searchResult.filesToUpload).not.toContain(fileInHiddenFolderPath)
+    expect(searchResult.filesToUpload).not.toContain(
+      fileInHiddenFolderInFolderA
+    )
  })

-  it('Includes .git directory when includeGitDirectory is true', async () => {
-    const searchResult = await findFilesToUpload(root, {
-      includeGitDirectory: true
-    })
-    expect(searchResult.filesToUpload.length).toEqual(17)
-    expect(searchResult.filesToUpload).toContain(gitConfigPath)
+  it('Hidden files included', async () => {
+    const searchPath = path.join(root, '**/*')
+    const searchResult = await findFilesToUpload(searchPath, true)
+
+    expect(searchResult.filesToUpload).toContain(hiddenFile)
+    expect(searchResult.filesToUpload).toContain(fileInHiddenFolderPath)
+    expect(searchResult.filesToUpload).toContain(fileInHiddenFolderInFolderA)
  })
 })
--- a/action.yml
+++ b/action.yml
@ -40,8 +40,10 @@ inputs:
      If false, the action will fail if an artifact for the given name already exists.
      Does not fail if the artifact does not exist.
    default: 'false'
-  include-git-directory:
-    description: 'Include files in the .git directory in the artifact.'
+  include-hidden-files:
+    description: >
+      If true, hidden files will be included in the artifact.
+      If false, hidden files will be excluded from the artifact.
    default: 'false'

 outputs:
--- a/dist/merge/index.js
+++ b/dist/merge/index.js
@ -8881,16 +8881,18 @@ exports.create = create;
 * Computes the sha256 hash of a glob
 *
 * @param patterns  Patterns separated by newlines
+ * @param currentWorkspace  Workspace used when matching files
 * @param options   Glob options
+ * @param verbose   Enables verbose logging
 */
-function hashFiles(patterns, options, verbose = false) {
+function hashFiles(patterns, currentWorkspace = '', options, verbose = false) {
    return __awaiter(this, void 0, void 0, function* () {
        let followSymbolicLinks = true;
        if (options && typeof options.followSymbolicLinks === 'boolean') {
            followSymbolicLinks = options.followSymbolicLinks;
        }
        const globber = yield create(patterns, { followSymbolicLinks });
-        return internal_hash_files_1.hashFiles(globber, verbose);
+        return (0, internal_hash_files_1.hashFiles)(globber, currentWorkspace, verbose);
    });
 }
 exports.hashFiles = hashFiles;
@ -8905,7 +8907,11 @@ exports.hashFiles = hashFiles;

 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
    o[k2] = m[k];
@ -8918,7 +8924,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -8933,7 +8939,8 @@ function getOptions(copy) {
        followSymbolicLinks: true,
        implicitDescendants: true,
        matchDirectories: true,
-        omitBrokenSymbolicLinks: true
+        omitBrokenSymbolicLinks: true,
+        excludeHiddenFiles: false
    };
    if (copy) {
        if (typeof copy.followSymbolicLinks === 'boolean') {
@ -8952,6 +8959,10 @@ function getOptions(copy) {
            result.omitBrokenSymbolicLinks = copy.omitBrokenSymbolicLinks;
            core.debug(`omitBrokenSymbolicLinks '${result.omitBrokenSymbolicLinks}'`);
        }
+        if (typeof copy.excludeHiddenFiles === 'boolean') {
+            result.excludeHiddenFiles = copy.excludeHiddenFiles;
+            core.debug(`excludeHiddenFiles '${result.excludeHiddenFiles}'`);
+        }
    }
    return result;
 }
@ -8967,7 +8978,11 @@ exports.getOptions = getOptions;

 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
    o[k2] = m[k];
@ -8980,7 +8995,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -9034,19 +9049,21 @@ class DefaultGlobber {
        return this.searchPaths.slice();
    }
    glob() {
-        var e_1, _a;
+        var _a, e_1, _b, _c;
        return __awaiter(this, void 0, void 0, function* () {
            const result = [];
            try {
-                for (var _b = __asyncValues(this.globGenerator()), _c; _c = yield _b.next(), !_c.done;) {
-                    const itemPath = _c.value;
+                for (var _d = true, _e = __asyncValues(this.globGenerator()), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
+                    _c = _f.value;
+                    _d = false;
+                    const itemPath = _c;
                    result.push(itemPath);
                }
            }
            catch (e_1_1) { e_1 = { error: e_1_1 }; }
            finally {
                try {
-                    if (_c && !_c.done && (_a = _b.return)) yield _a.call(_b);
+                    if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
                }
                finally { if (e_1) throw e_1.error; }
            }
@ -9104,6 +9121,10 @@ class DefaultGlobber {
                if (!stats) {
                    continue;
                }
+                // Hidden file or directory?
+                if (options.excludeHiddenFiles && path.basename(item.path).match(/^\./)) {
+                    continue;
+                }
                // Directory
                if (stats.isDirectory()) {
                    // Matched
@ -9209,7 +9230,11 @@ exports.DefaultGlobber = DefaultGlobber;

 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
    o[k2] = m[k];
@ -9222,7 +9247,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -9250,18 +9275,22 @@ const fs = __importStar(__nccwpck_require__(57147));
 const stream = __importStar(__nccwpck_require__(12781));
 const util = __importStar(__nccwpck_require__(73837));
 const path = __importStar(__nccwpck_require__(71017));
-function hashFiles(globber, verbose = false) {
-    var e_1, _a;
-    var _b;
+function hashFiles(globber, currentWorkspace, verbose = false) {
+    var _a, e_1, _b, _c;
+    var _d;
    return __awaiter(this, void 0, void 0, function* () {
        const writeDelegate = verbose ? core.info : core.debug;
        let hasMatch = false;
-        const githubWorkspace = (_b = process.env['GITHUB_WORKSPACE']) !== null && _b !== void 0 ? _b : process.cwd();
+        const githubWorkspace = currentWorkspace
+            ? currentWorkspace
+            : (_d = process.env['GITHUB_WORKSPACE']) !== null && _d !== void 0 ? _d : process.cwd();
        const result = crypto.createHash('sha256');
        let count = 0;
        try {
-            for (var _c = __asyncValues(globber.globGenerator()), _d; _d = yield _c.next(), !_d.done;) {
-                const file = _d.value;
+            for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a; _e = true) {
+                _c = _g.value;
+                _e = false;
+                const file = _c;
                writeDelegate(file);
                if (!file.startsWith(`${githubWorkspace}${path.sep}`)) {
                    writeDelegate(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`);
@ -9284,7 +9313,7 @@ function hashFiles(globber, verbose = false) {
        catch (e_1_1) { e_1 = { error: e_1_1 }; }
        finally {
            try {
-                if (_d && !_d.done && (_a = _c.return)) yield _a.call(_c);
+                if (!_e && !_a && (_b = _f.return)) yield _b.call(_f);
            }
            finally { if (e_1) throw e_1.error; }
        }
@ -9324,7 +9353,7 @@ var MatchKind;
    MatchKind[MatchKind["File"] = 2] = "File";
    /** Matched */
    MatchKind[MatchKind["All"] = 3] = "All";
-})(MatchKind = exports.MatchKind || (exports.MatchKind = {}));
+})(MatchKind || (exports.MatchKind = MatchKind = {}));
 //# sourceMappingURL=internal-match-kind.js.map

 /***/ }),
@ -9336,7 +9365,11 @@ var MatchKind;

 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
    o[k2] = m[k];
@ -9349,7 +9382,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -9399,8 +9432,8 @@ exports.dirname = dirname;
 * or `C:` are expanded based on the current working directory.
 */
 function ensureAbsoluteRoot(root, itemPath) {
-    assert_1.default(root, `ensureAbsoluteRoot parameter 'root' must not be empty`);
-    assert_1.default(itemPath, `ensureAbsoluteRoot parameter 'itemPath' must not be empty`);
+    (0, assert_1.default)(root, `ensureAbsoluteRoot parameter 'root' must not be empty`);
+    (0, assert_1.default)(itemPath, `ensureAbsoluteRoot parameter 'itemPath' must not be empty`);
    // Already rooted
    if (hasAbsoluteRoot(itemPath)) {
        return itemPath;
@ -9410,7 +9443,7 @@ function ensureAbsoluteRoot(root, itemPath) {
        // Check for itemPath like C: or C:foo
        if (itemPath.match(/^[A-Z]:[^\\/]|^[A-Z]:$/i)) {
            let cwd = process.cwd();
-            assert_1.default(cwd.match(/^[A-Z]:\\/i), `Expected current directory to start with an absolute drive root. Actual '${cwd}'`);
+            (0, assert_1.default)(cwd.match(/^[A-Z]:\\/i), `Expected current directory to start with an absolute drive root. Actual '${cwd}'`);
            // Drive letter matches cwd? Expand to cwd
            if (itemPath[0].toUpperCase() === cwd[0].toUpperCase()) {
                // Drive only, e.g. C:
@ -9435,11 +9468,11 @@ function ensureAbsoluteRoot(root, itemPath) {
        // Check for itemPath like \ or \foo
        else if (normalizeSeparators(itemPath).match(/^\\$|^\\[^\\]/)) {
            const cwd = process.cwd();
-            assert_1.default(cwd.match(/^[A-Z]:\\/i), `Expected current directory to start with an absolute drive root. Actual '${cwd}'`);
+            (0, assert_1.default)(cwd.match(/^[A-Z]:\\/i), `Expected current directory to start with an absolute drive root. Actual '${cwd}'`);
            return `${cwd[0]}:\\${itemPath.substr(1)}`;
        }
    }
-    assert_1.default(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`);
+    (0, assert_1.default)(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`);
    // Otherwise ensure root ends with a separator
    if (root.endsWith('/') || (IS_WINDOWS && root.endsWith('\\'))) {
        // Intentionally empty
@ -9456,7 +9489,7 @@ exports.ensureAbsoluteRoot = ensureAbsoluteRoot;
 * `\\hello\share` and `C:\hello` (and using alternate separator).
 */
 function hasAbsoluteRoot(itemPath) {
-    assert_1.default(itemPath, `hasAbsoluteRoot parameter 'itemPath' must not be empty`);
+    (0, assert_1.default)(itemPath, `hasAbsoluteRoot parameter 'itemPath' must not be empty`);
    // Normalize separators
    itemPath = normalizeSeparators(itemPath);
    // Windows
@ -9473,7 +9506,7 @@ exports.hasAbsoluteRoot = hasAbsoluteRoot;
 * `\`, `\hello`, `\\hello\share`, `C:`, and `C:\hello` (and using alternate separator).
 */
 function hasRoot(itemPath) {
-    assert_1.default(itemPath, `isRooted parameter 'itemPath' must not be empty`);
+    (0, assert_1.default)(itemPath, `isRooted parameter 'itemPath' must not be empty`);
    // Normalize separators
    itemPath = normalizeSeparators(itemPath);
    // Windows
@ -9541,7 +9574,11 @@ exports.safeTrimTrailingSeparator = safeTrimTrailingSeparator;

 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
    o[k2] = m[k];
@ -9554,7 +9591,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -9579,7 +9616,7 @@ class Path {
        this.segments = [];
        // String
        if (typeof itemPath === 'string') {
-            assert_1.default(itemPath, `Parameter 'itemPath' must not be empty`);
+            (0, assert_1.default)(itemPath, `Parameter 'itemPath' must not be empty`);
            // Normalize slashes and trim unnecessary trailing slash
            itemPath = pathHelper.safeTrimTrailingSeparator(itemPath);
            // Not rooted
@ -9606,24 +9643,24 @@ class Path {
        // Array
        else {
            // Must not be empty
-            assert_1.default(itemPath.length > 0, `Parameter 'itemPath' must not be an empty array`);
+            (0, assert_1.default)(itemPath.length > 0, `Parameter 'itemPath' must not be an empty array`);
            // Each segment
            for (let i = 0; i < itemPath.length; i++) {
                let segment = itemPath[i];
                // Must not be empty
-                assert_1.default(segment, `Parameter 'itemPath' must not contain any empty segments`);
+                (0, assert_1.default)(segment, `Parameter 'itemPath' must not contain any empty segments`);
                // Normalize slashes
                segment = pathHelper.normalizeSeparators(itemPath[i]);
                // Root segment
                if (i === 0 && pathHelper.hasRoot(segment)) {
                    segment = pathHelper.safeTrimTrailingSeparator(segment);
-                    assert_1.default(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`);
+                    (0, assert_1.default)(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`);
                    this.segments.push(segment);
                }
                // All other segments
                else {
                    // Must not contain slash
-                    assert_1.default(!segment.includes(path.sep), `Parameter 'itemPath' contains unexpected path separators`);
+                    (0, assert_1.default)(!segment.includes(path.sep), `Parameter 'itemPath' contains unexpected path separators`);
                    this.segments.push(segment);
                }
            }
@ -9661,7 +9698,11 @@ exports.Path = Path;

 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
    o[k2] = m[k];
@ -9674,7 +9715,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -9762,7 +9803,11 @@ exports.partialMatch = partialMatch;

 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
    o[k2] = m[k];
@ -9775,7 +9820,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -9807,9 +9852,9 @@ class Pattern {
        else {
            // Convert to pattern
            segments = segments || [];
-            assert_1.default(segments.length, `Parameter 'segments' must not empty`);
+            (0, assert_1.default)(segments.length, `Parameter 'segments' must not empty`);
            const root = Pattern.getLiteral(segments[0]);
-            assert_1.default(root && pathHelper.hasAbsoluteRoot(root), `Parameter 'segments' first element must be a root path`);
+            (0, assert_1.default)(root && pathHelper.hasAbsoluteRoot(root), `Parameter 'segments' first element must be a root path`);
            pattern = new internal_path_1.Path(segments).toString().trim();
            if (patternOrNegate) {
                pattern = `!${pattern}`;
@ -9903,13 +9948,13 @@ class Pattern {
     */
    static fixupPattern(pattern, homedir) {
        // Empty
-        assert_1.default(pattern, 'pattern cannot be empty');
+        (0, assert_1.default)(pattern, 'pattern cannot be empty');
        // Must not contain `.` segment, unless first segment
        // Must not contain `..` segment
        const literalSegments = new internal_path_1.Path(pattern).segments.map(x => Pattern.getLiteral(x));
-        assert_1.default(literalSegments.every((x, i) => (x !== '.' || i === 0) && x !== '..'), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`);
+        (0, assert_1.default)(literalSegments.every((x, i) => (x !== '.' || i === 0) && x !== '..'), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`);
        // Must not contain globs in root, e.g. Windows UNC path \\foo\b*r
-        assert_1.default(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`);
+        (0, assert_1.default)(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`);
        // Normalize slashes
        pattern = pathHelper.normalizeSeparators(pattern);
        // Replace leading `.` segment
@ -9919,8 +9964,8 @@ class Pattern {
        // Replace leading `~` segment
        else if (pattern === '~' || pattern.startsWith(`~${path.sep}`)) {
            homedir = homedir || os.homedir();
-            assert_1.default(homedir, 'Unable to determine HOME directory');
-            assert_1.default(pathHelper.hasAbsoluteRoot(homedir), `Expected HOME directory to be a rooted path. Actual '${homedir}'`);
+            (0, assert_1.default)(homedir, 'Unable to determine HOME directory');
+            (0, assert_1.default)(pathHelper.hasAbsoluteRoot(homedir), `Expected HOME directory to be a rooted path. Actual '${homedir}'`);
            pattern = Pattern.globEscape(homedir) + pattern.substr(1);
        }
        // Replace relative drive root, e.g. pattern is C: or C:foo
@ -125727,7 +125772,7 @@ var Inputs;
    Inputs["RetentionDays"] = "retention-days";
    Inputs["CompressionLevel"] = "compression-level";
    Inputs["DeleteMerged"] = "delete-merged";
-    Inputs["IncludeGitDirectory"] = "include-git-directory";
+    Inputs["IncludeHiddenFiles"] = "include-hidden-files";
 })(Inputs = exports.Inputs || (exports.Inputs = {}));


@ -125811,7 +125856,7 @@ function getInputs() {
    const pattern = core.getInput(constants_1.Inputs.Pattern, { required: true });
    const separateDirectories = core.getBooleanInput(constants_1.Inputs.SeparateDirectories);
    const deleteMerged = core.getBooleanInput(constants_1.Inputs.DeleteMerged);
-    const includeGitDirectory = core.getBooleanInput(constants_1.Inputs.IncludeGitDirectory);
+    const includeHiddenFiles = core.getBooleanInput(constants_1.Inputs.IncludeHiddenFiles);
    const inputs = {
        name,
        pattern,
@ -125819,7 +125864,7 @@ function getInputs() {
        deleteMerged,
        retentionDays: 0,
        compressionLevel: 6,
-        includeGitDirectory
+        includeHiddenFiles
    };
    const retentionDaysStr = core.getInput(constants_1.Inputs.RetentionDays);
    if (retentionDaysStr) {
@ -125935,9 +125980,7 @@ function run() {
        if (typeof inputs.compressionLevel !== 'undefined') {
            options.compressionLevel = inputs.compressionLevel;
        }
-        const searchResult = yield (0, search_1.findFilesToUpload)(tmpDir, {
-            includeGitDirectory: inputs.includeGitDirectory
-        });
+        const searchResult = yield (0, search_1.findFilesToUpload)(tmpDir, inputs.includeHiddenFiles);
        yield (0, upload_artifact_1.uploadArtifact)(inputs.name, searchResult.filesToUpload, searchResult.rootDirectory, options);
        core.info(`The ${artifacts.length} artifact(s) have been successfully merged!`);
        if (inputs.deleteMerged) {
@ -126004,11 +126047,12 @@ const fs_1 = __nccwpck_require__(57147);
 const path_1 = __nccwpck_require__(71017);
 const util_1 = __nccwpck_require__(73837);
 const stats = (0, util_1.promisify)(fs_1.stat);
-function getDefaultGlobOptions() {
+function getDefaultGlobOptions(includeHiddenFiles) {
    return {
        followSymbolicLinks: true,
        implicitDescendants: true,
-        omitBrokenSymbolicLinks: true
+        omitBrokenSymbolicLinks: true,
+        excludeHiddenFiles: !includeHiddenFiles
    };
 }
 /**
@ -126062,10 +126106,10 @@ function getMultiPathLCA(searchPaths) {
    }
    return path.join(...commonPaths);
 }
-function findFilesToUpload(searchPath, searchOptions) {
+function findFilesToUpload(searchPath, includeHiddenFiles) {
    return __awaiter(this, void 0, void 0, function* () {
        const searchResults = [];
-        const globber = yield glob.create(searchPath, getDefaultGlobOptions());
+        const globber = yield glob.create(searchPath, getDefaultGlobOptions(includeHiddenFiles || false));
        const rawSearchResults = yield globber.glob();
        /*
          Files are saved with case insensitivity. Uploading both a.txt and A.txt will files to be overwritten
@ -126081,10 +126125,6 @@ function findFilesToUpload(searchPath, searchOptions) {
            // isDirectory() returns false for symlinks if using fs.lstat(), make sure to use fs.stat() instead
            if (!fileStats.isDirectory()) {
                (0, core_1.debug)(`File:${searchResult} was found using the provided searchPath`);
-                if (!(searchOptions === null || searchOptions === void 0 ? void 0 : searchOptions.includeGitDirectory) && inGitDirectory(searchResult)) {
-                    (0, core_1.debug)(`Ignoring ${searchResult} because it is in the .git directory`);
-                    continue;
-                }
                searchResults.push(searchResult);
                // detect any files that would be overwritten because of case insensitivity
                if (set.has(searchResult.toLowerCase())) {
@ -126126,16 +126166,6 @@ function findFilesToUpload(searchPath, searchOptions) {
    });
 }
 exports.findFilesToUpload = findFilesToUpload;
-function inGitDirectory(filePath) {
-    // The .git directory is a directory, so we need to check if the file path is a directory
-    // and if it is a .git directory
-    for (const part of filePath.split(path.sep)) {
-        if (part === '.git') {
-            return true;
-        }
-    }
-    return false;
-}


 /***/ }),
--- a/dist/upload/index.js
+++ b/dist/upload/index.js
@ -8881,16 +8881,18 @@ exports.create = create;
 * Computes the sha256 hash of a glob
 *
 * @param patterns  Patterns separated by newlines
+ * @param currentWorkspace  Workspace used when matching files
 * @param options   Glob options
+ * @param verbose   Enables verbose logging
 */
-function hashFiles(patterns, options, verbose = false) {
+function hashFiles(patterns, currentWorkspace = '', options, verbose = false) {
    return __awaiter(this, void 0, void 0, function* () {
        let followSymbolicLinks = true;
        if (options && typeof options.followSymbolicLinks === 'boolean') {
            followSymbolicLinks = options.followSymbolicLinks;
        }
        const globber = yield create(patterns, { followSymbolicLinks });
-        return internal_hash_files_1.hashFiles(globber, verbose);
+        return (0, internal_hash_files_1.hashFiles)(globber, currentWorkspace, verbose);
    });
 }
 exports.hashFiles = hashFiles;
@ -8905,7 +8907,11 @@ exports.hashFiles = hashFiles;

 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
    o[k2] = m[k];
@ -8918,7 +8924,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -8933,7 +8939,8 @@ function getOptions(copy) {
        followSymbolicLinks: true,
        implicitDescendants: true,
        matchDirectories: true,
-        omitBrokenSymbolicLinks: true
+        omitBrokenSymbolicLinks: true,
+        excludeHiddenFiles: false
    };
    if (copy) {
        if (typeof copy.followSymbolicLinks === 'boolean') {
@ -8952,6 +8959,10 @@ function getOptions(copy) {
            result.omitBrokenSymbolicLinks = copy.omitBrokenSymbolicLinks;
            core.debug(`omitBrokenSymbolicLinks '${result.omitBrokenSymbolicLinks}'`);
        }
+        if (typeof copy.excludeHiddenFiles === 'boolean') {
+            result.excludeHiddenFiles = copy.excludeHiddenFiles;
+            core.debug(`excludeHiddenFiles '${result.excludeHiddenFiles}'`);
+        }
    }
    return result;
 }
@ -8967,7 +8978,11 @@ exports.getOptions = getOptions;

 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
    o[k2] = m[k];
@ -8980,7 +8995,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -9034,19 +9049,21 @@ class DefaultGlobber {
        return this.searchPaths.slice();
    }
    glob() {
-        var e_1, _a;
+        var _a, e_1, _b, _c;
        return __awaiter(this, void 0, void 0, function* () {
            const result = [];
            try {
-                for (var _b = __asyncValues(this.globGenerator()), _c; _c = yield _b.next(), !_c.done;) {
-                    const itemPath = _c.value;
+                for (var _d = true, _e = __asyncValues(this.globGenerator()), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
+                    _c = _f.value;
+                    _d = false;
+                    const itemPath = _c;
                    result.push(itemPath);
                }
            }
            catch (e_1_1) { e_1 = { error: e_1_1 }; }
            finally {
                try {
-                    if (_c && !_c.done && (_a = _b.return)) yield _a.call(_b);
+                    if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
                }
                finally { if (e_1) throw e_1.error; }
            }
@ -9104,6 +9121,10 @@ class DefaultGlobber {
                if (!stats) {
                    continue;
                }
+                // Hidden file or directory?
+                if (options.excludeHiddenFiles && path.basename(item.path).match(/^\./)) {
+                    continue;
+                }
                // Directory
                if (stats.isDirectory()) {
                    // Matched
@ -9209,7 +9230,11 @@ exports.DefaultGlobber = DefaultGlobber;

 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
    o[k2] = m[k];
@ -9222,7 +9247,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -9250,18 +9275,22 @@ const fs = __importStar(__nccwpck_require__(57147));
 const stream = __importStar(__nccwpck_require__(12781));
 const util = __importStar(__nccwpck_require__(73837));
 const path = __importStar(__nccwpck_require__(71017));
-function hashFiles(globber, verbose = false) {
-    var e_1, _a;
-    var _b;
+function hashFiles(globber, currentWorkspace, verbose = false) {
+    var _a, e_1, _b, _c;
+    var _d;
    return __awaiter(this, void 0, void 0, function* () {
        const writeDelegate = verbose ? core.info : core.debug;
        let hasMatch = false;
-        const githubWorkspace = (_b = process.env['GITHUB_WORKSPACE']) !== null && _b !== void 0 ? _b : process.cwd();
+        const githubWorkspace = currentWorkspace
+            ? currentWorkspace
+            : (_d = process.env['GITHUB_WORKSPACE']) !== null && _d !== void 0 ? _d : process.cwd();
        const result = crypto.createHash('sha256');
        let count = 0;
        try {
-            for (var _c = __asyncValues(globber.globGenerator()), _d; _d = yield _c.next(), !_d.done;) {
-                const file = _d.value;
+            for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a; _e = true) {
+                _c = _g.value;
+                _e = false;
+                const file = _c;
                writeDelegate(file);
                if (!file.startsWith(`${githubWorkspace}${path.sep}`)) {
                    writeDelegate(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`);
@ -9284,7 +9313,7 @@ function hashFiles(globber, verbose = false) {
        catch (e_1_1) { e_1 = { error: e_1_1 }; }
        finally {
            try {
-                if (_d && !_d.done && (_a = _c.return)) yield _a.call(_c);
+                if (!_e && !_a && (_b = _f.return)) yield _b.call(_f);
            }
            finally { if (e_1) throw e_1.error; }
        }
@ -9324,7 +9353,7 @@ var MatchKind;
    MatchKind[MatchKind["File"] = 2] = "File";
    /** Matched */
    MatchKind[MatchKind["All"] = 3] = "All";
-})(MatchKind = exports.MatchKind || (exports.MatchKind = {}));
+})(MatchKind || (exports.MatchKind = MatchKind = {}));
 //# sourceMappingURL=internal-match-kind.js.map

 /***/ }),
@ -9336,7 +9365,11 @@ var MatchKind;

 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
    o[k2] = m[k];
@ -9349,7 +9382,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -9399,8 +9432,8 @@ exports.dirname = dirname;
 * or `C:` are expanded based on the current working directory.
 */
 function ensureAbsoluteRoot(root, itemPath) {
-    assert_1.default(root, `ensureAbsoluteRoot parameter 'root' must not be empty`);
-    assert_1.default(itemPath, `ensureAbsoluteRoot parameter 'itemPath' must not be empty`);
+    (0, assert_1.default)(root, `ensureAbsoluteRoot parameter 'root' must not be empty`);
+    (0, assert_1.default)(itemPath, `ensureAbsoluteRoot parameter 'itemPath' must not be empty`);
    // Already rooted
    if (hasAbsoluteRoot(itemPath)) {
        return itemPath;
@ -9410,7 +9443,7 @@ function ensureAbsoluteRoot(root, itemPath) {
        // Check for itemPath like C: or C:foo
        if (itemPath.match(/^[A-Z]:[^\\/]|^[A-Z]:$/i)) {
            let cwd = process.cwd();
-            assert_1.default(cwd.match(/^[A-Z]:\\/i), `Expected current directory to start with an absolute drive root. Actual '${cwd}'`);
+            (0, assert_1.default)(cwd.match(/^[A-Z]:\\/i), `Expected current directory to start with an absolute drive root. Actual '${cwd}'`);
            // Drive letter matches cwd? Expand to cwd
            if (itemPath[0].toUpperCase() === cwd[0].toUpperCase()) {
                // Drive only, e.g. C:
@ -9435,11 +9468,11 @@ function ensureAbsoluteRoot(root, itemPath) {
        // Check for itemPath like \ or \foo
        else if (normalizeSeparators(itemPath).match(/^\\$|^\\[^\\]/)) {
            const cwd = process.cwd();
-            assert_1.default(cwd.match(/^[A-Z]:\\/i), `Expected current directory to start with an absolute drive root. Actual '${cwd}'`);
+            (0, assert_1.default)(cwd.match(/^[A-Z]:\\/i), `Expected current directory to start with an absolute drive root. Actual '${cwd}'`);
            return `${cwd[0]}:\\${itemPath.substr(1)}`;
        }
    }
-    assert_1.default(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`);
+    (0, assert_1.default)(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`);
    // Otherwise ensure root ends with a separator
    if (root.endsWith('/') || (IS_WINDOWS && root.endsWith('\\'))) {
        // Intentionally empty
@ -9456,7 +9489,7 @@ exports.ensureAbsoluteRoot = ensureAbsoluteRoot;
 * `\\hello\share` and `C:\hello` (and using alternate separator).
 */
 function hasAbsoluteRoot(itemPath) {
-    assert_1.default(itemPath, `hasAbsoluteRoot parameter 'itemPath' must not be empty`);
+    (0, assert_1.default)(itemPath, `hasAbsoluteRoot parameter 'itemPath' must not be empty`);
    // Normalize separators
    itemPath = normalizeSeparators(itemPath);
    // Windows
@ -9473,7 +9506,7 @@ exports.hasAbsoluteRoot = hasAbsoluteRoot;
 * `\`, `\hello`, `\\hello\share`, `C:`, and `C:\hello` (and using alternate separator).
 */
 function hasRoot(itemPath) {
-    assert_1.default(itemPath, `isRooted parameter 'itemPath' must not be empty`);
+    (0, assert_1.default)(itemPath, `isRooted parameter 'itemPath' must not be empty`);
    // Normalize separators
    itemPath = normalizeSeparators(itemPath);
    // Windows
@ -9541,7 +9574,11 @@ exports.safeTrimTrailingSeparator = safeTrimTrailingSeparator;

 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
    o[k2] = m[k];
@ -9554,7 +9591,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -9579,7 +9616,7 @@ class Path {
        this.segments = [];
        // String
        if (typeof itemPath === 'string') {
-            assert_1.default(itemPath, `Parameter 'itemPath' must not be empty`);
+            (0, assert_1.default)(itemPath, `Parameter 'itemPath' must not be empty`);
            // Normalize slashes and trim unnecessary trailing slash
            itemPath = pathHelper.safeTrimTrailingSeparator(itemPath);
            // Not rooted
@ -9606,24 +9643,24 @@ class Path {
        // Array
        else {
            // Must not be empty
-            assert_1.default(itemPath.length > 0, `Parameter 'itemPath' must not be an empty array`);
+            (0, assert_1.default)(itemPath.length > 0, `Parameter 'itemPath' must not be an empty array`);
            // Each segment
            for (let i = 0; i < itemPath.length; i++) {
                let segment = itemPath[i];
                // Must not be empty
-                assert_1.default(segment, `Parameter 'itemPath' must not contain any empty segments`);
+                (0, assert_1.default)(segment, `Parameter 'itemPath' must not contain any empty segments`);
                // Normalize slashes
                segment = pathHelper.normalizeSeparators(itemPath[i]);
                // Root segment
                if (i === 0 && pathHelper.hasRoot(segment)) {
                    segment = pathHelper.safeTrimTrailingSeparator(segment);
-                    assert_1.default(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`);
+                    (0, assert_1.default)(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`);
                    this.segments.push(segment);
                }
                // All other segments
                else {
                    // Must not contain slash
-                    assert_1.default(!segment.includes(path.sep), `Parameter 'itemPath' contains unexpected path separators`);
+                    (0, assert_1.default)(!segment.includes(path.sep), `Parameter 'itemPath' contains unexpected path separators`);
                    this.segments.push(segment);
                }
            }
@ -9661,7 +9698,11 @@ exports.Path = Path;

 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
    o[k2] = m[k];
@ -9674,7 +9715,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -9762,7 +9803,11 @@ exports.partialMatch = partialMatch;

 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
    o[k2] = m[k];
@ -9775,7 +9820,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -9807,9 +9852,9 @@ class Pattern {
        else {
            // Convert to pattern
            segments = segments || [];
-            assert_1.default(segments.length, `Parameter 'segments' must not empty`);
+            (0, assert_1.default)(segments.length, `Parameter 'segments' must not empty`);
            const root = Pattern.getLiteral(segments[0]);
-            assert_1.default(root && pathHelper.hasAbsoluteRoot(root), `Parameter 'segments' first element must be a root path`);
+            (0, assert_1.default)(root && pathHelper.hasAbsoluteRoot(root), `Parameter 'segments' first element must be a root path`);
            pattern = new internal_path_1.Path(segments).toString().trim();
            if (patternOrNegate) {
                pattern = `!${pattern}`;
@ -9903,13 +9948,13 @@ class Pattern {
     */
    static fixupPattern(pattern, homedir) {
        // Empty
-        assert_1.default(pattern, 'pattern cannot be empty');
+        (0, assert_1.default)(pattern, 'pattern cannot be empty');
        // Must not contain `.` segment, unless first segment
        // Must not contain `..` segment
        const literalSegments = new internal_path_1.Path(pattern).segments.map(x => Pattern.getLiteral(x));
-        assert_1.default(literalSegments.every((x, i) => (x !== '.' || i === 0) && x !== '..'), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`);
+        (0, assert_1.default)(literalSegments.every((x, i) => (x !== '.' || i === 0) && x !== '..'), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`);
        // Must not contain globs in root, e.g. Windows UNC path \\foo\b*r
-        assert_1.default(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`);
+        (0, assert_1.default)(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`);
        // Normalize slashes
        pattern = pathHelper.normalizeSeparators(pattern);
        // Replace leading `.` segment
@ -9919,8 +9964,8 @@ class Pattern {
        // Replace leading `~` segment
        else if (pattern === '~' || pattern.startsWith(`~${path.sep}`)) {
            homedir = homedir || os.homedir();
-            assert_1.default(homedir, 'Unable to determine HOME directory');
-            assert_1.default(pathHelper.hasAbsoluteRoot(homedir), `Expected HOME directory to be a rooted path. Actual '${homedir}'`);
+            (0, assert_1.default)(homedir, 'Unable to determine HOME directory');
+            (0, assert_1.default)(pathHelper.hasAbsoluteRoot(homedir), `Expected HOME directory to be a rooted path. Actual '${homedir}'`);
            pattern = Pattern.globEscape(homedir) + pattern.substr(1);
        }
        // Replace relative drive root, e.g. pattern is C: or C:foo
@ -125757,11 +125802,12 @@ const fs_1 = __nccwpck_require__(57147);
 const path_1 = __nccwpck_require__(71017);
 const util_1 = __nccwpck_require__(73837);
 const stats = (0, util_1.promisify)(fs_1.stat);
-function getDefaultGlobOptions() {
+function getDefaultGlobOptions(includeHiddenFiles) {
    return {
        followSymbolicLinks: true,
        implicitDescendants: true,
-        omitBrokenSymbolicLinks: true
+        omitBrokenSymbolicLinks: true,
+        excludeHiddenFiles: !includeHiddenFiles
    };
 }
 /**
@ -125815,10 +125861,10 @@ function getMultiPathLCA(searchPaths) {
    }
    return path.join(...commonPaths);
 }
-function findFilesToUpload(searchPath, searchOptions) {
+function findFilesToUpload(searchPath, includeHiddenFiles) {
    return __awaiter(this, void 0, void 0, function* () {
        const searchResults = [];
-        const globber = yield glob.create(searchPath, getDefaultGlobOptions());
+        const globber = yield glob.create(searchPath, getDefaultGlobOptions(includeHiddenFiles || false));
        const rawSearchResults = yield globber.glob();
        /*
          Files are saved with case insensitivity. Uploading both a.txt and A.txt will files to be overwritten
@ -125834,10 +125880,6 @@ function findFilesToUpload(searchPath, searchOptions) {
            // isDirectory() returns false for symlinks if using fs.lstat(), make sure to use fs.stat() instead
            if (!fileStats.isDirectory()) {
                (0, core_1.debug)(`File:${searchResult} was found using the provided searchPath`);
-                if (!(searchOptions === null || searchOptions === void 0 ? void 0 : searchOptions.includeGitDirectory) && inGitDirectory(searchResult)) {
-                    (0, core_1.debug)(`Ignoring ${searchResult} because it is in the .git directory`);
-                    continue;
-                }
                searchResults.push(searchResult);
                // detect any files that would be overwritten because of case insensitivity
                if (set.has(searchResult.toLowerCase())) {
@ -125879,16 +125921,6 @@ function findFilesToUpload(searchPath, searchOptions) {
    });
 }
 exports.findFilesToUpload = findFilesToUpload;
-function inGitDirectory(filePath) {
-    // The .git directory is a directory, so we need to check if the file path is a directory
-    // and if it is a .git directory
-    for (const part of filePath.split(path.sep)) {
-        if (part === '.git') {
-            return true;
-        }
-    }
-    return false;
-}


 /***/ }),
@ -125970,7 +126002,7 @@ var Inputs;
    Inputs["RetentionDays"] = "retention-days";
    Inputs["CompressionLevel"] = "compression-level";
    Inputs["Overwrite"] = "overwrite";
-    Inputs["IncludeGitDirectory"] = "include-git-directory";
+    Inputs["IncludeHiddenFiles"] = "include-hidden-files";
 })(Inputs = exports.Inputs || (exports.Inputs = {}));
 var NoFileOptions;
 (function (NoFileOptions) {
@ -126068,7 +126100,7 @@ function getInputs() {
    const name = core.getInput(constants_1.Inputs.Name);
    const path = core.getInput(constants_1.Inputs.Path, { required: true });
    const overwrite = core.getBooleanInput(constants_1.Inputs.Overwrite);
-    const includeGitDirectory = core.getBooleanInput(constants_1.Inputs.IncludeGitDirectory);
+    const includeHiddenFiles = core.getBooleanInput(constants_1.Inputs.IncludeHiddenFiles);
    const ifNoFilesFound = core.getInput(constants_1.Inputs.IfNoFilesFound);
    const noFileBehavior = constants_1.NoFileOptions[ifNoFilesFound];
    if (!noFileBehavior) {
@ -126079,7 +126111,7 @@ function getInputs() {
        searchPath: path,
        ifNoFilesFound: noFileBehavior,
        overwrite: overwrite,
-        includeGitDirectory: includeGitDirectory
+        includeHiddenFiles: includeHiddenFiles
    };
    const retentionDaysStr = core.getInput(constants_1.Inputs.RetentionDays);
    if (retentionDaysStr) {
@ -126168,9 +126200,7 @@ function deleteArtifactIfExists(artifactName) {
 function run() {
    return __awaiter(this, void 0, void 0, function* () {
        const inputs = (0, input_helper_1.getInputs)();
-        const searchResult = yield (0, search_1.findFilesToUpload)(inputs.searchPath, {
-            includeGitDirectory: inputs.includeGitDirectory
-        });
+        const searchResult = yield (0, search_1.findFilesToUpload)(inputs.searchPath, inputs.includeHiddenFiles);
        if (searchResult.filesToUpload.length === 0) {
            // No files were found, different use cases warrant different types of behavior if nothing is found
            switch (inputs.ifNoFilesFound) {
--- a/docs/MIGRATION.md
+++ b/docs/MIGRATION.md
@ -4,6 +4,7 @@
  - [Multiple uploads to the same named Artifact](#multiple-uploads-to-the-same-named-artifact)
  - [Overwriting an Artifact](#overwriting-an-artifact)
  - [Merging multiple artifacts](#merging-multiple-artifacts)
+  - [Hidden files](#hidden-files)

 Several behavioral differences exist between Artifact actions `v3` and below vs `v4`. This document outlines common scenarios in `v3`, and how they would be handled in `v4`.

@ -189,44 +190,45 @@ jobs:
      - name: Create a File
        run: echo "hello from ${{ matrix.runs-on }}" > file-${{ matrix.runs-on }}.txt
      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-+        uses: actions/upload-artifact@v4
+-       uses: actions/upload-artifact@v3
+       uses: actions/upload-artifact@v4
        with:
 -         name: all-my-files
 +         name: my-artifact-${{ matrix.runs-on }}
          path: file-${{ matrix.runs-on }}.txt
-+ merge:
-+   runs-on: ubuntu-latest
-+   needs: upload
-+   steps:
-+     - name: Merge Artifacts
-+       uses: actions/upload-artifact/merge@v4
-+       with:
-+         name: all-my-files
-+         pattern: my-artifact-*
+  merge:
+    runs-on: ubuntu-latest
+    needs: upload
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: all-my-files
+          pattern: my-artifact-*
 ```

 Note that this will download all artifacts to a temporary directory and reupload them as a single artifact. For more information on inputs and other use cases for `actions/upload-artifact/merge@v4`, see [the action documentation](../merge/README.md).

-## `.git` Directory
+## Hidden Files

-By default, files in the `.git` directory are ignored to avoid unintentionally uploading
-credentials.
+By default, hidden files are ignored by this action to avoid unintentionally uploading sensitive
+information.

-In versions of this action before `v4.4.0`, files in the `.git` directory were included by default.
-If this directory is required, ensure credentials are not saved in `.git/config` and then
-enable the `include-git-directory` input.
+In versions of this action before v4.4.0, these hidden files were included by default.
+
+If you need to upload hidden files, you can use the `include-hidden-files` input.

 ```yaml
 jobs:
  upload:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - name: Create a Hidden File
+        run: echo "hello from a hidden file" > .hidden-file.txt
      - name: Upload Artifact
        uses: actions/upload-artifact@v3
        with:
-          path: .
+          path: .hidden-file.txt
 ```


@ -235,13 +237,12 @@ jobs:
  upload:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-+       with:
-+         persist-credentials: false
+      - name: Create a Hidden File
+        run: echo "hello from a hidden file" > .hidden-file.txt
      - name: Upload Artifact
 -       uses: actions/upload-artifact@v3
 +       uses: actions/upload-artifact@v4
        with:
-          path: .
-+         include-git-directory: true
+          path: .hidden-file.txt
+         include-hidden-files: true
 ```
--- a/merge/README.md
+++ b/merge/README.md
@ -5,7 +5,6 @@ Merge multiple [Actions Artifacts](https://docs.github.com/en/actions/using-work
 - [`@actions/upload-artifact/merge`](#actionsupload-artifactmerge)
  - [Usage](#usage)
    - [Inputs](#inputs)
-      - [Uploading the `.git` directory](#uploading-the-git-directory)
    - [Outputs](#outputs)
  - [Examples](#examples)
    - [Combining all artifacts in a workflow run](#combining-all-artifacts-in-a-workflow-run)
@ -60,44 +59,6 @@ For most cases, this may not be the most efficient solution. See [the migration
    compression-level:
 ```

-#### Uploading the `.git` directory
-
-By default, files in a `.git` directory are ignored in the merged artifact.
-This is intended to prevent accidentally uploading Git credentials into an artifact that could then
-be extracted.
-If files in the `.git` directory are needed, ensure that `actions/checkout` is being used with
-`persist-credentials: false`.
-
-```yaml
-jobs:
-  upload:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        foo: [a, b, c]
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false # Ensure credentials are not saved in `.git/config`
-
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: my-artifact-${{ matrix.foo }}
-          path: .
-          include-git-directory: true
-
-  merge:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/upload-artifact/merge@v4
-        with:
-          include-git-directory: true
-```
-
 ### Outputs

 | Name | Description | Example |
--- a/merge/action.yml
+++ b/merge/action.yml
@ -36,8 +36,10 @@ inputs:
      If true, the artifacts that were merged will be deleted.
      If false, the artifacts will still exist.
    default: 'false'
-  include-git-directory:
-    description: 'Include files in the .git directory in the merged artifact.'
+  include-hidden-files:
+    description: >
+      If true, hidden files will be included in the merged artifact.
+      If false, hidden files will be excluded from the merged artifact.
    default: 'false'

 outputs:
--- a/package-lock.json
+++ b/package-lock.json
@ -1,18 +1,18 @@
 {
  "name": "upload-artifact",
-  "version": "4.3.6",
+  "version": "4.4.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "upload-artifact",
-      "version": "4.3.6",
+      "version": "4.4.0",
      "license": "MIT",
      "dependencies": {
        "@actions/artifact": "2.1.8",
        "@actions/core": "^1.10.1",
        "@actions/github": "^6.0.0",
-        "@actions/glob": "^0.3.0",
+        "@actions/glob": "^0.5.0",
        "@actions/io": "^1.1.2",
        "minimatch": "^9.0.3"
      },
@ -191,11 +191,11 @@
      }
    },
    "node_modules/@actions/glob": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.3.0.tgz",
-      "integrity": "sha512-tJP1ZhF87fd6LBnaXWlahkyvdgvsLl7WnreW1EZaC8JWjpMXmzqWzQVe/IEYslrkT9ymibVrKyJN4UMD7uQM2w==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.5.0.tgz",
+      "integrity": "sha512-tST2rjPvJLRZLuT9NMUtyBjvj9Yo0MiJS3ow004slMvm8GFM+Zv9HvMJ7HWzfUyJnGrJvDsYkWBaaG3YKXRtCw==",
      "dependencies": {
-        "@actions/core": "^1.2.6",
+        "@actions/core": "^1.9.1",
        "minimatch": "^3.0.4"
      }
    },
@ -8036,11 +8036,11 @@
      }
    },
    "@actions/glob": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.3.0.tgz",
-      "integrity": "sha512-tJP1ZhF87fd6LBnaXWlahkyvdgvsLl7WnreW1EZaC8JWjpMXmzqWzQVe/IEYslrkT9ymibVrKyJN4UMD7uQM2w==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.5.0.tgz",
+      "integrity": "sha512-tST2rjPvJLRZLuT9NMUtyBjvj9Yo0MiJS3ow004slMvm8GFM+Zv9HvMJ7HWzfUyJnGrJvDsYkWBaaG3YKXRtCw==",
      "requires": {
-        "@actions/core": "^1.2.6",
+        "@actions/core": "^1.9.1",
        "minimatch": "^3.0.4"
      },
      "dependencies": {
--- a/package.json
+++ b/package.json
@ -32,7 +32,7 @@
    "@actions/artifact": "2.1.8",
    "@actions/core": "^1.10.1",
    "@actions/github": "^6.0.0",
-    "@actions/glob": "^0.3.0",
+    "@actions/glob": "^0.5.0",
    "@actions/io": "^1.1.2",
    "minimatch": "^9.0.3"
  },
--- a/src/merge/constants.ts
+++ b/src/merge/constants.ts
@ -6,5 +6,5 @@ export enum Inputs {
  RetentionDays = 'retention-days',
  CompressionLevel = 'compression-level',
  DeleteMerged = 'delete-merged',
-  IncludeGitDirectory = 'include-git-directory'
+  IncludeHiddenFiles = 'include-hidden-files'
 }
--- a/src/merge/input-helper.ts
+++ b/src/merge/input-helper.ts
@ -10,7 +10,7 @@ export function getInputs(): MergeInputs {
  const pattern = core.getInput(Inputs.Pattern, {required: true})
  const separateDirectories = core.getBooleanInput(Inputs.SeparateDirectories)
  const deleteMerged = core.getBooleanInput(Inputs.DeleteMerged)
-  const includeGitDirectory = core.getBooleanInput(Inputs.IncludeGitDirectory)
+  const includeHiddenFiles = core.getBooleanInput(Inputs.IncludeHiddenFiles)

  const inputs = {
    name,
@ -19,7 +19,7 @@ export function getInputs(): MergeInputs {
    deleteMerged,
    retentionDays: 0,
    compressionLevel: 6,
-    includeGitDirectory
+    includeHiddenFiles
  } as MergeInputs

  const retentionDaysStr = core.getInput(Inputs.RetentionDays)
--- a/src/merge/merge-artifacts.ts
+++ b/src/merge/merge-artifacts.ts
@ -62,9 +62,10 @@ export async function run(): Promise<void> {
    options.compressionLevel = inputs.compressionLevel
  }

-  const searchResult = await findFilesToUpload(tmpDir, {
-    includeGitDirectory: inputs.includeGitDirectory
-  })
+  const searchResult = await findFilesToUpload(
+    tmpDir,
+    inputs.includeHiddenFiles
+  )

  await uploadArtifact(
    inputs.name,
--- a/src/merge/merge-inputs.ts
+++ b/src/merge/merge-inputs.ts
@ -32,7 +32,7 @@ export interface MergeInputs {
  separateDirectories: boolean

  /**
-   * Include files in the `.git` directory in the artifact
+   * Whether or not to include hidden files in the artifact
   */
-  includeGitDirectory: boolean
+  includeHiddenFiles: boolean
 }
--- a/src/shared/search.ts
+++ b/src/shared/search.ts
@ -11,11 +11,12 @@ export interface SearchResult {
  rootDirectory: string
 }

-function getDefaultGlobOptions(): glob.GlobOptions {
+function getDefaultGlobOptions(includeHiddenFiles: boolean): glob.GlobOptions {
  return {
    followSymbolicLinks: true,
    implicitDescendants: true,
-    omitBrokenSymbolicLinks: true
+    omitBrokenSymbolicLinks: true,
+    excludeHiddenFiles: !includeHiddenFiles
  }
 }

@ -78,21 +79,15 @@ function getMultiPathLCA(searchPaths: string[]): string {
  return path.join(...commonPaths)
 }

-export interface SearchOptions {
-  /**
-   * Indicates whether files in the .git directory should be included in the artifact
-   *
-   * @default false
-   */
-  includeGitDirectory: boolean
-}
-
 export async function findFilesToUpload(
  searchPath: string,
-  searchOptions?: SearchOptions
+  includeHiddenFiles?: boolean
 ): Promise<SearchResult> {
  const searchResults: string[] = []
-  const globber = await glob.create(searchPath, getDefaultGlobOptions())
+  const globber = await glob.create(
+    searchPath,
+    getDefaultGlobOptions(includeHiddenFiles || false)
+  )
  const rawSearchResults: string[] = await globber.glob()

  /*
@ -110,12 +105,6 @@ export async function findFilesToUpload(
    // isDirectory() returns false for symlinks if using fs.lstat(), make sure to use fs.stat() instead
    if (!fileStats.isDirectory()) {
      debug(`File:${searchResult} was found using the provided searchPath`)
-
-      if (!searchOptions?.includeGitDirectory && inGitDirectory(searchResult)) {
-        debug(`Ignoring ${searchResult} because it is in the .git directory`)
-        continue
-      }
-
      searchResults.push(searchResult)

      // detect any files that would be overwritten because of case insensitivity
@ -167,15 +156,3 @@ export async function findFilesToUpload(
    rootDirectory: searchPaths[0]
  }
 }
-
-function inGitDirectory(filePath: string): boolean {
-  // The .git directory is a directory, so we need to check if the file path is a directory
-  // and if it is a .git directory
-  for (const part of filePath.split(path.sep)) {
-    if (part === '.git') {
-      return true
-    }
-  }
-
-  return false
-}
--- a/src/upload/constants.ts
+++ b/src/upload/constants.ts
@ -6,7 +6,7 @@ export enum Inputs {
  RetentionDays = 'retention-days',
  CompressionLevel = 'compression-level',
  Overwrite = 'overwrite',
-  IncludeGitDirectory = 'include-git-directory'
+  IncludeHiddenFiles = 'include-hidden-files'
 }

 export enum NoFileOptions {
--- a/src/upload/input-helper.ts
+++ b/src/upload/input-helper.ts
@ -9,7 +9,7 @@ export function getInputs(): UploadInputs {
  const name = core.getInput(Inputs.Name)
  const path = core.getInput(Inputs.Path, {required: true})
  const overwrite = core.getBooleanInput(Inputs.Overwrite)
-  const includeGitDirectory = core.getBooleanInput(Inputs.IncludeGitDirectory)
+  const includeHiddenFiles = core.getBooleanInput(Inputs.IncludeHiddenFiles)

  const ifNoFilesFound = core.getInput(Inputs.IfNoFilesFound)
  const noFileBehavior: NoFileOptions = NoFileOptions[ifNoFilesFound]
@ -29,7 +29,7 @@ export function getInputs(): UploadInputs {
    searchPath: path,
    ifNoFilesFound: noFileBehavior,
    overwrite: overwrite,
-    includeGitDirectory: includeGitDirectory
+    includeHiddenFiles: includeHiddenFiles
  } as UploadInputs

  const retentionDaysStr = core.getInput(Inputs.RetentionDays)
--- a/src/upload/upload-artifact.ts
+++ b/src/upload/upload-artifact.ts
@ -24,9 +24,10 @@ async function deleteArtifactIfExists(artifactName: string): Promise<void> {

 export async function run(): Promise<void> {
  const inputs = getInputs()
-  const searchResult = await findFilesToUpload(inputs.searchPath, {
-    includeGitDirectory: inputs.includeGitDirectory
-  })
+  const searchResult = await findFilesToUpload(
+    inputs.searchPath,
+    inputs.includeHiddenFiles
+  )
  if (searchResult.filesToUpload.length === 0) {
    // No files were found, different use cases warrant different types of behavior if nothing is found
    switch (inputs.ifNoFilesFound) {
--- a/src/upload/upload-inputs.ts
+++ b/src/upload/upload-inputs.ts
@ -32,7 +32,7 @@ export interface UploadInputs {
  overwrite: boolean

  /**
-   * Include files in the `.git` directory in the artifact
+   * Whether or not to include hidden files in the artifact
   */
-  includeGitDirectory: boolean
+  includeHiddenFiles: boolean
 }
Author	SHA1	Message	Date
Josh Gross	50769540e7	Merge pull request #598 from actions/joshmgross/exclude-hidden-files Exclude hidden files by default	2024-08-29 10:38:39 -04:00
Josh Gross	d52396ac5d	Add a warning about enabling `include-hidden-files`	2024-08-15 19:45:59 -04:00
Josh Gross	710f362075	Remove "merged" from `include-hidden-files` input description	2024-08-15 19:39:39 -04:00
Josh Gross	3b315f26f6	`npm run release` again 🙂	2024-08-15 17:36:20 -04:00
Josh Gross	3be2180eb7	Remove another trailing comma	2024-08-15 17:35:00 -04:00
Josh Gross	453e8d0a40	Update glob license	2024-08-15 17:31:21 -04:00
Josh Gross	0a398c1480	`npm run release`	2024-08-15 17:30:44 -04:00
Josh Gross	a0c40cf602	Update to latest `@actions/glob` and fix tests	2024-08-15 17:26:43 -04:00
Josh Gross	acb59e4776	`lint`	2024-08-15 16:31:57 -04:00
Josh Gross	cb6558bb10	Exclude hidden files by default	2024-08-15 16:22:09 -04:00