Did you not tell us everything because you write ... in this message
when you cited the command you used, or do you say that you used ...
literally in the command?
4. You will got the info "Found nothing to rewrite"
However, it was supposed to overwrite the history from commit 9c1580 to commit f70bf4, make the commit date same as date.
I am not sure if I am using the filter-branch correctly, or if there is a bug in git?
Anyone can help me? Thanks in advance.
Did you not tell us everything because you write ... in this message
when you cited the command you used, or do you say that you used ...
literally in the command?
The three dots is provided in the literal EXAMPLES section of the man
page. That is probably an error, as I think it is meant to be an
ellipsis to indicate 'insert other options here'.
Simply remove the three dots ('symmetric diff notation') .
Not sure what the correct change to the man page should be, but clearly
it has caused confusion. It also takes a moment to properly realise
which commits the two dot notation will refer to in the example which
may further compound the confusion about the three dots.
Philip
quoted
4. You will got the info "Found nothing to rewrite"
However, it was supposed to overwrite the history from commit 9c1580 to commit f70bf4, make the commit date same as date.
I am not sure if I am using the filter-branch correctly, or if there is a bug in git?
Anyone can help me? Thanks in advance.
-----Original Message-----
From: Philip Oakley <redacted>
Sent: Tuesday, May 28, 2019 4:23 AM
To: Johannes Sixt <redacted>; LU Chuck <redacted>
Cc: git@vger.kernel.org; chuck.lu@qq.com
Subject: Re: git filter-branch re-write history over a range of commits did notwork
Hi Chuck,
On 27/05/2019 19:21, Johannes Sixt wrote:
2. checkout to the temp branch
3. run the command git filter-branch --env-filter 'export
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"' ... 67d9d9..f70bf4
Did you not tell us everything because you write ... in this message
when you cited the command you used, or do you say that you used ...
literally in the command?
The three dots is provided in the literal EXAMPLES section of the man page. That is
probably an error, as I think it is meant to be an ellipsis to indicate 'insert other
options here'.
Simply remove the three dots ('symmetric diff notation') .
Not sure what the correct change to the man page should be, but clearly it has
caused confusion. It also takes a moment to properly realise which commits the
two dot notation will refer to in the example which may further compound the
confusion about the three dots.
Philip
[LU Chuck] Hi Hannes,
I used ... literally when I cited the command. I write the command with ... directly as the document introduce the usage like that.
You can check the document https://git-scm.com/docs/git-filter-branch#_examples about the --env-filter section.
Hi Philip,
I also tried to execute the command without ...,
git filter-branch --env-filter 'export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"' 67d9d9..f70bf4
then I will get another error " You must specify a ref to rewrite."
Hi team
I have five commits A,B,C,D,E with commit id as following:
A(67d9d9)<--B(9c1580)<--C(2eec4d)<--D(a45995)<--E(f70bf4)
The commits B,C,D,E 's commiter date and author date are not the same. I want to use filter-branch command to make the commiter date same as the author date.
I am using the following command to achieve re-write history:
git filter-branch --env-filter 'export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"' ... A..E
However the command did not work.
quoted
quoted
4. You will got the info "Found nothing to rewrite"
However, it was supposed to overwrite the history from commit 9c1580
to commit f70bf4, make the commit date same as date.
quoted
quoted
I am not sure if I am using the filter-branch correctly, or if there is a bug in
From: Johannes Sixt <hidden> Date: 2019-05-28 06:23:16
Am 28.05.19 um 07:42 schrieb LU Chuck:
quoted
From: Philip Oakley <redacted>
The three dots is provided in the literal EXAMPLES section of the man page. That is
probably an error, as I think it is meant to be an ellipsis to indicate 'insert other
options here'.
Simply remove the three dots ('symmetric diff notation') .
Not sure what the correct change to the man page should be, but clearly it has
caused confusion. It also takes a moment to properly realise which commits the
two dot notation will refer to in the example which may further compound the
confusion about the three dots.
Philip
[LU Chuck] Hi Hannes,
I used ... literally when I cited the command. I write the command with ... directly as the document introduce the usage like that.
You can check the document https://git-scm.com/docs/git-filter-branch#_examples about the --env-filter section.
Copying and pasting examples literally is dangerous. You should know
what you are doing.
"..." is a revision range that computes the mergebase between HEAD and
HEAD, which is (surprise!) HEAD, and then includes the two end points,
but excludes everything below the mergebase. So, the revision
specification that your command ends up with is
HEAD HEAD ^HEAD ^67d9d9 f70bf4
Which is empty if f70bf4 is an ancestor of HEAD.
Hi Philip,
I also tried to execute the command without ...,
git filter-branch --env-filter 'export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"' 67d9d9..f70bf4
then I will get another error " You must specify a ref to rewrite."
You cannot restrict your filter to a subset of commits like this. After
all, all commits that descend from one of the rewritten commits must
also change, up to and including to the branch refs. Therefore, it is
necessary to mention the branches that you rewrite in this manner.
Perhaps:
git filter-branch --env-filter '
if git merge-base --is-ancestor $GIT_COMMIT f70bf4; then
export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
fi' -- 67d9d9..master
This assumes that only branch master is affected by the rewriting. Use
--all if you have many affected branches.
-- Hannes
-----Original Message-----
From: Johannes Sixt <redacted>
Sent: Tuesday, May 28, 2019 2:23 PM
To: LU Chuck <redacted>
Cc: Philip Oakley <redacted>; git@vger.kernel.org; chuck.lu@qq.com
Subject: Re: git filter-branch re-write history over a range of commits did notwork
Am 28.05.19 um 07:42 schrieb LU Chuck:
quoted
quoted
From: Philip Oakley <redacted> The three dots is provided
in the literal EXAMPLES section of the man page. That is probably an
error, as I think it is meant to be an ellipsis to indicate 'insert
other options here'.
Simply remove the three dots ('symmetric diff notation') .
Not sure what the correct change to the man page should be, but
clearly it has caused confusion. It also takes a moment to properly
realise which commits the two dot notation will refer to in the
example which may further compound the confusion about the three dots.
Philip
[LU Chuck] Hi Hannes,
I used ... literally when I cited the command. I write the command
with ... directly as the document introduce the usage like that.
quoted
You can check the document
https://urldefense.proofpoint.com/v2/url?u=https-3A__git-2Dscm.com_docs_git
-2Dfilter-2Dbranch-23-5Fexamples&d=DwICaQ&c=O17m6UdqOAIZh9XQ8pTl4g&
r=VcGeIeOZ_8_zlrQNSboenYltfxGNIXN_qG6VpZgXVRk&m=VuNdOzceo68ZUnKOA
cEPKJcWJGVbj9rVx7mqEMBkF9s&s=fwT_YsHVIcZLkZkXcwN0XzEfYZuZVvkThSM-
V_o2na8&e= about the --env-filter section.
Copying and pasting examples literally is dangerous. You should know what you
are doing.
"..." is a revision range that computes the mergebase between HEAD and HEAD,
which is (surprise!) HEAD, and then includes the two end points, but excludes
everything below the mergebase. So, the revision specification that your
command ends up with is
HEAD HEAD ^HEAD ^67d9d9 f70bf4
Which is empty if f70bf4 is an ancestor of HEAD.
[LU Chuck] Sorry, I can't understand this part, did you have an documentation about the explanation for ...?
"computes the mergebase between HEAD and HEAD" I have no idea about this. And you also talked about mergebase, but in my situation, there is only one branch with 5 commits. I did not have a mergebase.
You can check the detail description below.
quoted
Hi Philip,
I also tried to execute the command without ...,
git filter-branch --env-filter 'export
then I will get another error " You must specify a ref to rewrite."
You cannot restrict your filter to a subset of commits like this. After all, all commits
that descend from one of the rewritten commits must also change, up to and
including to the branch refs. Therefore, it is necessary to mention the branches
that you rewrite in this manner.
Perhaps:
git filter-branch --env-filter '
if git merge-base --is-ancestor $GIT_COMMIT f70bf4; then
export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
fi' -- 67d9d9..master
This assumes that only branch master is affected by the rewriting. Use --all if you
have many affected branches.
[LU Chuck] Hi Hannes,
I have tried with the command you provided, what I got is
Rewrite 31cd5ef6f068c46222fe185870c09c959dd7113e (7/7) (6 seconds passed, remaining 0 predicted)
WARNING: Ref 'refs/heads/master' is unchanged
I am wondering why I got this warning, what I did have nothing to do with master branch.
I am not on branch master. My current branch is temp and HEAD point to temp branch, and temp point to commit f70bf4.
Actually you can clone the repository https://github.com/chucklu/LeetCode and git checkout -b temp origin/temp. Then do a simple test.
My purpose is as I mentioned in last email,
I have five commits A,B,C,D,E with commit id as following:
A(67d9d9)<--B(9c1580)<--C(2eec4d)<--D(a45995)<--E(f70bf4)
The temp branch point to commit E(f70bf4) and the HEAD point to temp branch.
The commits B,C,D,E 's commiter date and author date are not the same. I want to use filter-branch command to make the commiter date same as the author date.
From: Philip Oakley <hidden> Date: 2019-05-28 09:33:37
Hi Chuck,
On 28/05/2019 08:10, LU Chuck wrote:
[snip]
quoted
Copying and pasting examples literally is dangerous. You should know what you
are doing.
"..." is a revision range that computes the mergebase between HEAD and HEAD,
which is (surprise!) HEAD, and then includes the two end points, but excludes
everything below the mergebase. So, the revision specification that your
command ends up with is
HEAD HEAD ^HEAD ^67d9d9 f70bf4
Which is empty if f70bf4 is an ancestor of HEAD.
[LU Chuck] Sorry, I can't understand this part, did you have an documentation about the explanation for ...?
"computes the mergebase between HEAD and HEAD" I have no idea about this. And you also talked about mergebase, but in my situation, there is only one branch with 5 commits. I did not have a mergebase.
You can check the detail description below.
When there is no specific revisions around the three dots then HEAD is
assumed (to save typing)
[snipping the comments on the alternate script]
-----Original Message-----
From: Philip Oakley <redacted>
Sent: Tuesday, May 28, 2019 5:34 PM
To: LU Chuck <redacted>; Johannes Sixt <redacted>
Cc: git@vger.kernel.org; chuck.lu@qq.com
Subject: Re: git filter-branch re-write history over a range of commits did notwork
Hi Chuck,
On 28/05/2019 08:10, LU Chuck wrote:
[snip]
quoted
quoted
Copying and pasting examples literally is dangerous. You should know
what you are doing.
"..." is a revision range that computes the mergebase between HEAD
and HEAD, which is (surprise!) HEAD, and then includes the two end
points, but excludes everything below the mergebase. So, the revision
specification that your command ends up with is
HEAD HEAD ^HEAD ^67d9d9 f70bf4
Which is empty if f70bf4 is an ancestor of HEAD.
[LU Chuck] Sorry, I can't understand this part, did you have an documentation
about the explanation for ...?
https://urldefense.proofpoint.com/v2/url?u=https-3A__git-2Dscm.com_docs_git
revisions-23Documentation_gitrevisions.txt-2DTheem82308203emthree-2DdotS
ymmetricDifferenceNotation&d=DwICaQ&c=O17m6UdqOAIZh9XQ8pTl4g&r=VcG
eIeOZ_8_zlrQNSboenYltfxGNIXN_qG6VpZgXVRk&m=_rDozHXubCFkEsfhMr2QlaP
n-h_Khfqa3RG0cNmrSxo&s=qdyaJNy6nkAe-4ufeS4o1NdvgoqQQhZDmDjmjQK9k
Ro&e=
[LU Chuck] Thanks for your documentation about the explanation. Previously I read another documentation https://git-scm.com/book/en/v2/Git-Tools-Revision-Selection#Commit-Ranges.
It's weird the three dots has two different explanation, maybe there should a place to collect these two explanation for three dots.
quoted
"computes the mergebase between HEAD and HEAD" I have no idea
about this. And you also talked about mergebase, but in my situation, there is only
one branch with 5 commits. I did not have a mergebase.
quoted
You can check the detail description below.
When there is no specific revisions around the three dots then HEAD is assumed
(to save typing)
[LU Chuck] I got you here, that's why you ask me remove the three dots before, right?
From: Johannes Schindelin <hidden> Date: 2019-05-28 09:58:05
Hi,
On Tue, 28 May 2019, Philip Oakley wrote:
On 28/05/2019 08:10, LU Chuck wrote:
[snip]
quoted
quoted
Copying and pasting examples literally is dangerous. You should know what
you
are doing.
"..." is a revision range that computes the mergebase between HEAD and
HEAD,
which is (surprise!) HEAD, and then includes the two end points, but
excludes
everything below the mergebase. So, the revision specification that your
command ends up with is
HEAD HEAD ^HEAD ^67d9d9 f70bf4
Which is empty if f70bf4 is an ancestor of HEAD.
[LU Chuck] Sorry, I can't understand this part, did you have an
documentation about the explanation for ...?
"computes the mergebase between HEAD and HEAD" I have no idea
about this. And you also talked about mergebase, but in my
situation, there is only one branch with 5 commits. I did not have
a mergebase.
You can check the detail description below.
When there is no specific revisions around the three dots then HEAD is assumed
(to save typing)
From
https://git-scm.com/docs/gitrevisions#Documentation/gitrevisions.txt-Theem82308203emthree-dotSymmetricDifferenceNotation:
The ... (three-dot) Symmetric Difference Notation
A similar notation r1...r2 is called symmetric difference of r1
and r2 and is defined as r1 r2 --not $(git merge-base --all r1
r2). It is the set of commits that are reachable from either one
of r1 (left side) or r2 (right side) but not from both.
Most importantly, the next paragraph states:
In these two shorthand notations, you can omit one end and let it
default to HEAD.
What it does *not* say is that you can leave out both ends, in which case
it becomes the non-sensical short form of `HEAD...HEAD`, as Hannes pointed
out.
Ciao,
Johannes
-----Original Message-----
From: Johannes Sixt <redacted>
Sent: Tuesday, May 28, 2019 2:22 AM
To: LU Chuck <redacted>
Cc: git@vger.kernel.org; chuck.lu@qq.com
Subject: Re: git filter-branch re-write history over a range of commits did notwork
Am 27.05.19 um 10:01 schrieb LU Chuck:
2. checkout to the temp branch
3. run the command git filter-branch --env-filter 'export
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"' ... 67d9d9..f70bf4
Did you not tell us everything because you write ... in this message when you cited
the command you used, or do you say that you used ...
literally in the command?
[LU Chuck] Let's move back here, I know what three dots does now. According this documentation https://git-scm.com/docs/gitrevisions#Documentation/gitrevisions.txt-Theem82308203emthree-dotSymmetricDifferenceNotation .
Then the command I need to run is git filter-branch --env-filter 'export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"' 67d9d9..f70bf4
But why I got the error message " You must specify a ref to rewrite. ".
When I use command " git log 67d9d9..f70bf4 ", it will list 4 commits. It means the commits range works.
So, the problem would be, why the git filter-branch could not recognized 67d9d9..f70bf4 as a range of commits?
quoted
4. You will got the info "Found nothing to rewrite"
However, it was supposed to overwrite the history from commit 9c1580 to
commit f70bf4, make the commit date same as date.
quoted
I am not sure if I am using the filter-branch correctly, or if there is a bug in
-----Original Message-----
From: Johannes Sixt <redacted>
Sent: Tuesday, May 28, 2019 2:22 AM
To: LU Chuck <redacted>
Cc: git@vger.kernel.org; chuck.lu@qq.com
Subject: Re: git filter-branch re-write history over a range of commits did notwork
Am 27.05.19 um 10:01 schrieb LU Chuck:
2. checkout to the temp branch
3. run the command git filter-branch --env-filter 'export
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"' ... 67d9d9..f70bf4
Did you not tell us everything because you write ... in this message when you cited
the command you used, or do you say that you used ...
literally in the command?
[LU Chuck] I find the git filter-branch can't recognize commits range commitA..commitB,
it can only recognize branchA..branchB. (branchA point to commitA, branchB point to commitB.)
And you are right, I need remove the useless ... .
So I fixed the previous command as following:
Create a new branch temp2 point to 67d9d9 and switch to temp branch(point to f70bf4), then it works.
git filter-branch --env-filter 'export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"' temp2..temp
By the way, who can improve the documentation on https://git-scm.com/docs/git-filter-branch? Currently the demo using git filter-branch with commits range commitA..commitB.
Or anyone can make it possible to support the commit range by commitA..commitB?
quoted
4. You will got the info "Found nothing to rewrite"
However, it was supposed to overwrite the history from commit 9c1580 to
commit f70bf4, make the commit date same as date.
quoted
I am not sure if I am using the filter-branch correctly, or if there is a bug in