From b1046be2058cfa0bcb79c96987e806261e22f5ef Mon Sep 17 00:00:00 2001 From: Sergio Callegari Date: Fri, 9 Nov 2018 12:18:12 +0100 Subject: [PATCH] Fix include patterns in .griveignore --- libgrive/src/base/State.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libgrive/src/base/State.cc b/libgrive/src/base/State.cc index 9f414bb..1cb3130 100644 --- a/libgrive/src/base/State.cc +++ b/libgrive/src/base/State.cc @@ -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() @@ -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; }