stash: end commit log with a newline
PATCH 1/1 stash: end commit log with a newline
If I do
git cat-file commit $commitid
for a commit created by stash, the next prompt starts directly after the shortlog of HEAD.
--- git-stash.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
git-stash.sh +1 -1
@@ -67,7 +67,7 @@ save_stash () { die "Cannot save the current worktree state" # create the stash - w_commit=$(printf 'WIP on %s' "$msg" | + w_commit=$(printf 'WIP on %s\n' "$msg" | git commit-tree $w_tree -p $b_commit -p $i_commit) || die "Cannot record working tree state"
Signature · 7 lines
1.5.2.2.1451.gb0e5e -- Uwe Kleine-König cal 9 1752 | grep 10
Quoting Uwe Kleine-König <[email protected]>:
Quoted 6 lines
If I do
git cat-file commit $commitid
for a commit created by stash, the next prompt starts directly after the shortlog of HEAD.
Thank you for fixing my bug.
Signature · 6 lines
Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/ ---------------------------------------------------------------------- Free pop3 email with a spam filter. http://www.bluebottle.com/tag/5
Quoted 6 lines · Uwe Kleine-König
If I do
git cat-file commit $commitid
for a commit created by stash, the next prompt starts directly after the shortlog of HEAD.
Thanks.
I noticed another thing. The entries shown in "git stash list" look like this:
stash@{0}: js/stash: e1d32c1... Teach git-stash to "apply --index" stash@{1}: master: 5be6007... Rewrite "git-frotz" to "git frotz" stash@{2}: master: 36e5e70... Start deprecating "git-command" in favor of "git command" stash@{3}: master: 3b0d999... Merge branch 'jo/init'
But each of the stash is _not_ about these commits, but is about some change that happens to be on top of them.
So risking to make it a tad longer, how about doing this on top?
---
git-stash.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
git-stash.sh +1 -1
@@ -71,7 +71,7 @@ save_stash () { git commit-tree $w_tree -p $b_commit -p $i_commit) || die "Cannot record working tree state" - git update-ref -m "$msg" $ref_stash $w_commit || + git update-ref -m "WIP on $msg" $ref_stash $w_commit || die "Cannot save the current status" printf >&2 'Saved WIP on %s\n' "$msg" }
Uwe Kleine-König
Acked-byQuoted 13 lines · Junio C Hamano
I noticed another thing. The entries shown in "git stash list" look like this:
stash@{0}: js/stash: e1d32c1... Teach git-stash to "apply --index" stash@{1}: master: 5be6007... Rewrite "git-frotz" to "git frotz" stash@{2}: master: 36e5e70... Start deprecating "git-command" in favor of "git command" stash@{3}: master: 3b0d999... Merge branch 'jo/init'
But each of the stash is _not_ about these commits, but is about some change that happens to be on top of them.
So risking to make it a tad longer, how about doing this on top?
git-stash.sh save_stash () { · line 74
Quoted 2 lines
git-stash.sh +1
-1- git update-ref -m "$msg" $ref_stash $w_commit || + git update-ref -m "WIP on $msg" $ref_stash $w_commit ||
I like that. I already wondered about that, too. But not as much as thinking about an alternative.
So:
Best regards
Uwe
Signature · 3 lines
Uwe Kleine-König http://www.google.com/search?q=gravity+on+earth%3D
Quoting Uwe Kleine-König <[email protected]>:
Quoted 20 lines
Quoted 13 lines · Junio C Hamano
I noticed another thing. The entries shown in "git stash list" look like this:
stash@{0}: js/stash: e1d32c1... Teach git-stash to "apply --index" stash@{1}: master: 5be6007... Rewrite "git-frotz" to "git frotz" stash@{2}: master: 36e5e70... Start deprecating "git-command" in favor of "git command" stash@{3}: master: 3b0d999... Merge branch 'jo/init'
But each of the stash is _not_ about these commits, but is about some change that happens to be on top of them.
So risking to make it a tad longer, how about doing this on top?
git-stash.sh save_stash () { · line 74
Quoted 2 lines
git-stash.sh +1
-1- git update-ref -m "$msg" $ref_stash $w_commit || + git update-ref -m "WIP on $msg" $ref_stash $w_commit ||I like that. I already wondered about that, too. But not as much as thinking about an alternative.
Quoted 3 lines
So:
Acked-by Uwe Kleine-König <[email protected]>
I am sorry to join the discussion late, but I think it is much better to let the user give a short reminder message from the command line. For example,
$ git stash add customized message to stash
When I say "git stash list", I want to see which branch I was on when I was in the middle of doing something, and what that something was. It is not interesting which commit on that branch I started that change from. After creating a stash without a message, and then another stash with a message, I want to see:
$ git stash list
stash@{0}: On master: add customized message to stash
stash@{1}: WIP on master: 36e5e70... Start deprecating "git-command" in favor of "git command"Signature · 6 lines
Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/ ---------------------------------------------------------------------- Free pop3 email with a spam filter. http://www.bluebottle.com/tag/5
Hi,
git-stash.sh save_stash () { · line 70
Quoted 2 lines · Uwe Kleine-K?nig
git-stash.sh +1
-1- w_commit=$(printf 'WIP on %s' "$msg" | + w_commit=$(printf 'WIP on %s\n' "$msg" |
Why not
w_commit=$(echo "WIP on $msg" |
Hmm? It is shorter and more to the point. IMHO it is also more common.
Ciao,
Dscho
Hallo Johannes,
Quoted 8 lines · Johannes Schindelin
git-stash.sh save_stash () { · line 70
Quoted 2 lines · Uwe Kleine-K?nig
git-stash.sh +1
-1- w_commit=$(printf 'WIP on %s' "$msg" | + w_commit=$(printf 'WIP on %s\n' "$msg" |Why not
w_commit=$(echo "WIP on $msg" |
I just continued to use printf to make a minimal change. I don't have anything against echo.
Best regards
Uwe
Signature · 3 lines
Uwe Kleine-König http://www.google.com/search?q=5%2B7
Quoted 5 lines · Johannes Schindelin
Why not
w_commit=$(echo "WIP on $msg" |Hmm? It is shorter and more to the point. IMHO it is also more common.
Because echo cannot reliably reproduce arbitrary strings. See commits:
a23bfaed..4b7cc26a
You can add this to your list of reasons to rewrite everything in C.
-Peff