Re: [PATCH v2] Emit helpful status for accidental "git stash" save

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



El 22/12/2007, a las 18:58, Junio C Hamano escribió:

Wincent Colaiuta <win@xxxxxxxxxxx> writes:

Something like this then?

Sure, even like this.

git-stash.sh |    6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/git-stash.sh b/git-stash.sh
index f16fd9c..ade300c 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -99,7 +99,7 @@ save_stash () {

	git update-ref -m "$stash_msg" $ref_stash $w_commit ||
		die "Cannot save the current status"
-	printf >&2 'Saved "%s"\n' "$stash_msg"
+ printf >&2 'Saved working directory and index state "%s"\n' "$stash_msg"
}

have_stash () {
@@ -228,7 +228,9 @@ create)
*)
	if test $# -eq 0
	then
-		save_stash && git-reset --hard
+		save_stash &&
+		echo >&2 '(To restore them type "git stash apply")' &&
+		git-reset --hard
	else
		usage
	fi

Preserves the behaviour while avoiding the need for the creation of the ARGC variable, so if you prefer this solution then it seems fine by me.

Cheers,
Wincent

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux