Git diff --name-only and copy that list
I just want to get a list of changed files between two revisions, which is simple:
git diff -–name-only commit1 commit2 > /path/to/my/file
But, what should I write, if I want copy all that listed files to another place? And I need completely identical directory structure for copied files.
For example, I have modified and added files:
/protected/texts/file1.txt
/protected/scripts/index.php
/public/pics/pic1.png
I want to have in /home/changes/
all those changed and added files:
/home/changes/protected/texts/file1.txt
/home/changes/protected/scripts/index.php
/home/changes/public/pics/pic1.png
Try the following command, which I have tested:
$ cp -pv --parents $(git diff --name-only) DESTINATION-DIRECTORY
The following should work fine:
git diff -z --name-only commit1 commit2 | xargs -0 -IREPLACE rsync -aR REPLACE /home/changes/protected/
To explain further:
The
-z
to withgit diff --name-only
means to output the list of files separated with NUL bytes instead of newlines, just in case your filenames have unusual characters in them.The
-0
toxargs
says to interpret standard input as a NUL-separated list of parameters.The
-IREPLACE
is needed since by defaultxargs
would append the parameters to the end of thersync
command. Instead, that says to put them where the laterREPLACE
is. (That's a nice tip from this Server Fault answer.)The
-a
parameter torsync
means to preserve permissions, ownership, etc. if possible. The-R
means to use the full relative path when creating the files in the destination.
Update: if you have an old version of xargs
, you'll need to use the -i
option instead of -I
. (The former is deprecated in later versions of findutils
.)