threads / patch / 6231

patch, 2 partsgit-reset <tree> -- <path> restores absense of <path> in <tree>

Subject: [PATCH 2/2] git-reset <tree> -- <path> restores absense of <path> in <tree>

## tl;dr

4 messages between Jan 5, 2007 and Jan 5, 2007. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Junio C Hamano· Jan 5, 2007, 09:46 UTC · lore

When <path> exists in the index (either merged or unmerged), and <tree> does not have it, git-reset should be usable to restore the absense of it from the tree. This implements it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 
 * By the way, I noticed that "git log --diff-filter=A --
   t/t5401-update-hooks.sh" does not find the commit that
   introduced the path.  v1.4.1.1 seems to work but v1.4.2.4
   does not.  I haven't bisected it yet...

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

Show changes to git-reset.sh +4 −2

diff --git a/git-reset.sh b/git-reset.sh
index a969370..76c8a81 100755
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -44,8 +44,10 @@ if test $# != 0
 then
 	test "$reset_type" == "--mixed" ||
 		die "Cannot do partial $reset_type reset."
-	git ls-tree -r --full-name $rev -- "$@" |
-	git update-index --add --index-info || exit
+
+	git-diff-index --cached $rev -- "$@" |
+	sed -e 's/^:\([0-7][0-7]*\) [0-7][0-7]* \([0-9a-f][0-9a-f]*\) [0-9a-f][0-9a-f]* [A-Z]	\(.*\)$/\1 \2	\3/' |
+	git update-index --add --remove --index-info || exit
 	git update-index --refresh
 	exit
 fi

-- 
1.5.0.rc0.ge0f6

Johannes Schindelin· Jan 5, 2007, 10:29 UTC · re: Junio C Hamano · lore

Re: [PATCH 2/2] git-reset <tree> -- <path> restores absense of <path> in <tree>

Hi,

On Fri, 5 Jan 2007, Junio C Hamano wrote:

>  * By the way, I noticed that "git log --diff-filter=A --
>    t/t5401-update-hooks.sh" does not find the commit that
>    introduced the path.  v1.4.1.1 seems to work but v1.4.2.4
>    does not.  I haven't bisected it yet...

It is this commit:

1798562: "log --raw: Don't descend into subdirectories by default"

And sure enough,

$ git log next -r --diff-filter=A -- t/t5401-update-hooks.sh

works.

Ciao, Dscho

Junio C Hamano· Jan 5, 2007, 11:09 UTC · re: Johannes Schindelin · lore

Re: [PATCH 2/2] git-reset <tree> -- <path> restores absense of <path> in <tree>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 18 quoted lines

> Hi,
>
> On Fri, 5 Jan 2007, Junio C Hamano wrote:
>
>>  * By the way, I noticed that "git log --diff-filter=A --
>>    t/t5401-update-hooks.sh" does not find the commit that
>>    introduced the path.  v1.4.1.1 seems to work but v1.4.2.4
>>    does not.  I haven't bisected it yet...
>
> It is this commit:
>
> 1798562: "log --raw: Don't descend into subdirectories by default"
>
> And sure enough,
>
> $ git log next -r --diff-filter=A -- t/t5401-update-hooks.sh
>
> works.

Soon after I accepted the patch, I had this exact reaction and then after some digging I realized the workaround you showed above. And I forgot all of them X-<. Silly me.

Juergen Ruehle· Jan 5, 2007, 16:17 UTC · re: Junio C Hamano · lore

Re: [PATCH 2/2] git-reset <tree> -- <path> restores absense of <path> in <tree>

Junio C Hamano writes:
 > When <path> exists in the index (either merged or unmerged), and
 > <tree> does not have it, git-reset should be usable to restore
 > the absense of it from the tree.  This implements it.

Great! It took some time, but I think I understand now why the first part was even necessary:-)

 > diff --git a/git-reset.sh b/git-reset.sh
 > index a969370..76c8a81 100755
 > --- a/git-reset.sh
 > +++ b/git-reset.sh
 > @@ -44,8 +44,10 @@ if test $# != 0
 >  then
 >  	test "$reset_type" == "--mixed" ||
 >  		die "Cannot do partial $reset_type reset."
 > -	git ls-tree -r --full-name $rev -- "$@" |
 > -	git update-index --add --index-info || exit
 > +
 > +	git-diff-index --cached $rev -- "$@" |
 > +	sed -e 's/^:\([0-7][0-7]*\) [0-7][0-7]* \([0-9a-f][0-9a-f]*\) [0-9a-f][0-9a-f]* [A-Z]	\(.*\)$/\1 \2	\3/' |
 > +	git update-index --add --remove --index-info || exit

All other scripts calling update-index --index-info don't mention add/remove (which are ignored anyway). Might be useful as a reminder though.

 >  	git update-index --refresh
 >  	exit
 >  fi