Uploaded image for project: 'Sourcetree For Mac'
  1. Sourcetree For Mac
  2. SRCTREE-906

Can't stage a tracked and modified file when it is in a folder that is ignored.

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Not a bug
    • Icon: Low Low
    • None
    • 1.3.2
    • Git
    • None
    • OS X Lion, Standalone

      I have a folder in my project which is mentioned in my .gitignore, but it also has tracked files. When one of these tracked files is modified, it shows up as modified in the working copy and shows me a diff. When I click "stage file" I get an error about the file being ignored, and that I must use -f (but have no way to do this in the UI). I can however click "stage hunk" or "stage selected lines", and this works fine.

      I expected that if I can stage hunks and individual lines on a tracked file, I should also be able to stage the whole file.

      Also, this may be a separate issue, and one that I don't think is a contributing factor to the above, but I first noticed this when trying to stage modified files in a folder that is ignored in svn:ignore upstream, and I created my local Git repository with git svn clone. The folder doesn't actually appear in any .gitignore file. Where are svn:ignore properties tracked and enforced in my Git repository, if they are not converted to a .gitignore file?

      Like I said, I don't think SVN has anything to do with the primary issue here. I tested by adding another folder to my .gitignore, modifying some files in that folder and attempting to stage them to the index.

              Unassigned Unassigned
              29d22823eaf0 mrmachine
              Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

                Created:
                Updated:
                Resolved: