From 7238679f25292141070369e3af8a20a9b951c1b8 Mon Sep 17 00:00:00 2001
From: Lubomír Sedlář <lsedlar@redhat.com>
Date: Jan 27 2021 12:46:04 +0000
Subject: [PATCH 1/4] Add fork to bash completion


Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1920997
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>

---

diff --git a/conf/bash-completion/fedpkg.bash b/conf/bash-completion/fedpkg.bash
index a42f7fa..510c9c0 100644
--- a/conf/bash-completion/fedpkg.bash
+++ b/conf/bash-completion/fedpkg.bash
@@ -36,7 +36,7 @@ _fedpkg()
     new new-sources patch prep pull push retire request-branch request-repo \
     request-side-tag list-side-tags remove-side-tag \
     scratch-build sources srpm switch-branch tag unused-patches update upload \
-    verify-files verrel override"
+    verify-files verrel override fork"
 
     # parse main options and get command
 

From ef1e5d7b1816c9bbaee71ecf716b542abf758423 Mon Sep 17 00:00:00 2001
From: Lubomír Sedlář <lsedlar@redhat.com>
Date: Jan 27 2021 12:46:18 +0000
Subject: [PATCH 2/4] Remove duplicated definition for lint


Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>

---

diff --git a/conf/bash-completion/fedpkg.bash b/conf/bash-completion/fedpkg.bash
index 510c9c0..64cba50 100644
--- a/conf/bash-completion/fedpkg.bash
+++ b/conf/bash-completion/fedpkg.bash
@@ -95,7 +95,7 @@ _fedpkg()
     local after= after_more=
 
     case $command in
-        help|gimmespec|gitbuildhash|giturl|lint|new|push|unused-patches|verrel)
+        help|gimmespec|gitbuildhash|giturl|new|push|unused-patches|verrel)
             ;;
         build)
             options="--nowait --background --skip-tag --scratch --skip-remote-rules-validation --fail-fast"

From ab464fd7149c8e63ab25ede0a86c2d226f66d5f2 Mon Sep 17 00:00:00 2001
From: Lubomír Sedlář <lsedlar@redhat.com>
Date: Jan 27 2021 12:46:22 +0000
Subject: [PATCH 3/4] Add --rpmlintconf to lint command completion


Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>

---

diff --git a/conf/bash-completion/fedpkg.bash b/conf/bash-completion/fedpkg.bash
index 64cba50..1b21782 100644
--- a/conf/bash-completion/fedpkg.bash
+++ b/conf/bash-completion/fedpkg.bash
@@ -149,6 +149,7 @@ _fedpkg()
             ;;
         lint)
             options="--info"
+            options_file="--rpmlintconf"
             ;;
         list-side-tags)
             options="--mine"

From 33c547da14e9d0965ec2817c27334ffc8c5c93d0 Mon Sep 17 00:00:00 2001
From: Lubomír Sedlář <lsedlar@redhat.com>
Date: Jan 27 2021 12:46:26 +0000
Subject: [PATCH 4/4] Fix completion of arches


Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>

---

diff --git a/conf/bash-completion/fedpkg.bash b/conf/bash-completion/fedpkg.bash
index 1b21782..1ab2218 100644
--- a/conf/bash-completion/fedpkg.bash
+++ b/conf/bash-completion/fedpkg.bash
@@ -129,7 +129,7 @@ _fedpkg()
             ;;
         compile|install)
             options="--short-circuit"
-            options_arch="--arch"
+            options_arches="--arch"
             options_dir="--builddir"
             ;;
         container-build)
@@ -157,13 +157,13 @@ _fedpkg()
             ;;
         local)
             options="--md5"
-            options_arch="--arch"
+            options_arches="--arch"
             options_string="--with --without"
             options_dir="--builddir"
             ;;
         mock-config)
             options="--target"
-            options_arch="--arch"
+            options_arches="--arch"
             ;;
         mockbuild)
             options="--md5 --no-clean --no-cleanup-after --no-clean-all --shell"
@@ -197,7 +197,7 @@ _fedpkg()
             options_string="--suffix"
             ;;
         prep|verify-files)
-            options_arch="--arch"
+            options_arches="--arch"
             options_dir="--builddir"
             ;;
         pull)