rm persistence on options

go/libraries/doltcore/sqle/dtablefunctions/dolt_diff.go

@@ -145,9 +145,11 @@ func (dtf *DiffTableFunction) WithExpressions(expressions ...sql.Expression) (sq
 		return nil, err
 	}
 
-	newDtf.showSkinny = newDtf.showSkinny || apr.Contains(cli.SkinnyFlag)
+	if apr.Contains(cli.SkinnyFlag) {
+		newDtf.showSkinny = true
+	}
 
-	if cols, ok := apr.GetValueList(cli.IncludeCols); newDtf.includeCols == nil && ok {
+	if cols, ok := apr.GetValueList(cli.IncludeCols); ok {
 		newDtf.includeCols = make(map[string]struct{})
 		for _, col := range cols {
 			newDtf.includeCols[col] = struct{}{}

integration-tests/bats/helper/sql-diff.bash

@@ -113,12 +113,10 @@ compare_dolt_diff() {
     echo "$sql_output"
 
     if [ $cli_status -ne 0 ]; then
-        echo "CLI diff failed"
         _dbg "$cli_output"
         return 1
     fi
     if [ $sql_status -ne 0 ]; then
-        echo "SQL dolt_diff failed"
         _dbg "$sql_output"
         return 1
     fi