Ignore Git LFS files

.ignore

@@ -0,0 +1 @@
+.gitignore

CHANGELOG.md

@@ -145,6 +145,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 * `[diff.<format>]` configuration now applies to `.diff().<format>()` commit
   template methods.
 
+* Add support for just ignoring Git LFS files by parsing `.gitattribute` files and automatically 
+  adding the relevant files to the internal ignore list
+
 ## [0.25.0] - 2025-01-01
 
 ### Release highlights

cli/src/cli_util.rs

@@ -1277,6 +1277,32 @@ to the current parents may contain changes from multiple commits.
         self.path_converter().parse_file_path(input)
     }
 
+    /// Parses the given strings as file patterns, convert it to a matcher and
+    /// apply GIT LFS exclusions if requested
+    pub fn file_matcher(
+        &self,
+        ui: &Ui,
+        values: &[String],
+    ) -> Result<Box<dyn Matcher>, CommandError> {
+        let mut matcher = self.parse_file_patterns(ui, values)?.to_matcher();
+        if self.settings().git_settings()?.ignore_lfs_files {
+            let root = self.workspace().workspace_root();
+            if let Some(wc_commit) = self
+                .get_wc_commit_id()
+                .map(|id| self.repo().store().get_commit(id))
+                .transpose()?
+            {
+                let tree = wc_commit.tree()?;
+                matcher = Box::new(jj_lib::matchers::DifferenceMatcher::new(
+                    matcher,
+                    jj_lib::matchers::GitAttributesMatcher::new(tree.as_merge().first(), root)
+                        .expect("gitattributes matcher failed"),
+                ));
+            }
+        }
+        Ok(matcher)
+    }
+
     /// Parses the given strings as file patterns.
     pub fn parse_file_patterns(
         &self,
@@ -1350,6 +1376,7 @@ to the current parents may contain changes from multiple commits.
             start_tracking_matcher,
             max_new_file_size,
             conflict_marker_style,
+            skip_git_lfs_files: self.settings().git_settings()?.ignore_lfs_files,
         })
     }
 

cli/src/commands/absorb.rs

