git diff, external diff tool, and submodules

2014-02-15 Thread Grégory Pakosz
Hello, When a submodule has new commits, I noticed the following: $ git diff diff --git a/submodule b/submodule index 4c75be6..b272d40 16 --- a/submodule +++ b/submodule @@ -1 +1 @@ -Subproject commit 4c75be6435cd515887d35c300ed8b487f8143d8e +Subproject commit b272d4077fda29028c0bd02efba2837e

Re: git filter-branch doesn't dereference annotated tags

2013-01-03 Thread Grégory Pakosz
> > IOW, if the command was something like > > git filter-branch ...filter options... -- v1.0 master ... > > and v1.0 is an annotated tag, then it is reasonable to expect v1.0 to be > deleted if the commit it points to goes away. But if the commit did not > go away, but was rewritten, then it is

Re: git filter-branch doesn't dereference annotated tags

2013-01-02 Thread Grégory Pakosz
> I was wondering if it should be > > sha1=$(git rev-parse --verify "$ref") > > or something that does not dereference a tag at all. > > The way I read what that loop seems to want to do is: > > Read each refname that was given originally from the file > $tempdir/heads, find

Re: git filter-branch doesn't dereference annotated tags

2013-01-01 Thread Grégory Pakosz
> Yeah, but in that case it appears to me that you told the command to > rewrite the tag itself and the history behind the commit the tag > refers to, but the end result did not rewrite the tag itself and > left the tag pointing at the original history. > The problem exhibits at the point git filte

Re: git filter-branch doesn't dereference annotated tags

2013-01-01 Thread Grégory Pakosz
> Thanks. A few comments. > > At the design level. Where does this $sha1 come from in the first > place? > actually, sha1=$(git rev-parse "$ref"^0) (please remember that I'm discovering git internals while figuring out how to make git filter-branch work in my use case) in my use case, $ref is "r

git filter-branch doesn't dereference annotated tags

2012-12-31 Thread Grégory Pakosz
Please disregard the previous email that contains an incorrect fix suggestion. I wish my first contribution was flawless. Here is what's happening. git-filter-branch let git-update-ref -d verify that the value for $ref matches $sha1. However, when $ref points to an annotated tag that is being dele

git filter-branch doesn't dereference annotated tags

2012-12-31 Thread Grégory Pakosz
Hello, I noticed git-filter-branch doesn't dereference annotated tags prior to invoking git update-ref -d. Please find a patch attached that changes the call to git update-ref: -git update-ref -m "filter-branch: delete" -d "$ref" $sha1 +git update-ref -m "filter-branch: delete" -d $(git rev-pars