Why does `git stash -p` sometimes fail? -


i ♥ git stash -p. sometimes, after satisfying session of y, n, , s, this:

saved working directory , index state wip on foo: 9794c1a lorum ipsum error: patch failed: spec/models/thing_spec.rb:65 error: spec/models/thing_spec.rb: patch not apply cannot remove worktree changes

why?

this happens me time try split hunk smaller hunks close (less 3 lines between changes). short explanation patch has context lines in conflict local changes. more complete explanation below.

suppose have git repo these uncommitted changes:

--- a/pangram +++ b/pangram @@ -1,8 +1,8 @@  -quick +relatively quick  brown  fox -jumps +walks  on   lazy

if stash first change, get:

--- a/pangram +++ b/pangram @@ -1,5 +1,5 @@  -quick +relatively quick  brown  fox  jumps

the git stash command succeed in saving patch (check git stash list), git uses patch in reverse remove stashed changes working dir. context after hunk has "jumps", doesn't match "walks" still in working dir. git bails out with

 error: patch failed: pangram:1 error: pangram: patch not apply cannot remove worktree changes

and leaves changes in working dir, , stash becomes pretty worthless.

i call bug in git's hunk splitting support. if knows it's splitting changes close, shave off few lines of context patch, or jimmy patch have modified context lines instead of pristine ones. alternatively, if splitting hunks close officially unsupported, should refuse split hunks close.


Comments

Post a Comment

Popular posts from this blog

apache - Add omitted ? to URLs -

i working on website cms reads page name of query string, e.g. http://exmaple.com/?pagename . trying create rewrite rule rewrite ? . so, user types in /pagename , taken /?pagename try this: rewriteengine on rewritecond %{request_filename} !-d rewritecond %{request_filename} !-f rewriterule ^/?(.*) index.php?$1 [l]
Read more

redirect - bbPress Forum - rewrite to wwww.mysite prohibits login -

i using bbpress installation without wordpress integration. the redirect of rewriteengine @ forum site works: rewriteengine on rewritecond %{http_host} ^forum.mysite.com$ rewriterule (.*)$ http://www.forum.mysite.com/$1 [r=301,l] the problem login pppress. bbpress login not recognize: http://www.forum.mysite/bb-login.php . it redirects to: http://forum.mysite.com/bb-login.php . i tried permalink settings none , name based, same issue. does uses redirect in bbpress or how can eliminate "double" content , redirect permanently www.? i redirected www.forum.mysite.com forum.mysite.com , achieved eliminate "double" content.
Read more

php - How can I stop spam on my custom forum/blog? -

so have custom built forum & blog system of late has been dealing lot of spam. if wordpress use akismet, if different common platform i'm sure i'd find plugin. there kind of static class can download this? using php. i'd still go akismet, if it. uses outside of wordpress, may have pay fee it, depending on use -- check terms , conditions -- it's option , easy implement in php using api. use api key wordpress. com account access. basically, grab whichever php client library takes fancy -- use alex potsides' php5 library -- plug in key, , it's handful of lines of code. here's bare bones of validation straight 1 of live sites: ... if ($akismet) { $akismet->setcommentauthor($name); $akismet->setcommentauthoremail($session->userinfo["email"]); $akismet->setcommentauthorurl(""); $akismet->setcommentcontent($sentence);...
Read more