From 31a1a28a1a56014d23a0ab66951a1b9d19f6150a Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 8 Jul 2020 14:43:29 +0200
Subject: [PATCH] continue the operation

---
 debian/orig-tar.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index bdc0cd57..5ad47e6e 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -51,7 +51,7 @@ reset_repo ()
 PATH_DEBIAN="$(pwd)/$(dirname $0)/../"
 cd "$PATH_DEBIAN"
 
-git stash && git pull && git stash apply
+git stash && git pull && git stash apply || true
 
 MAJOR_VERSION=$(dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).*,\1,p")
 if test -z "$MAJOR_VERSION"; then