@@ -1608,10 +1608,14 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
1608
1608
1609
1609
if (command = " checkout" ){
1610
1610
set syncIrisWithDiff = 1
1611
- set diffCompare = args (args )
1611
+ if $data (args ) && $data (args (args ),diffCompare ) {
1612
+ // no-op
1613
+ }
1612
1614
} elseif (command = " merge" ) || (command = " rebase" ) || (command = " pull" ){
1613
1615
set syncIrisWithCommand = 1
1614
- set diffCompare = args (args )
1616
+ if $data (args ) && $data (args (args ),diffCompare ) {
1617
+ // no-op
1618
+ }
1615
1619
}
1616
1620
1617
1621
for i =1 :1 :$get (args ) {
@@ -1688,10 +1692,12 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
1688
1692
for stream =errStream ,outStream {
1689
1693
set stream .RemoveOnClose = 1
1690
1694
}
1691
- do .. PrintStreams ( errStream , outStream )
1695
+
1692
1696
if syncIrisWithDiff {
1697
+ do ..PrintStreams (errStream , outStream )
1693
1698
$$$ThrowOnError(..SyncIrisWithRepoThroughDiff (.files ))
1694
1699
} elseif syncIrisWithCommand {
1700
+ do ..PrintStreams (errStream , outStream )
1695
1701
$$$ThrowOnError(..SyncIrisWithRepoThroughCommand (.outStream ))
1696
1702
}
1697
1703
quit returnCode
@@ -1746,7 +1752,7 @@ ClassMethod SyncIrisWithRepoThroughDiff(ByRef files) As %Status
1746
1752
set key = $order (files (" " ))
1747
1753
set deletedFiles = " "
1748
1754
set addedFiles = " "
1749
- while (key '= " " ) {
1755
+ while (key '= " " ) {
1750
1756
set modification = files (key )
1751
1757
if (modification .changeType = " D" ){
1752
1758
if (modification .internalName '= " " ) {
@@ -1757,7 +1763,6 @@ ClassMethod SyncIrisWithRepoThroughDiff(ByRef files) As %Status
1757
1763
if (modification .internalName '= " " ) {
1758
1764
set addedFiles = addedFiles _" ," _modification .internalName
1759
1765
set files (key ) = modification
1760
-
1761
1766
}
1762
1767
}
1763
1768
set key = $order (files (key ))
0 commit comments