[PATCH 1/2] stash: fix USAGE text

[PATCH 1/2] stash: fix USAGE text

[Marc Strapetz]

Add missing usage description for stash subcommands
'create' and 'store'.

Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
---
 git-stash.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/git-stash.sh b/git-stash.sh
index 10c284d1a..c6b9db694 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -9,7 +9,9 @@ USAGE="list [<options>]
    or: $dashless branch <branchname> [<stash>]
    or: $dashless [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
 		       [-u|--include-untracked] [-a|--all] [<message>]]
-   or: $dashless clear"
+   or: $dashless clear
+   or: $dashless create [<message>]
+   or: $dashless store [-m|--message <message>] [-q|--quiet] <commit>"
 
 SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=
-- 
2.11.0

[PATCH 2/2] stash: --[no-]include-untracked option for create

[Marc Strapetz]

Expose internal option to include untracked files
for the stash 'create' subcommand.

Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
---
 Documentation/git-stash.txt |  2 +-
 git-stash.sh                | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 2e9cef06e..cc7944e59 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -16,7 +16,7 @@ SYNOPSIS
 'git stash' [save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]
 	     [-u|--include-untracked] [-a|--all] [<message>]]
 'git stash' clear
-'git stash' create [<message>]
+'git stash' create [-u|--[no-]include-untracked] [<message>]
 'git stash' store [-m|--message <message>] [-q|--quiet] <commit>
 
 DESCRIPTION
diff --git a/git-stash.sh b/git-stash.sh
index c6b9db694..16f5fe93e 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -10,7 +10,7 @@ USAGE="list [<options>]
    or: $dashless [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
 		       [-u|--include-untracked] [-a|--all] [<message>]]
    or: $dashless clear
-   or: $dashless create [<message>]
+   or: $dashless create [-u|--[no-]include-untracked] [<message>]
    or: $dashless store [-m|--message <message>] [-q|--quiet] <commit>"
 
 SUBDIRECTORY_OK=Yes
@@ -629,7 +629,17 @@ clear)
 	;;
 create)
 	shift
-	create_stash "$*" && echo "$w_commit"
+	case "$1" in
+	-u|--include-untracked)
+		untracked=untracked
+		shift
+		;;
+	--no-include-untracked)
+		untracked=
+		shift
+		;;
+	esac
+	create_stash "$*" "$untracked" && echo "$w_commit"
 	;;
 store)
 	shift
-- 
2.11.0

Re: [PATCH 1/2] stash: fix USAGE text

[Junio C Hamano]

Marc Strapetz <marc.strapetz@syntevo.com> writes:

> Add missing usage description for stash subcommands
> 'create' and 'store'.

I think we didn't add them to usage description when we added them
because these two are not end-user facing commands but for script
writers (who do not use "$ git stash -h <ENTER>" to learn how to
use).

I dunno.

> Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
> ---
>  git-stash.sh | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/git-stash.sh b/git-stash.sh
> index 10c284d1a..c6b9db694 100755
> --- a/git-stash.sh
> +++ b/git-stash.sh
> @@ -9,7 +9,9 @@ USAGE="list [<options>]
>     or: $dashless branch <branchname> [<stash>]
>     or: $dashless [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
>  		       [-u|--include-untracked] [-a|--all] [<message>]]
> -   or: $dashless clear"
> +   or: $dashless clear
> +   or: $dashless create [<message>]
> +   or: $dashless store [-m|--message <message>] [-q|--quiet] <commit>"
>  
>  SUBDIRECTORY_OK=Yes
>  OPTIONS_SPEC=