Re: cogito - how do I ???

quoted

quoted

quoted

quoted

"TG" == Thomas Glanzmann [off-list ref] writes:

quoted

git-rev-tree MERGE_HEAD ^HEAD | git-diff-tree -v -m -s --stdin

TG> This doesn't work for me:

It should not.  "diff-tree --stdin" expects the line to begin
with an SHA1 and it either takes (1) one SHA1 followed by one
space followed by another SHA1 potentially followed by garbage
til the newline, or (2) one SHA1 potentially followed by garbage
til the newline.  rev-tree has the timestamp at the beginning
which does not match either of them.  What you are doing with
awk should work, so should this:

  git-rev-tree MH ^H | sed -e 's/^[0-9]* //' | git-diff-tree --stdin ...

Hello,

It should not.  "diff-tree --stdin" expects the line to begin
with an SHA1 and it either takes (1) one SHA1 followed by one
space followed by another SHA1 potentially followed by garbage
til the newline, or (2) one SHA1 potentially followed by garbage
til the newline.  rev-tree has the timestamp at the beginning
which does not match either of them.  What you are doing with
awk should work, so should this:

thanks for the clarification.

  git-rev-tree MH ^H | sed -e 's/^[0-9]* //' | git-diff-tree --stdin ...

This is very usefull with a 'pull only' mode.

Thanks,
	Thomas