Skip to content

Fix include patterns in .griveignore #238

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
callegar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix include patterns in .griveignore #238

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
3 changes: 2 additions & 1 deletion libgrive/src/base/State.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ State::State( const fs::path& root, const Val& options ) :

m_ign_changed = m_orig_ign != "" && m_orig_ign != m_ign;
m_ign_re = boost::regex( m_ign.empty() ? "^\\.(grive$|grive_state$|trash)" : ( m_ign+"|^\\.(grive$|grive_state$|trash)" ) );
Log( "Ignore file regexp: %1%", m_ign_re.str(), log::verbose );
}

State::~State()
Expand Down Expand Up @@ -388,7 +389,7 @@ bool State::ParseIgnoreFile( const char* buffer, int size )
for ( int j = 0; j < (int)parts.size(); j++ )
{
cur = cur.size() > 0 ? cur + "/" + parts[j] : "^" + parts[j];
str = ( str.size() > 0 ? str + "|" + cur : cur ) + ( j < (int)parts.size()-1 ? "$" : "(/|$)" );
str = ( str.size() > 0 ? str + "|" + cur : cur ) + "$";
}
include_re = include_re + ( include_re.size() > 0 ? "|" : "" ) + str;
}
Expand Down