Skip to content

[WIP] Force add a file that is in an ignored subdirectory #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WIP] Force add a file that is in an ignored subdirectory #290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions tests/add-force.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,44 @@ s_3 <- structure(list(staged = structure(list(), .Names = character(0)),
commit(repo, "Second commit message")
stopifnot(identical(status(repo, ignored = TRUE), s_3))

## Ignore a subdirectory
writeLines("subdir", file.path(path, ".gitignore"))

add(repo, ".gitignore")
commit(repo, "Ignore subdir")

## Create subdirectory and a file inside
d_ignore <- file.path(path, "subdir")
dir.create(d_ignore)

writeLines("An exception", file.path(d_ignore, "force.txt"))

s_4 <- structure(list(staged = structure(list(), .Names = character(0)),
unstaged = structure(list(), .Names = character(0)),
untracked = structure(list(), .Names = character(0)),
ignored = structure(list(ignored = "subdir/"), .Names = "ignored")),
.Names = c("staged", "unstaged", "untracked", "ignored"),
class = "git_status")
stopifnot(identical(status(repo, ignored = TRUE), s_4))

## The file is ignored and should not be added
add(repo, "subdir/force.txt")
stopifnot(identical(status(repo, ignored = TRUE), s_4))

## The file is ignored but should be added with force
add(repo, "subdir/force.txt", force = TRUE)

s_5 <- structure(list(staged = structure(list(new = "subdir/test.txt"), .Names = "new"),
unstaged = structure(list(), .Names = character(0)),
untracked = structure(list(), .Names = character(0)),
ignored = structure(list(ignored = "subdir/"), .Names = "ignored")),
.Names = c("staged", "unstaged", "untracked", "ignored"),
class = "git_status")
stopifnot(identical(status(repo, ignored = TRUE), s_5))

## Commit and check status
commit(repo, "Commit file in ignored subdirectory")
stopifnot(identical(status(repo, ignored = TRUE), s_4))

## Cleanup
unlink(path, recursive=TRUE)