From patchwork Sun Jan  7 21:42:00 2024
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Britton Kerin <britton.kerin@gmail.com>
X-Patchwork-Id: 13512966
Received: from aa.d.sender-sib.com (aa.d.sender-sib.com [185.41.28.128])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7AC4911725
	for <git@vger.kernel.org>; Sun,  7 Jan 2024 21:42:10 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 dmarc=fail (p=none dis=none) header.from=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
 spf=pass smtp.mailfrom=aa.d.sender-sib.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (1024-bit key) header.d=sendinblue.com header.i=@sendinblue.com
 header.b="zbkmKO2I"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sendinblue.com;
 q=dns/txt; s=mail; bh=1gxtnAgcErlaCc5oSBJKnLEVg7XiRs+rUgFO0WlZG3U=;
 h=from:subject:date:to:cc:mime-version:content-transfer-encoding:in-reply-to:references:x-csa-complaints:list-unsubscribe-post;
        b=zbkmKO2IvmT9/h2XTBemDlKeX9kSfyRFGn57rW9qGLggAu/Bvme05EoaI3rMWbh5duPrCgXar1rJ
        Vxl54FiRYFha7tSPFPhZ6NpKdo/mJcByUhOks8I7s/BbfLKDoT3zqp4ziIu677jREiq9QTK24PrN
        Qd0caU9z1YymzSP+Bto=
Received: by smtp-relay.sendinblue.com with ESMTP id
 8a8dfcfc-3369-42b8-8387-f1af33202b16;
 Sun, 07 January 2024 21:42:03 +0000 (UTC)
X-Mailin-EID: 
 MjQyODY0MDE0fmdpdEB2Z2VyLmtlcm5lbC5vcmd%2BPDIwMjQwMTA3MjE0MjAwLjI5Njg0LTItYnJpdHRvbi5rZXJpbkBnbWFpbC5jb20%2BfmFhLmQuc2VuZGVyLXNpYi5jb20%3D
Date: Sun,  7 Jan 2024 12:42:00 -0900
Subject: [PATCH 1/1] completion: dir-type optargs for am, format-patch
Received: by brittons-large-Vivobook (Postfix,
 from userid 1000) id AE4C8520265; Sun,  7 Jan 2024 12:42:01 -0900 (AKST)
Cc: Britton Leo Kerin <britton.kerin@gmail.com>
X-Mailer: git-send-email 2.43.0
In-Reply-To: <20240107214200.29684-1-britton.kerin@gmail.com>
References: <20240107214200.29684-1-britton.kerin@gmail.com>
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
List-Id: <git.vger.kernel.org>
List-Subscribe: <mailto:git+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:git+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Message-Id: <8a8dfcfc-3369-42b8-8387-f1af33202b16@smtp-relay.sendinblue.com>
Origin-messageId: <20240107214200.29684-2-britton.kerin@gmail.com>
To: <git@vger.kernel.org>
X-sib-id: 
 dNO7KGJACFgBPSNHTUS5NAfppDg-4DpL96BmmxzAuQy4jj6WR_VjvC3jPwbv9vIOTEMKeKPQU2UWWTYPZEO38yHXtweh4IpDQJO4Al8-4tqxOEvaKCVlm6TurI323qSngkmXv0uKNq8PyeRYPEKLYWcb13MW5kZbnrjGMzDuLrYT
X-CSA-Complaints: csa-complaints@eco.de
List-Unsubscribe-Post: List-Unsubscribe=One-Click
Feedback-ID: 185.41.28.128:6940237_-1:6940237:Sendinblue
From: "Britton Leo Kerin" <britton.kerin@gmail.com>

Signed-off-by: Britton Leo Kerin <britton.kerin@gmail.com>
---
 contrib/completion/git-completion.bash | 38 ++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 185b47d802..c3b0a3699c 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1356,6 +1356,30 @@ __git_count_arguments ()
 	printf "%d" $c
 }
 
+
+# Complete actual dir (not pathspec), respecting any -C options.
+#
+# Usage: __git_complete_refs [<option>]...
+# --cur=<word>: The current dir to be completed.  Defaults to the current word.
+__git_complete_dir ()
+{
+	local cur_="$cur"
+
+	while test $# != 0; do
+		case "$1" in
+		--cur=*)	cur_="${1##--cur=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+
+	local context_dir=$(__git rev-parse --show-toplevel --show-prefix 2>/dev/null | paste -s -d '/' 2>/dev/null)
+	[ -d "$context_dir" ] || return
+
+	COMPREPLY=$(cd $context_dir 2>/dev/null && compgen -d -- "$cur_")
+}
+
+
 __git_whitespacelist="nowarn warn error error-all fix"
 __git_patchformat="mbox stgit stgit-series hg mboxrd"
 __git_showcurrentpatch="diff raw"
@@ -1374,6 +1398,10 @@ _git_am ()
 		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
 		return
 		;;
+	--directory=*)
+		__git_complete_dir --cur="${cur##--directory=}"
+		return
+		;;
 	--patch-format=*)
 		__gitcomp "$__git_patchformat" "" "${cur##--patch-format=}"
 		return
@@ -1867,7 +1895,17 @@ __git_format_patch_extra_options="
 
 _git_format_patch ()
 {
+	case "$prev,$cur" in
+	-o,*)
+		__git_complete_dir
+		return
+		;;
+	esac
 	case "$cur" in
+	--output-directory=*)
+		__git_complete_dir --cur="${cur##--output-directory=}"
+		return
+		;;
 	--thread=*)
 		__gitcomp "
 			deep shallow