| commit | 98414401f8ef91c1d850233714a2a8627937dd43 | [log] [tgz] |
|---|---|---|
| author | Dawid Pakuła <zulus@w3des.net> | Fri Aug 23 00:14:49 2019 +0200 |
| committer | Dawid Pakuła <zulus@w3des.net> | Fri Aug 23 09:25:37 2019 +0200 |
| tree | f955523fc3615dc542628d8ae4bbada45803b80b | |
| parent | 7beabd6b13b2e197c1a8a9f9ed6bcbef76575c75 [diff] |
Bug 475166 - Prevent re-sync after internal repository changes Change-Id: Ib1c42d7453ae4005db5c52fa4d014d9fbdbe6ad2 Signed-off-by: Dawid Pakuła <zulus@w3des.net>
diff --git a/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/internal/rdt/sync/git/core/GitSyncService.java b/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/internal/rdt/sync/git/core/GitSyncService.java index 9f64068..2b02cd8 100644 --- a/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/internal/rdt/sync/git/core/GitSyncService.java +++ b/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/internal/rdt/sync/git/core/GitSyncService.java
@@ -444,6 +444,10 @@ if (project == null || rl == null) { throw new NullPointerException(); } + // ignore deltas with filtered resource + if (delta != null && getSyncFileFilter(project).shouldIgnore(delta.getResource())) { + return; + } // Make a copy to protect against the remote location // being changed by another thread. RemoteLocation remoteLoc = new RemoteLocation(rl);