From 1660564df60f4aed6b56bfb2fc303a4f4683013e Mon Sep 17 00:00:00 2001
From: Andy Lutomirski <luto@kernel.org>
Date: Feb 24 2019 19:20:59 +0000
Subject: Update to 3.0.2


---

diff --git a/.gitignore b/.gitignore
index 454a284..80cb010 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /fish-2.6.0.tar.gz
 /fish-2.7.1.tar.gz
 /fish-3.0.0.tar.gz
+/fish-3.0.2.tar.gz
diff --git a/0001-string-Fix-crash-with-_GLIBCXX_ASSERTIONS.patch b/0001-string-Fix-crash-with-_GLIBCXX_ASSERTIONS.patch
deleted file mode 100644
index 4b4b9c5..0000000
--- a/0001-string-Fix-crash-with-_GLIBCXX_ASSERTIONS.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9d4e460b298a39ee2be2443af97413e7063fa8d2 Mon Sep 17 00:00:00 2001
-From: Fabian Homborg <FHomborg@gmail.com>
-Date: Fri, 4 Jan 2019 08:45:53 +0100
-Subject: [PATCH] string: Fix crash with _GLIBCXX_ASSERTIONS
-
-This asserted because we accessed wcstring::front() when it was empty.
-
-Instead, check explicitly for it being empty before.
-
-Fixes #5479
----
- src/builtin_string.cpp | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
-index 6e810a32..bbc7e40c 100644
---- a/src/builtin_string.cpp
-+++ b/src/builtin_string.cpp
-@@ -622,9 +622,13 @@ class wildcard_matcher_t : public string_matcher_t {
-             }
-         }
-         if (opts.entire) {
--            // If the pattern is empty, this becomes one ANY_STRING that matches everything.
--            if (wcpattern.front() != ANY_STRING) wcpattern.insert(0, 1, ANY_STRING);
--            if (wcpattern.back() != ANY_STRING) wcpattern.push_back(ANY_STRING);
-+            if (!wcpattern.empty()) {
-+                if (wcpattern.front() != ANY_STRING) wcpattern.insert(0, 1, ANY_STRING);
-+                if (wcpattern.back() != ANY_STRING) wcpattern.push_back(ANY_STRING);
-+            } else {
-+                // If the pattern is empty, this becomes one ANY_STRING that matches everything.
-+                wcpattern.push_back(ANY_STRING);
-+            }
-         }
-     }
- 
--- 
-2.20.1
-
diff --git a/fish.spec b/fish.spec
index ae8edfe..714fc23 100644
--- a/fish.spec
+++ b/fish.spec
@@ -3,8 +3,8 @@
 %global _python_bytecompile_extra 1
 
 Name:           fish
-Version:        3.0.0
-Release:        5%{?dist}
+Version:        3.0.2
+Release:        1%{?dist}
 Summary:        Friendly interactive shell
 
 # GPLv2
@@ -29,8 +29,6 @@ URL:            https://fishshell.com
 Source0:        https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.gz
 # https://github.com/fish-shell/fish-shell/commit/742fde0dd68858ad603b449501f0c42cd7864fab
 Patch0001:      0001-Don-t-use-less-in-highlighting-test.patch
-# https://github.com/fish-shell/fish-shell/commit/9d4e460b298a39ee2be2443af97413e7063fa8d2
-Patch0002:      0001-string-Fix-crash-with-_GLIBCXX_ASSERTIONS.patch
 
 BuildRequires:  cmake >= 3.2
 BuildRequires:  ninja-build
@@ -111,6 +109,9 @@ fi
 %{_pkgdocdir}
 
 %changelog
+* Sun Feb 24 2019 luto@kernel.org - 3.0.2-1
+- Update to 3.0.2
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 2d903ce..66c0607 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fish-3.0.0.tar.gz) = e4159821d4263e5afb67adee82e30cfed0ad30f3772dd95beb0df71423ff52c21354970f64967f2de9fd1d31caa702208cfd9f2ce281bbf33114f3aa7cd539a2
+SHA512 (fish-3.0.2.tar.gz) = cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3