# [PATCH/RFC] filter-branch: support skipping of commits more easily 4 messages from 2007-06-07 to 2007-06-08. Participants: Johannes Schindelin, Junio C Hamano. Thread: https://gitlist.dev/t/8493 ## Johannes Schindelin, 2007-06-07 23:59 Subject: [PATCH/RFC] filter-branch: support skipping of commits more easily Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0706080058160.4046%40racer.site ``` When commit-filter echoes just "skip", just skip that commit by mapping its object name to the same (possibly rewritten) object name(s) its parent(s) are mapped to. IOW, given A-B-C, if commit-filter says "skip" upon B, the rewritten branch will look like this: A'-C'. Signed-off-by: Johannes Schindelin --- Of course, if you think of "patchsets", this behaviour might be unexpected, since the children will still contain everything which was changed in the skipped revisions, and not changed in _them_. git-filter-branch.sh | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 9d61b7f..e6ed7b9 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -102,6 +102,9 @@ # multiple commit ids; in that case, all of them will be used # as parents instead of the original commit in further commits. # +# For the common case, that this commit should be skipped, just +# output a single "skip". +# # --tag-name-filter COMMAND:: The filter for rewriting tag names. # If this filter is passed, it will be called for every tag ref # that points to a rewritten object (or to a tag object which @@ -321,7 +324,7 @@ test $commits -eq 0 && die "Found nothing to rewrite" i=0 while read commit; do i=$(($i+1)) - printf "$commit ($i/$commits) " + printf "\rRewriting commits... ($i/$commits)" git-read-tree -i -m $commit @@ -358,8 +361,14 @@ while read commit; do sed -e '1,/^$/d' <../commit | \ eval "$filter_msg" | \ - sh -c "$filter_commit" git-commit-tree $(git-write-tree) $parentstr | \ - tee ../map/$commit + sh -c "$filter_commit" \ + git-commit-tree $(git-write-tree) $parentstr \ + > ../map/$commit + + test skip = "$(cat ../map/$commit)" && + for parent in $(get_parents $commit); do + map "$parent" + done > ../map/$commit done <../revs src_head=$(tail -n 1 ../revs) -- 1.5.2.1.2689.gaf768-dirty ``` ## Junio C Hamano, 2007-06-08 00:42 Subject: Re: [PATCH/RFC] filter-branch: support skipping of commits more easily Message-ID: <7v7iqfnuo3.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7v7iqfnuo3.fsf%40assigned-by-dhcp.cox.net In-Reply-To: ``` Johannes Schindelin writes: > When commit-filter echoes just "skip", just skip that commit by mapping > its object name to the same (possibly rewritten) object name(s) its > parent(s) are mapped to. > > IOW, given A-B-C, if commit-filter says "skip" upon B, the rewritten > branch will look like this: A'-C'. > > Signed-off-by: Johannes Schindelin > --- > > Of course, if you think of "patchsets", this behaviour might > be unexpected, since the children will still contain everything > which was changed in the skipped revisions, and not changed in > _them_. I think that is fine; in effect, by saying "skip" B, you are squashing B-C into C'. Does this mean that, given C---D---E / / A---B and if commit-filter says "skip" on D, the written history would look like this? C'------E' / / A'--B'--' The new commit E' would become an evil merge that has difference between D and E in the original history? I am not objecting; just trying to get a mental picture. ``` ## Johannes Schindelin, 2007-06-08 04:17 Subject: Re: [PATCH/RFC] filter-branch: support skipping of commits more easily Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0706080455440.4046%40racer.site In-Reply-To: <7v7iqfnuo3.fsf@assigned-by-dhcp.cox.net> ``` Hi, On Thu, 7 Jun 2007, Junio C Hamano wrote: > Johannes Schindelin writes: > > > When commit-filter echoes just "skip", just skip that commit by mapping > > its object name to the same (possibly rewritten) object name(s) its > > parent(s) are mapped to. > > > > IOW, given A-B-C, if commit-filter says "skip" upon B, the rewritten > > branch will look like this: A'-C'. > > > > Signed-off-by: Johannes Schindelin > > --- > > > > Of course, if you think of "patchsets", this behaviour might > > be unexpected, since the children will still contain everything > > which was changed in the skipped revisions, and not changed in > > _them_. > > I think that is fine; in effect, by saying "skip" B, you are > squashing B-C into C'. > > Does this mean that, given > > C---D---E > / / > A---B > > and if commit-filter says "skip" on D, the written history would > look like this? > > C'------E' > / / > A'--B'--' > > The new commit E' would become an evil merge that has difference > between D and E in the original history? > > I am not objecting; just trying to get a mental picture. Yeah, but you called it "squash" instead of "skip". So, maybe it should accept "squash" to do that operation instead? Ciao, Dscho ``` ## Junio C Hamano, 2007-06-08 06:40 Subject: Re: [PATCH/RFC] filter-branch: support skipping of commits more easily Message-ID: <7vzm3bkky2.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vzm3bkky2.fsf%40assigned-by-dhcp.cox.net In-Reply-To: ``` Johannes Schindelin writes: >> > IOW, given A-B-C, if commit-filter says "skip" upon B, the rewritten >> > branch will look like this: A'-C'. >> > >> > Signed-off-by: Johannes Schindelin >> > --- >> > >> > Of course, if you think of "patchsets", this behaviour might >> > be unexpected, since the children will still contain everything >> > which was changed in the skipped revisions, and not changed in >> > _them_. >> >> I think that is fine; in effect, by saying "skip" B, you are >> squashing B-C into C'. >> ... >> I am not objecting; just trying to get a mental picture. > > Yeah, but you called it "squash" instead of "skip". So, maybe it should > accept "squash" to do that operation instead? Skip is logically correct, but this does sound like squashing to me. ```