使用 git 将两个不同 branch 以差分包形式生成补丁

最新推荐文章于 2024-01-09 18:48:49 发布

sbskg

最新推荐文章于 2024-01-09 18:48:49 发布

阅读量1.8k

点赞数 1

分类专栏： git-使用笔记文章标签： markdown commit 补丁 git 差分包

本文链接：https://blog.csdn.net/sbskg/article/details/46642271

版权

git-使用笔记专栏收录该内容

1 篇文章 0 订阅

订阅专栏

使用 git 将两个不同 branch 以差分包形式生成补丁

#!/bin/bash
#  
# Usage:
# ./run_script.sh old_branch new_branch
# ./run_script.sh old_commit new_commit
# Before running the script, you must commit what you have modified.
# After the script is done, you should checkout back to the branch you use.

dt=$(date +%Y%m%d)
# SET the temp path:
FN="/home/nick/tmp/$dt"
# SET the git path:
gitpath='/home/nick/rockchip/box_4.4.2_0519/' 
if [ $# -eq 2  ];then
    cd $gitpath
    #1 find out the diff file name:
    git diff $1 $2 --name-only > $FN.txt
    #2 del last line:
    #sed -i '$d' $FN.txt
    target="/home/nick/tmp/diff_$1_$2_$dt"
    # Make the target directory:
    mkdir $target
    #3 switch to new branch:
    git checkout $2
    #4 export the new files:
    /usr/bin/rsync -rltDv --files-from=$FN.txt $gitpath $target/new
    #5 switch to old branch:
    git checkout $1
    #6 export the old files:
    /usr/bin/rsync -rltDv --files-from=$FN.txt $gitpath $target/old

    ### tar as a tar.gz file.
    tar -czPf $target/code_$1_$2_$dt.tar.gz  $target
    echo "tar ok!"; 
else 
echo "Usage:
    ./run_script.sh old_branch new_branch
    ./run_script.sh old_commit new_commit
Note:
    Before running the script, you must commit what you have modified.
    After the script is done, you should checkout back to the branch you use.
    "
fi