Merge pull request #3403 from gautamdsheth/bugfix/3112

Fix #3112 - issue with file checkout and checkin
pnp · Sep 18, 2023 · 2ab0b0f · 2ab0b0f
2 parents 168a9c3 + 7a8da90
commit 2ab0b0f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -54,6 +54,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Improved `Set-PnPListItem` cmdlet handling of Purview labels. [#3340](https://github.com/pnp/powershell/pull/3340)
 - The `Publish-PnPCompanyApp` cmdlet is now obsolete. It will be removed in the next version. [#3349](https://github.com/pnp/powershell/pull/3349)
 - Verbose output will no longer show the access token [#3352](https://github.com/pnp/powershell/pull/3352)
+- Improved `Add-PnPFile` cmdlet. It will now automatically checkout the file if `-CheckinType` parameter is specified. [#3403](https://github.com/pnp/powershell/pull/3403)
 
 ### Removed
 

diff --git a/src/Commands/Files/AddFile.cs b/src/Commands/Files/AddFile.cs
@@ -104,7 +104,7 @@ protected override void ExecuteCmdlet()
             }
 
             // Check if the file exists
-            if (Checkout)
+            if (Checkout || ParameterSpecified(nameof(CheckinType)))
             {
                 try
                 {
@@ -165,7 +165,7 @@ protected override void ExecuteCmdlet()
                 item.UpdateOverwriteVersion();
             }
 
-            if (Checkout)
+            if (Checkout || ParameterSpecified(nameof(CheckinType)))
             {
                 CurrentWeb.CheckInFile(fileUrl, CheckinType, CheckInComment);
             }