From e247370125655f0c959f224089b349eef7280c4c Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@FreeBSD.org>
Date: Fri, 3 Apr 2015 18:01:51 +0000
Subject: [PATCH] MFC r280870:

  Fix --one-file-system to include the directory encountered rather than
  excluding it.  This was broken in 3.0.4 (r238856).

Relnotes:	yes
---
 contrib/libarchive/libarchive/archive_read_disk_posix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/libarchive/libarchive/archive_read_disk_posix.c b/contrib/libarchive/libarchive/archive_read_disk_posix.c
index a13dbbf812cf..1787d864ca92 100644
--- a/contrib/libarchive/libarchive/archive_read_disk_posix.c
+++ b/contrib/libarchive/libarchive/archive_read_disk_posix.c
@@ -974,7 +974,7 @@ next_entry(struct archive_read_disk *a, struct tree *t,
 		t->initial_filesystem_id = t->current_filesystem_id;
 	if (!a->traverse_mount_points) {
 		if (t->initial_filesystem_id != t->current_filesystem_id)
-			return (ARCHIVE_RETRY);
+			descend = 0;
 	}
 	t->descend = descend;