Browse Source

Add a constant for info/exclude

Change-Id: Ifd537ce4e726cb9460ea332f683428689bd3d7f4
stable-3.0
Robin Rosenberg 12 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
0a824f5996
  1. 3
      org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
  2. 4
      org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java

3
org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java

@ -265,6 +265,9 @@ public final class Constants {
/** Packed refs file */
public static final String PACKED_REFS = "packed-refs";
/** Excludes-file */
public static final String INFO_EXCLUDE = "info/exclude";
/** The environment variable that contains the system user name */
public static final String OS_USER_NAME_KEY = "user.name";

4
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java

@ -1074,8 +1074,8 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
loadRulesFromFile(r, excludesfile);
}
File exclude = fs
.resolve(repository.getDirectory(), "info/exclude"); //$NON-NLS-1$
File exclude = fs.resolve(repository.getDirectory(),
Constants.INFO_EXCLUDE);
loadRulesFromFile(r, exclude);
return r.getRules().isEmpty() ? null : r;

Loading…
Cancel
Save