lint-staged support --status

Author: ImSingee

README.md

@@ -76,6 +76,7 @@ You can also target other file states:
 ```shell
 kitty @lint-staged --status unstaged
 kitty @lint-staged --status tracked
+kitty @lint-staged --status changed
 kitty @lint-staged --status all
 ```
 

internal/ext/lint-staged/git.go

@@ -83,8 +83,11 @@ func resolveGitRepo(cwd string) (gitDir, gitConfigDir string, err error) {
 func getDiffCommand(diff, diffFilter string) []string {
 	diffFilter = normalizeDiffFilter(diffFilter)
 
-	// Use `--diff branch1...branch2` or `--diff="branch1 branch2"`.
 	diffArgs := strings.Fields(strings.TrimSpace(diff))
+	if len(diffArgs) == 0 {
+		// Fall back to staged files when no explicit diff range is provided.
+		diffArgs = []string{"--staged"}
+	}
 
 	// Docs for -z option:
 	// https://git-scm.com/docs/git-diff#Documentation/git-diff.txt--z
@@ -126,8 +129,10 @@ func getSelectedFiles(options *Options, gitDir string) ([]string, error) {
 		return getUntrackedFiles(gitDir)
 	case SelectionModeTracked:
 		return getTrackedFiles(options.DiffFilter, gitDir)
+	case SelectionModeChanged:
+		return getChangedFiles(options.DiffFilter, gitDir)
 	case SelectionModeAll:
-		tracked, err := getTrackedFiles(options.DiffFilter, gitDir)
+		tracked, err := getCachedFiles(gitDir)
 		if err != nil {
 			return nil, err
 		}
@@ -196,6 +201,19 @@ func getTrackedFiles(diffFilter string, gitDir string) ([]string, error) {
 	return uniqueStrings(append(staged, unstaged...)), nil
 }
 
+func getChangedFiles(diffFilter string, gitDir string) ([]string, error) {
+	tracked, err := getTrackedFiles(diffFilter, gitDir)
+	if err != nil {
+		return nil, err
+	}
+	untracked, err := getUntrackedFiles(gitDir)
+	if err != nil {
+		return nil, err
+	}
+
+	return uniqueStrings(append(tracked, untracked...)), nil
+}
+
 func getUntrackedFiles(gitDir string) ([]string, error) {
 	return execGitZ([]string{"ls-files", "-z", "--full-name", "--others", "--exclude-standard"}, gitDir)
 }

internal/ext/lint-staged/main.go

@@ -32,7 +32,7 @@ func Commands() []*cobra.Command {
 	flags.StringVarP(&o.ConfigPath, "config", "c", "", "path to configuration file")
 	flags.StringVar(&o.Diff, "diff", "", `override the default "--staged" flag of "git diff" to get list of files. Implies "--stash=false"`)
 	flags.StringVar(&o.DiffFilter, "diff-filter", "", `override the default "--diff-filter=ACMR" flag of "git diff" to get list of files`)
-	flags.StringVar(&o.Status, "status", string(SelectionModeStaged), "select files by git status: staged, unstaged, untracked, tracked, or all")
+	flags.StringVar(&o.Status, "status", string(SelectionModeStaged), "select files by git status: staged, unstaged, untracked, tracked, changed, or all")
 	flags.BoolVar(&o.Stash, "stash", true, "enable the backup stash, and revert in case of errors")
 	flags.StringVarP(&o.Shell, "shell", "x", "", "use a custom shell to execute tasks with; defaults to the shell specified in the environment variable $SHELL, or /bin/sh if not set")
 	flags.BoolVarP(&o.Verbose, "verbose", "v", false, "show task output even when tasks succeed; by default only failed output is shown")

internal/ext/lint-staged/selection.go

@@ -9,6 +9,7 @@ const (
 	SelectionModeUnstaged  SelectionMode = "unstaged"
 	SelectionModeUntracked SelectionMode = "untracked"
 	SelectionModeTracked   SelectionMode = "tracked"
+	SelectionModeChanged   SelectionMode = "changed"
 	SelectionModeAll       SelectionMode = "all"
 )
 
@@ -26,10 +27,10 @@ func (o *Options) UsesIndex() bool {
 
 func (o *Options) ValidateSelectionMode() error {
 	switch o.SelectionMode() {
-	case SelectionModeStaged, SelectionModeUnstaged, SelectionModeUntracked, SelectionModeTracked, SelectionModeAll:
+	case SelectionModeStaged, SelectionModeUnstaged, SelectionModeUntracked, SelectionModeTracked, SelectionModeChanged, SelectionModeAll:
 		// ok
 	default:
-		return fmt.Errorf("invalid --status %q (must be one of: staged, unstaged, untracked, tracked, all)", o.Status)
+		return fmt.Errorf("invalid --status %q (must be one of: staged, unstaged, untracked, tracked, changed, all)", o.Status)
 	}
 
 	if o.Diff != "" && o.SelectionMode() != SelectionModeStaged {
@@ -62,8 +63,10 @@ func (o *Options) SelectedFilesLabel() string {
 		return "untracked files"
 	case SelectionModeTracked:
 		return "tracked changed files"
-	case SelectionModeAll:
+	case SelectionModeChanged:
 		return "changed files"
+	case SelectionModeAll:
+		return "all files"
 	default:
 		return "staged files"
 	}

internal/ext/lint-staged/selection_test.go

@@ -27,6 +27,26 @@ func TestOptionsSelectionMode(t *testing.T) {
 		assert.Equal(t, "tracked changed files", options.SelectedFilesLabel())
 	})
 
+	t.Run("changed status describes diff set", func(t *testing.T) {
+		options := &Options{Status: string(SelectionModeChanged)}
+
+		require.NoError(t, options.ValidateSelectionMode())
+		assert.Equal(t, SelectionModeChanged, options.SelectionMode())
+		assert.False(t, options.UsesIndex())
+		assert.Equal(t, "`--status=changed` was used", options.SelectionReason())
+		assert.Equal(t, "changed files", options.SelectedFilesLabel())
+	})
+
+	t.Run("all status describes full repo set", func(t *testing.T) {
+		options := &Options{Status: string(SelectionModeAll)}
+
+		require.NoError(t, options.ValidateSelectionMode())
+		assert.Equal(t, SelectionModeAll, options.SelectionMode())
+		assert.False(t, options.UsesIndex())
+		assert.Equal(t, "`--status=all` was used", options.SelectionReason())
+		assert.Equal(t, "all files", options.SelectedFilesLabel())
+	})
+
 	t.Run("diff uses working tree only", func(t *testing.T) {
 		options := &Options{Diff: "HEAD"}
 
@@ -45,7 +65,7 @@ func TestOptionsSelectionMode(t *testing.T) {
 	t.Run("diff cannot combine with non default status", func(t *testing.T) {
 		options := &Options{
 			Diff:   "HEAD",
-			Status: string(SelectionModeAll),
+			Status: string(SelectionModeChanged),
 		}
 
 		require.Error(t, options.ValidateSelectionMode())