Hi Simon, On 12/12/2017 11:53, Simon Doodkin wrote: > > please develop a new feature, git "cp" like there is git mv > tomovefile1 tofile2 (to save space). > > there is a solution in https://stackoverflow.com/a/44036771/466363 > however, it is not single easy command. While having `git cp` alongside `git mv` would make sense, I`m afraid that is not what you are really after, nor it would help in your case. Looking at referenced "Stack Overflow" post[1], it tries to address `git blame` not following "file copy", where it does "file rename". Proposed steps seem to be "solution" from your perspective, and while that may be absolutely valid and acceptable for your specific case, I would argue it`s the wrong approach in general - because `git blame` already supports what you want (just not by default), and making three additional, unneeded and possibly confusing commits (one being a merge), just to "bend" `git blame` to fit your (out of line?) usage expectations doesn`t seem right. I would say a better direction might be using `git blame` "-C[<num>]" option[2], where desired effect is achieved without any artificial history fiddling. Example being worth more than plain words, I`m providing a script[3] that demonstrates what I`m talking about :) Regards, Buga [1] https://stackoverflow.com/a/44036771/466363 [2] https://git-scm.com/docs/git-blame#git-blame--Cltnumgt [3] Demo script showing how using (multiple) "-C" option(s), with specified numeric value, can make `git blame` provide desired information, recognizing "file copy" operation (line copy, actually, but that is what we are really interested in, using `git blame`): --- >8 --- git init echo a >A echo b >>A echo c >>A git add A git commit -m "create file A" git mv A B git commit -m "rename file A -> B" # --- # (A) regular flow cp B C git add C git commit -m "copy file B -> C" # --- # --- # (B) proposed "solution", https://stackoverflow.com/a/44036771/466363 # git mv B C # git commit -n -m "rename file B -> C" # SAVED=`git rev-parse HEAD` # git reset --hard HEAD^ # git mv B B-temp # git commit -n -m "rename file B -> B-temp" # git merge $SAVED # This will generate conflicts # git commit -a -n --no-edit # Trivially resolved like this # git mv B-temp B # git commit -n -m "rename file B-temp -> B" # --- echo echo '(1) blames B back to A, as expected:' git blame -- B # git blame shows that file B has a history (back to file A)... echo echo '(2) blames C only, missing B and A:' git blame -- C # ... while file C doesn't have a history echo echo '(3) blames C back to A, as expected:' git blame -C -C3 -- C # git blame shows that file C has a history (back to file A)
