Opened on 09/02/2015 at 07:49:10 AM
Closed on 10/20/2015 at 09:48:05 PM
#2972 closed defect (fixed)
ensure_dependencies.py doesn't add Git ignore paths relative to the project root
| Reported by: | sergz | Assignee: | kzar |
|---|---|---|---|
| Priority: | P2 | Milestone: | |
| Module: | Automation | Keywords: | |
| Cc: | trev, sebastian | Blocked By: | |
| Blocking: | Platform: | Unknown / Cross platform | |
| Ready: | yes | Confidential: | no |
| Tester: | Unknown | Verified working: | no |
| Review URL(s): | |||
Description (last modified by kzar)
How to reproduce
git clone git@github.com:adblockplus/libadblockplus.git cd libadblockplus ./ensure_dependencies.py mkdir -p issue2972/adblockplus touch issue2972/adblockplus/newfile
git status git add issue2972/adblockplus/newfile
Observed behaviour
git status doesn't list the unstaged file issue2972/adblockplus/newfile and trying to git add it results in this warning:
The following paths are ignored by one of your .gitignore files: issue2972/adblockplus/newfile Use -f if you really want to add them. fatal: no files added
(The problem is not present when using Mercurial instead of Git.)
Expected behaviour
The new file should be in the "Untracked files" section and adding it should work.
What is wrong
In .git/info/exclude there should be paths relative to the repository root, e.g /adblockplus instead of adblockplus
Attachments (0)
Change History (11)
comment:1 Changed on 10/20/2015 at 11:27:38 AM by kzar
- Cc kzar added
comment:3 follow-up: ↓ 5 Changed on 10/20/2015 at 11:58:45 AM by kzar
I'm guessing you mean something like this:
git clone git@github.com:adblockplus/libadblockplus.git cd libadblockplus/ ./ensure_dependencies.py touch include/AdblockPlus/newfile git add include/AdblockPlus/newfile git commit -m 'test'
But when I do that I can't reproduce the problem you're having. Could you clarify?
comment:5 in reply to: ↑ 3 Changed on 10/20/2015 at 12:25:18 PM by sergz
Replying to kzar:
I'm guessing you mean something like this:
git clone git@github.com:adblockplus/libadblockplus.git cd libadblockplus/ ./ensure_dependencies.py touch include/AdblockPlus/newfile git add include/AdblockPlus/newfile git commit -m 'test'But when I do that I can't reproduce the problem you're having. Could you clarify?
I've tested it on case sensitive (I guess, your case) and case insensitive file systems and updated the issue description.
Thanks.
comment:6 follow-up: ↓ 8 Changed on 10/20/2015 at 04:07:51 PM by kzar
- Cc trev sebastian added; kzar removed
- Description modified (diff)
- Owner set to kzar
- Priority changed from Unknown to P2
- Ready set
- Summary changed from ensure_dependencies.py ignores more than necessary to ensure_dependencies.py doesn't add Git ignore paths relative to the project root
comment:7 Changed on 10/20/2015 at 04:09:31 PM by kzar
- Description modified (diff)
OK thanks sergz, I see what you mean now.
comment:8 in reply to: ↑ 6 ; follow-up: ↓ 9 Changed on 10/20/2015 at 07:17:59 PM by sergz
Replying to kzar:
ensure_dependencies.py doesn't add Git ignore paths relative to the project root
Could you please also ensure/confirm that it properly works with Mercurial?
comment:9 in reply to: ↑ 8 Changed on 10/20/2015 at 08:08:00 PM by kzar
- Description modified (diff)
Replying to sergz:
Could you please also ensure/confirm that it properly works with Mercurial?
Yep, already did. (Sorry I meant to include that in the description already but I forgot!)
comment:10 Changed on 10/20/2015 at 09:08:21 PM by kzar
- Review URL(s) modified (diff)
- Status changed from new to reviewing
comment:11 Changed on 10/20/2015 at 09:48:05 PM by kzar
- Resolution set to fixed
- Status changed from reviewing to closed
Your reproduction steps do not include any use of the ensure_dependencies.py script, please could you add any missing steps so I can attempt to reproduce this?
Thanks, Dave