fix(repository): pass file names to git add after -- - #373
Open
Bortlesboat wants to merge 1 commit into
Open
Conversation
A path starting with "-" was parsed as a git add option: a file named --all staged the whole worktree, and a directory named like an option made the add fail. Terminate options before every path. Fixes dagger#354
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes #354.
addNonBinaryFilesandaddFilesFromUntrackedDirectorypass each path straight togit add, so a name starting with-is parsed as an option. A file named--allturns the call intogit add --alland stages the whole worktree, including files the skip rules are meant to leave out. A directory named like an option makes the add fail outright (error: unknown option), which fails the commit.This puts
--before the path in all fourgit addcalls.Tests: two new scenarios in
TestSelectiveFileStaging, a file named--allnext to a.zipthat should stay untracked, and a file under a directory named--dry-run. Without the change the first stagesbundle.zipand the second errors withunknown option; with it both pass.go test -short ./repository/passes on Linux, andgofmt -landgo vetare clean.