fix(git-cp): keep the history of the files #988
Conversation
bin/git-cp
Outdated
|
|
||
| # We keep the existing file on the side in a commit | ||
| git mv "${CURRENT_FILENAME}" "${INTERMEDIATE_FILENAME}" | ||
| git commit -a -nm "Keep $CURRENT_FILENAME" |
There was a problem hiding this comment.
Why do we need to use -a after git mv?
There was a problem hiding this comment.
It is the test to avoid interruption because the original implementation was interrupted by conflict always. At first, it confused me and I thought something missing maybe, so the option -a was added. The option -a is useless for the current implementation and I forget to remove it. Fixed already.
vanpipy
force-pushed
the
feature/fix-git-cp-did-not-keep-history
branch
from
0d721fa to
6e6f59b
Compare
spacewander
left a comment
spacewander
left a comment
There was a problem hiding this comment.
I tried the PR and found out it will create multiple commits for a cp operation? The previous version only created one.
Keeping only one commit will overwrite the history always and I did not find a better way to keep the history and only one commit. But i think keeping the history of the file is meaningful. That is the reason the PR comes out. If the history did not keep anymore, the document of the |
spacewander
left a comment
spacewander
left a comment
There was a problem hiding this comment.
I run git cp AUTHORS AUTHORS.txt with the new git-cp, but the AUTHORS.txt doesn't have the same history as AUTHORS.
I tried and had seen the history, but there is one difference - one more column
The git version I used is 2.25.1 |
Ah, it is my mistake. |
2 participants
fix #985
The implement 91b3e47 gives a great idea to show the way to reach the goal. I just renew the way to show it clearly.