"GOT", but the "O" is a cute, smiling pufferfish. Index | Thread | Search

From:
Stefan Sperling <stsp@stsp.name>
Subject:
Re: staging the reverse of the staged diff
To:
Omar Polo <op@omarpolo.com>
Cc:
gameoftrees@openbsd.org
Date:
Sat, 4 Jun 2022 13:08:03 +0200

Download raw body.

Thread
On Fri, Jun 03, 2022 at 11:34:48AM +0200, Omar Polo wrote:
> found this by chance; i've staged a debug printf somewhere by accident,
> then removed, staged the removal and... the file was still staged but
> with an empty diff!  (it was the only edit to that file)
> 
> patch below tries to make stage_path slightly more clever by checking
> the staged blob and the file blob: if they're the same we've effectively
> unstaged a file.
> 
> does this makes sense?  am i trying to make 'got stage' too much clever?

Could we make this situation an error and require the user to
run 'got unstage' instead? Or would that be too complicated?