Finds a rename event

GitImporter.java

	// Returns the item between startTime and endTime when oldPath was renamed to file in view.
	// Searches file and it's folders for a rename event between those two times.
	// Returns null if a rename event is not found.
	private Item findRenameEventItem(View view, String oldPath, File file, long startTime, long endTime) {
		String path = pathname(file);
		String oldFolderName = FileUtils.getParent(oldPath, "/");
		String folderName = FileUtils.getParent(path, "/");
		String oldFileName = FileUtils.getName(oldPath, "/");

		// file was probably renamed during the time period
		if (!oldFileName.equals(file.getName())) {
			Item[] hist = file.getHistory();
			for (int i = 0; i < hist.length; i++) {
				File item = (File) hist[i];
				long time = item.getModifiedTime().getLongValue();
				if (time > endTime) {
					continue;
				}
				if (time < startTime) {
					break;
				}
				if (i+1 < hist.length &&
					item.getName().equals(file.getName()) &&
					((File)hist[i+1]).getName().equals(oldFileName)) {
					return item;
				}
			}
		}

		// some folder was probably renamed during the time period
		if (!oldFolderName.equals(folderName)) {
			while (folder != null) {
				Item[] hist = folder.getHistory();
				for (int i = 0; i < hist.length; i++) {
					Folder item = (Folder) hist[i];
					long time = item.getModifiedTime().getLongValue();
					if (time > endTime) {
						continue;
					}
					if (time < startTime) {
						break;
					}
					if (i+1 < hist.length &&
						!item.getName().equals(((Folder)hist[i+1]).getName())) {
						return item;
					}
				}
				folder = folder.getParentFolder();
			}
		}

		return null;
	}

There's a bug on line 32 where the folder member variable is used when a local variable was intended.