git-ps-rs icon indicating copy to clipboard operation
git-ps-rs copied to clipboard

Add command to show diff of diffs of a patch when there have been changes between of patch

Open drewdeponte opened this issue 3 years ago • 2 comments

It would be useful to show the diff of diffs of the local changes and maybe a separate option to see the diff between the remote patch.

drewdeponte avatar May 10 '22 20:05 drewdeponte

@RyanHedges here is the suggestion you raised today.

drewdeponte avatar May 10 '22 20:05 drewdeponte

For reference for anyone curious:

We got the diff of my two shas and put them in a file

git show --pretty=raw 7e40177 > /tmp/patchstack-patch1.txt

then diffed them

diff /tmp/patchstack-patch1.txt /tmp/patchstack-patch2.txt

Here is an example result of diffing

1,3c1,3
< commit 7e401776348f16dbba514d263af2610b85b1c22e
< tree cbc2eca8c493d43f9f3f558c9a28e47320df1d51
< parent 8545c80177a1ee14fa7085477d1955ca1f32f16f
---
> commit 137ea7c68c89e45c8435c1d208d7a43dd9109b7c
> tree 09444229806036fdf1ff3f8b4f8a188f636e2314
> parent 555d68a7b05d37022fb74a19996cee21e0c48806
5c5
< committer Ryan Hedges <[email protected]> 1652208960 -0700
---
> committer Ryan Hedges <[email protected]> 1652208692 -0700
15c15
< index dbca1fb..1fb183e 100644
---
> index def91e5..ed748b4 100644
18c18
< @@ -62,6 +62,8 @@ export class SomeController {
---
> @@ -59,6 +59,8 @@ export class SomeController {
25,26c25,26
<    async somthing(@Param('id') id: string): Promise<{ id: string }> {
<      const result = await this.someService.remove(id);
---
>    something(@Param('id') id: string) {
>      return this.someService.remove(+id);

RyanHedges avatar May 10 '22 22:05 RyanHedges