@@ -76,9 +76,7 @@ pub(crate) fn cmd_absorb(
         .parse_union_revsets(ui, &args.into)?
         .resolve()?;
 
-    let matcher = workspace_command
-        .parse_file_patterns(ui, &args.paths)?
-        .to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
 
     let repo = workspace_command.repo().as_ref();
     let source = AbsorbSource::from_commit(repo, source_commit)?;

cli/src/commands/commit.rs

@@ -81,9 +81,7 @@ pub(crate) fn cmd_commit(
         .get_wc_commit_id()
         .ok_or_else(|| user_error("This command requires a working copy"))?;
     let commit = workspace_command.repo().store().get_commit(commit_id)?;
-    let matcher = workspace_command
-        .parse_file_patterns(ui, &args.paths)?
-        .to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
     let advanceable_bookmarks = workspace_command.get_advanceable_bookmarks(commit.parent_ids())?;
     let diff_selector =
         workspace_command.diff_selector(ui, args.tool.as_deref(), args.interactive)?;

cli/src/commands/debug/tree.rs

@@ -62,9 +62,7 @@ pub fn cmd_debug_tree(
             .resolve_single_rev(ui, args.revision.as_ref().unwrap_or(&RevisionArg::AT))?;
         commit.tree()?
     };
-    let matcher = workspace_command
-        .parse_file_patterns(ui, &args.paths)?
-        .to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
     for (path, value) in tree.entries_matching(matcher.as_ref()) {
         let ui_path = workspace_command.format_file_path(&path);
         writeln!(ui.stdout(), "{ui_path}: {value:?}")?;

cli/src/commands/diff.rs

@@ -94,7 +94,7 @@ pub(crate) fn cmd_diff(
     let workspace_command = command.workspace_helper(ui)?;
     let repo = workspace_command.repo();
     let fileset_expression = workspace_command.parse_file_patterns(ui, &args.paths)?;
-    let matcher = fileset_expression.to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
     let resolve_revision = |r: &Option<RevisionArg>| {
         workspace_command.resolve_single_rev(ui, r.as_ref().unwrap_or(&RevisionArg::AT))
     };

cli/src/commands/file/chmod.rs

@@ -81,7 +81,7 @@ pub(crate) fn cmd_file_chmod(
     // TODO: No need to add special case for empty paths when switching to
     // parse_union_filesets(). paths = [] should be "none()" if supported.
     let fileset_expression = workspace_command.parse_file_patterns(ui, &args.paths)?;
-    let matcher = fileset_expression.to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
     print_unmatched_explicit_paths(ui, &workspace_command, &fileset_expression, [&tree])?;
 
     let mut tx = workspace_command.start_transaction();

cli/src/commands/file/list.rs

@@ -58,9 +58,7 @@ pub(crate) fn cmd_file_list(
     let workspace_command = command.workspace_helper(ui)?;
     let commit = workspace_command.resolve_single_rev(ui, &args.revision)?;
     let tree = commit.tree()?;
-    let matcher = workspace_command
-        .parse_file_patterns(ui, &args.paths)?
-        .to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
     let template = {
         let language = workspace_command.commit_template_language();
         let text = match &args.template {

cli/src/commands/file/show.rs

@@ -89,7 +89,7 @@ pub(crate) fn cmd_file_show(
         }
     }
 
-    let matcher = fileset_expression.to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
     ui.request_pager();
     write_tree_entries(
         ui,

cli/src/commands/file/track.rs

@@ -44,9 +44,7 @@ pub(crate) fn cmd_file_track(
     args: &FileTrackArgs,
 ) -> Result<(), CommandError> {
     let mut workspace_command = command.workspace_helper(ui)?;
-    let matcher = workspace_command
-        .parse_file_patterns(ui, &args.paths)?
-        .to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
     let options = workspace_command.snapshot_options_with_start_tracking_matcher(&matcher)?;
 
     let mut tx = workspace_command.start_transaction().into_inner();

cli/src/commands/file/untrack.rs

@@ -52,9 +52,7 @@ pub(crate) fn cmd_file_untrack(
 ) -> Result<(), CommandError> {
     let mut workspace_command = command.workspace_helper(ui)?;
     let store = workspace_command.repo().store().clone();
-    let matcher = workspace_command
-        .parse_file_patterns(ui, &args.paths)?
-        .to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
     let auto_tracking_matcher = workspace_command.auto_tracking_matcher(ui)?;
     let options =
         workspace_command.snapshot_options_with_start_tracking_matcher(&auto_tracking_matcher)?;

cli/src/commands/fix.rs

@@ -147,9 +147,7 @@ pub(crate) fn cmd_fix(
     .evaluate_to_commit_ids()?
     .try_collect()?;
     workspace_command.check_rewritable(root_commits.iter())?;
-    let matcher = workspace_command
-        .parse_file_patterns(ui, &args.paths)?
-        .to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
 
     let mut tx = workspace_command.start_transaction();
 

cli/src/commands/interdiff.rs

@@ -74,9 +74,7 @@ pub(crate) fn cmd_interdiff(
         workspace_command.resolve_single_rev(ui, args.from.as_ref().unwrap_or(&RevisionArg::AT))?;
     let to =
         workspace_command.resolve_single_rev(ui, args.to.as_ref().unwrap_or(&RevisionArg::AT))?;
-    let matcher = workspace_command
-        .parse_file_patterns(ui, &args.paths)?
-        .to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
     let diff_renderer = workspace_command.diff_renderer_for(&args.format)?;
     ui.request_pager();
     diff_renderer.show_inter_diff(

cli/src/commands/log.rs

@@ -136,7 +136,7 @@ pub(crate) fn cmd_log(
     };
 
     let repo = workspace_command.repo();
-    let matcher = fileset_expression.to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
     let revset = revset_expression.evaluate()?;
 
     let store = repo.store();

cli/src/commands/resolve.rs

@@ -80,9 +80,7 @@ pub(crate) fn cmd_resolve(
     args: &ResolveArgs,
 ) -> Result<(), CommandError> {
     let mut workspace_command = command.workspace_helper(ui)?;
-    let matcher = workspace_command
-        .parse_file_patterns(ui, &args.paths)?
-        .to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
     let commit = workspace_command.resolve_single_rev(ui, &args.revision)?;
     let tree = commit.tree()?;
     let conflicts = tree

cli/src/commands/restore.rs

@@ -134,9 +134,7 @@ pub(crate) fn cmd_restore(
     }
     workspace_command.check_rewritable([to_commit.id()])?;
 
-    let matcher = workspace_command
-        .parse_file_patterns(ui, &args.paths)?
-        .to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
     let diff_selector =
         workspace_command.diff_selector(ui, args.tool.as_deref(), args.interactive)?;
     let to_tree = to_commit.tree()?;

cli/src/commands/split.rs

@@ -92,9 +92,7 @@ pub(crate) fn cmd_split(
     }
 
     workspace_command.check_rewritable([commit.id()])?;
-    let matcher = workspace_command
-        .parse_file_patterns(ui, &args.paths)?
-        .to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
     let diff_selector = workspace_command.diff_selector(
         ui,
         args.tool.as_deref(),

cli/src/commands/squash.rs

@@ -152,9 +152,7 @@ pub(crate) fn cmd_squash(
         destination = parents.pop().unwrap();
     }
 
-    let matcher = workspace_command
-        .parse_file_patterns(ui, &args.paths)?
-        .to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
     let diff_selector =
         workspace_command.diff_selector(ui, args.tool.as_deref(), args.interactive)?;
     let text_editor = workspace_command.text_editor()?;

cli/src/commands/status.rs

@@ -55,9 +55,7 @@ pub(crate) fn cmd_status(
         .get_wc_commit_id()
         .map(|id| repo.store().get_commit(id))
         .transpose()?;
-    let matcher = workspace_command
-        .parse_file_patterns(ui, &args.paths)?
-        .to_matcher();
+    let matcher = workspace_command.file_matcher(ui, &args.paths)?;
     ui.request_pager();
     let mut formatter = ui.stdout_formatter();
     let formatter = formatter.as_mut();

cli/src/config-schema.json

@@ -39,11 +39,7 @@
                 "conflict-marker-style": {
                     "type": "string",
                     "description": "Conflict marker style to use when materializing conflicts in the working copy",
-                    "enum": [
-                        "diff",
-                        "snapshot",
-                        "git"
-                    ],
+                    "enum": ["diff", "snapshot", "git"],
                     "default": "diff"
                 }
             },
@@ -85,21 +81,13 @@
                 },
                 "color": {
                     "description": "Whether to colorize command output",
-                    "enum": [
-                        "always",
-                        "never",
-                        "debug",
-                        "auto"
-                    ],
+                    "enum": ["always", "never", "debug", "auto"],
                     "default": "auto"
                 },
                 "paginate": {
                     "type": "string",
                     "description": "Whether or not to use a pager",
-                    "enum": [
-                        "never",
-                        "auto"
-                    ],
+                    "enum": ["never", "auto"],
                     "default": "auto"
                 },
                 "pager": {
@@ -113,11 +101,7 @@
                     "properties": {
                         "format": {
                             "description": "The diff format to use",
-                            "enum": [
-                                "color-words",
-                                "git",
-                                "summary"
-                            ],
+                            "enum": ["color-words", "git", "summary"],
                             "default": "color-words"
                         },
                         "tool": {
@@ -191,11 +175,11 @@
                 "watchman": {
                     "type": "object",
                     "properties": {
-                      "register_snapshot_trigger": {
-                        "type": "boolean",
-                        "default": false,
-                        "description": "Whether to use triggers to monitor for changes in the background."
-                      }
+                        "register_snapshot_trigger": {
+                            "type": "boolean",
+                            "default": false,
+                            "description": "Whether to use triggers to monitor for changes in the background."
+                        }
                     }
                 }
             }
@@ -230,14 +214,14 @@
                     "pattern": "^#[0-9a-fA-F]{6}$"
                 },
                 "colors": {
-                  "oneOf": [
-                    {
-                        "$ref": "#/properties/colors/definitions/colorNames"
-                    },
-                    {
-                        "$ref": "#/properties/colors/definitions/hexColor"
-                    }
-                  ]
+                    "oneOf": [
+                        {
+                            "$ref": "#/properties/colors/definitions/colorNames"
+                        },
+                        {
+                            "$ref": "#/properties/colors/definitions/hexColor"
+                        }
+                    ]
                 },
                 "basicFormatterLabels": {
                     "enum": [
@@ -389,6 +373,11 @@
                     "type": "string",
                     "description": "Path to the git executable",
                     "default": "git"
+                },
+                "ignore-lfs-files": {
+                    "type": "boolean",
+                    "description": "Whether jj ignores files handled by git lfs or not",
+                    "default": false
                 }
             }
         },
@@ -416,12 +405,9 @@
                         "default": [0]
                     },
                     "diff-invocation-mode": {
-                      "description": "Invoke the tool with directories or individual files",
-                      "enum": [
-                        "dir",
-                        "file-by-file"
-                      ],
-                      "default": "dir"
+                        "description": "Invoke the tool with directories or individual files",
+                        "enum": ["dir", "file-by-file"],
+                        "default": "dir"
                     },
                     "edit-args": {
                         "type": "array",
@@ -529,10 +515,7 @@
                     "default": "false"
                 },
                 "max-new-file-size": {
-                    "type": [
-                        "integer",
-                        "string"
-                    ],
+                    "type": ["integer", "string"],
                     "description": "New files with a size in bytes above this threshold are not snapshotted, unless the threshold is 0",
                     "default": "1MiB"
                 }
@@ -616,7 +599,7 @@
                 }
             }
         },
-    "fix": {
+        "fix": {
             "type": "object",
             "description": "Settings for jj fix",
             "properties": {

cli/src/merge_tools/diff_working_copies.rs

@@ -299,6 +299,7 @@ diff editing in mind and be a little inaccurate.
             start_tracking_matcher: &EverythingMatcher,
             max_new_file_size: u64::MAX,
             conflict_marker_style,
+            skip_git_lfs_files: false,
         })?;
         Ok(output_tree_state.current_tree_id().clone())
     }

docs/config.md

@@ -1258,6 +1258,17 @@ particular binary, you can:
 executable-path = "/path/to/git"
 ```
 
+### Ignore Git LFS Files
+
+By default Git LFS files are **not** handled by `jj`. This will result in `jj` showing
+changes in these files, even if they are unchanged. You can configure `jj` to ignore these
+files by instructing it to parse the relevant `.gitattributes` files
+
+```tom
+[git]
+ignore-lfs-files = -rue
+```
+
 ## Filesystem monitor
 
 In large repositories, it may be beneficial to use a "filesystem monitor" to