fix(affected): include not committed changes in --affected
#9133
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
8 Skipped Deployments
|
tknickman
approved these changes
Sep 10, 2024
chris-olszewski
approved these changes
Sep 11, 2024
crates/turborepo-scm/src/git.rs
Outdated
| let output = self | ||
| .execute_git_command(&["ls-files", "--others", "--exclude-standard"], pathspec)?; | ||
| self.add_files_from_stdout(&mut files, turbo_root, output); | ||
|
|
||
| // Then add files that are in git, but have been modified (but not committed) | ||
| let output = self.execute_git_command(&["diff", "--name-only", "HEAD"], pathspec)?; |
There was a problem hiding this comment.
What if TURBO_SCM_HEAD is specified and isn't HEAD? Does this change behavior for SCM filters that specify a full git range like --filter=[commit-1...commit-2]?
I'm a little confused why we're duplicating the logic from the case where to_commit isn't specified? It seems like to_commit = None and include_uncommitted = true indicate the same thing?
NicholasLYang
force-pushed
the
fix/affected-unstaged-changes
branch
from
d36e7bc
to
f1f501b
Compare
diffs off of a merge base for `--affected`
NicholasLYang
force-pushed
the
fix/affected-unstaged-changes
branch
from
f1f501b
to
e1c9c75
Compare
Co-authored-by: Chris Olszewski <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
We were including new files that were not checked into git, but not changes to files already in git but not committed.
Testing Instructions
Added more testing to
affected.tfor both new files and existing files with new changes