當使用 Git 存儲庫時，這六個 Bash 腳本將使你的生活更輕鬆。-- Bob Peterson（作者）

我編寫了許多 Bash 腳本，這些腳本使我在使用 Git 存儲庫時工作更加輕鬆。我的許多同事說沒有必要：我所做的一切都可以用 Git 命令完成。雖然這可能是正確的，但我發現腳本遠比嘗試找出適當的 Git 命令來執行我想要的操作更加方便。

1、gitlog

gitlog 打印針對 master 分支的當前補丁的簡短列表。它從最舊到最新打印它們，並顯示作者和描述，其中 H 代表 HEAD，^ 代表 HEAD^，2 代表 HEAD~2，依此類推。例如：

<code>$ gitlog
-----------------------[ recovery25 ]-----------------------
(snip)
11 340d27a33895 Bob Peterson gfs2: drain the ail2 list after io errors
10 9b3c4e6efb10 Bob Peterson gfs2: clean up iopen glock mess in gfs2_create_inode
 9 d2e8c22be39b Bob Peterson gfs2: Do proper error checking for go_sync family of glops
 8 9563e31f8bfd Christoph Hellwig gfs2: use page_offset in gfs2_page_mkwrite
 7 ebac7a38036c Christoph Hellwig gfs2: don't use buffer_heads in gfs2_allocate_page_backing
 6 f703a3c27874 Andreas Gruenbacher gfs2: Improve mmap write vs. punch_hole consistency
 5 a3e86d2ef30e Andreas Gruenbacher gfs2: Multi-block allocations in gfs2_page_mkwrite
 4 da3c604755b0 Andreas Gruenbacher gfs2: Fix end-of-file handling in gfs2_page_mkwrite
 3 4525c2f5b46f Bob Peterson Rafael Aquini's slab instrumentation
 2 a06a5b7dea02 Bob Peterson GFS2: Add go_get_holdtime to gl_ops
 ^ 8ba93c796d5c Bob Peterson gfs2: introduce new function remaining_hold_time and use it in dq
 H e8b5ff851bb9 Bob Peterson gfs2: Allow rgrps to have a minimum hold time/<code>

如果我想查看其他分支上有哪些補丁，可以指定一個替代分支：

<code>$ gitlog recovery24/<code>

2、gitlog.id

gitlog.id 只是打印出補丁的 SHA1 ID：

<code>$ gitlog.id
-----------------------[ recovery25 ]-----------------------
56908eeb6940 2ca4a6b628a1 fc64ad5d99fe 02031a00a251 f6f38da7dd18 d8546e8f0023 fc3cc1f98f6b 12c3e0cb3523 76cce178b134 6fc1dce3ab9c 1b681ab074ca 26fed8de719b 802ff51a5670 49f67a512d8c f04f20193bbb 5f6afe809d23 2030521dc70e dada79b3be94 9b19a1e08161 78a035041d3e f03da011cae2 0d2b2e068fcd 2449976aa133 57dfb5e12ccd 53abedfdcf72 6fbdda3474b3 49544a547188 187032f7a63c 6f75dae23d93 95fc2a261b00 ebfb14ded191 f653ee9e414a 0e2911cb8111 73968b76e2e3 8a3e4cb5e92c a5f2da803b5b 7c9ef68388ed 71ca19d0cba8 340d27a33895 9b3c4e6efb10 d2e8c22be39b 9563e31f8bfd ebac7a38036c f703a3c27874 a3e86d2ef30e da3c604755b0 4525c2f5b46f a06a5b7dea02 8ba93c796d5c e8b5ff851bb9/<code>

同樣，它假定是當前分支，但是如果需要，我可以指定其他分支。

3、gitlog.id2

gitlog.id2 與 gitlog.id 相同，但頂部沒有顯示分支的行。這對於從一個分支挑選所有補丁到當前分支很方便：

<code>$ # 創建一個新分支
$ git branch --track origin/master
$ # 檢出剛剛創建的新分支
$ git checkout recovery26
$ # 從舊的分支挑選所有補丁到新分支
$ for i in `gitlog.id2 recovery25` ; do git cherry-pick $i ;done/<code>

4、gitlog.grep

gitlog.grep 會在該補丁集合中尋找一個字符串。例如，如果我發現一個錯誤並想修復引用了函數 inode_go_sync 的補丁，我可以簡單地執行以下操作：

<code>$ gitlog.grep inode_go_sync
-----------------------[ recovery25 - 50 patches ]-----------------------
(snip)
11 340d27a33895 Bob Peterson gfs2: drain the ail2 list after io errors
10 9b3c4e6efb10 Bob Peterson gfs2: clean up iopen glock mess in gfs2_create_inode
 9 d2e8c22be39b Bob Peterson gfs2: Do proper error checking for go_sync family of glops 

152:-static void inode_go_sync(struct gfs2_glock *gl)
153:+static int inode_go_sync(struct gfs2_glock *gl)
163:@@ -296,6 +302,7 @@ static void inode_go_sync(struct gfs2_glock *gl)
 8 9563e31f8bfd Christoph Hellwig gfs2: use page_offset in gfs2_page_mkwrite
 7 ebac7a38036c Christoph Hellwig gfs2: don't use buffer_heads in gfs2_allocate_page_backing
 6 f703a3c27874 Andreas Gruenbacher gfs2: Improve mmap write vs. punch_hole consistency
 5 a3e86d2ef30e Andreas Gruenbacher gfs2: Multi-block allocations in gfs2_page_mkwrite
 4 da3c604755b0 Andreas Gruenbacher gfs2: Fix end-of-file handling in gfs2_page_mkwrite
 3 4525c2f5b46f Bob Peterson Rafael Aquini's slab instrumentation
 2 a06a5b7dea02 Bob Peterson GFS2: Add go_get_holdtime to gl_ops
 ^ 8ba93c796d5c Bob Peterson gfs2: introduce new function remaining_hold_time and use it in dq
 H e8b5ff851bb9 Bob Peterson gfs2: Allow rgrps to have a minimum hold time/<code>

因此，現在我知道補丁 HEAD~9 是需要修復的補丁。我使用 git rebase -i HEAD~10 編輯補丁 9，git commit -a --amend，然後 git rebase --continue 以進行必要的調整。

5、gitbranchcmp3

gitbranchcmp3 使我可以將當前分支與另一個分支進行比較，因此我可以將較舊版本的補丁與我的較新版本進行比較，並快速查看已更改和未更改的內容。它生成一個比較腳本（使用了 KDE 工具 Kompare ，該工具也可在 GNOME3 上使用）以比較不太相同的補丁。如果除行號外沒有其他差異，則打印 [SAME]。如果僅存在註釋差異，則打印 [same]（小寫）。例如：

<code>$ gitbranchcmp3 recovery24
Branch recovery24 has 47 patches
Branch recovery25 has 50 patches

(snip)
38 87eb6901607a 340d27a33895 [same] gfs2: drain the ail2 list after io errors
39 90fefb577a26 9b3c4e6efb10 [same] gfs2: clean up iopen glock mess in gfs2_create_inode
40 ba3ae06b8b0e d2e8c22be39b [same] gfs2: Do proper error checking for go_sync family of glops
41 2ab662294329 9563e31f8bfd [SAME] gfs2: use page_offset in gfs2_page_mkwrite
42 0adc6d817b7a ebac7a38036c [SAME] gfs2: don't use buffer_heads in gfs2_allocate_page_backing
43 55ef1f8d0be8 f703a3c27874 [SAME] gfs2: Improve mmap write vs. punch_hole consistency
44 de57c2f72570 a3e86d2ef30e [SAME] gfs2: Multi-block allocations in gfs2_page_mkwrite
45 7c5305fbd68a da3c604755b0 [SAME] gfs2: Fix end-of-file handling in gfs2_page_mkwrite
46 162524005151 4525c2f5b46f [SAME] Rafael Aquini's slab instrumentation 

47a06a5b7dea02 [] GFS2: Add go_get_holdtime to gl_ops
488ba93c796d5c [] gfs2: introduce new function remaining_hold_time and use it in dq
49e8b5ff851bb9 [] gfs2: Allow rgrps to have a minimum hold time

Missing from recovery25:
The missing:
Compare>

6、gitlog.find

最後，我有一個 gitlog.find 腳本，可以幫助我識別補丁程序的上游版本在哪裡以及每個補丁的當前狀態。它通過匹配補丁說明來實現。它還會生成一個比較腳本（再次使用了 Kompare），以將當前補丁與上游對應補丁進行比較：

<code>$ gitlog.find
-----------------------[ recovery25 - 50 patches ]-----------------------
(snip)
11 340d27a33895 Bob Peterson gfs2: drain the ail2 list after io errors
lo 5bcb9be74b2a Bob Peterson gfs2: drain the ail2 list after io errors
10 9b3c4e6efb10 Bob Peterson gfs2: clean up iopen glock mess in gfs2_create_inode
fn 2c47c1be51fb Bob Peterson gfs2: clean up iopen glock mess in gfs2_create_inode
 9 d2e8c22be39b Bob Peterson gfs2: Do proper error checking for go_sync family of glops
lo feb7ea639472 Bob Peterson gfs2: Do proper error checking for go_sync family of glops
 8 9563e31f8bfd Christoph Hellwig gfs2: use page_offset in gfs2_page_mkwrite
ms f3915f83e84c Christoph Hellwig gfs2: use page_offset in gfs2_page_mkwrite
 7 ebac7a38036c Christoph Hellwig gfs2: don't use buffer_heads in gfs2_allocate_page_backing
ms 35af80aef99b Christoph Hellwig gfs2: don't use buffer_heads in gfs2_allocate_page_backing
 6 f703a3c27874 Andreas Gruenbacher gfs2: Improve mmap write vs. punch_hole consistency
fn 39c3a948ecf6 Andreas Gruenbacher gfs2: Improve mmap write vs. punch_hole consistency
 5 a3e86d2ef30e Andreas Gruenbacher gfs2: Multi-block allocations in gfs2_page_mkwrite
fn f53056c43063 Andreas Gruenbacher gfs2: Multi-block allocations in gfs2_page_mkwrite
 4 da3c604755b0 Andreas Gruenbacher gfs2: Fix end-of-file handling in gfs2_page_mkwrite
fn 184b4e60853d Andreas Gruenbacher gfs2: Fix end-of-file handling in gfs2_page_mkwrite
 3 4525c2f5b46f Bob Peterson Rafael Aquini's slab instrumentation
 Not found upstream
 2 a06a5b7dea02 Bob Peterson GFS2: Add go_get_holdtime to gl_ops
 Not found upstream
 ^ 8ba93c796d5c Bob Peterson gfs2: introduce new function remaining_hold_time and use it in dq
 Not found upstream
 H e8b5ff851bb9 Bob Peterson gfs2: Allow rgrps to have a minimum hold time
 Not found upstream
Compare>

補丁顯示為兩行，第一行是你當前的修補程序，然後是相應的上游補丁，以及 2 個字符的縮寫，以指示其上游狀態：

• lo 表示補丁僅在本地（local）上游 Git 存儲庫中（即尚未推送到上游）。
• ms 表示補丁位於 Linus Torvald 的主（master）分支中。
• fn 意味著補丁被推送到我的 “for-next” 開發分支，用於下一個上游合併窗口。 我的一些腳本根據我通常使用 Git 的方式做出假設。例如，當搜索上游補丁時，它使用我眾所周知的 Git 樹的位置。因此，你需要調整或改進它們以適合你的條件。gitlog.find 腳本旨在僅定位 GFS2 和 DLM 補丁，因此，除非你是 GFS2 開發人員，否則你需要針對你感興趣的組件對其進行自定義。

源代碼

以下是這些腳本的源代碼。

1、gitlog

<code>#!/bin/bash
branch=$1

if test "x$branch" = x; then
branch=`git branch -a | grep "*" | cut -d ' ' -f2`
fi

patches=0
tracking=`git rev-parse --abbrev-ref --symbolic-full-name @{u}` 


LIST=`git log --reverse --abbrev-commit --pretty=oneline $tracking..$branch | cut -d ' ' -f1 |paste -s -d ' '`
for i in $LIST; do patches=$(echo $patches + 1 | bc);done

if [[ $branch =~ .*for-next.* ]]
then
start=HEAD
#start=origin/for-next
else
start=origin/master
fi

tracking=`git rev-parse --abbrev-ref --symbolic-full-name @{u}`

/usr/bin/echo "-----------------------[" $branch "]-----------------------"
patches=$(echo $patches - 1 | bc);
for i in $LIST; do
if [ $patches -eq 1 ]; then
cnt=" ^"
elif [ $patches -eq 0 ]; then
cnt=" H"
else
if [ $patches -lt 10 ]; then
cnt=" $patches"
else
cnt="$patches"
fi
fi
/usr/bin/git show --abbrev-commit -s --pretty=format:"$cnt %h %patches=$(echo $patches - 1 | bc)
done
#git log --reverse --abbrev-commit --pretty=format:"%h %#git log --reverse --abbrev-commit --pretty=format:"%h %/<code>

2、gitlog.id

<code>#!/bin/bash
branch=$1

if test "x$branch" = x; then
branch=`git branch -a | grep "*" | cut -d ' ' -f2`
fi

tracking=`git rev-parse --abbrev-ref --symbolic-full-name @{u}`

/usr/bin/echo "-----------------------[" $branch "]-----------------------"
git log --reverse --abbrev-commit --pretty=oneline $tracking..$branch | cut -d ' ' -f1 |paste -s -d ' '/<code>

3、gitlog.id2

<code>#!/bin/bash
branch=$1 


if test "x$branch" = x; then
branch=`git branch -a | grep "*" | cut -d ' ' -f2`
fi

tracking=`git rev-parse --abbrev-ref --symbolic-full-name @{u}`
git log --reverse --abbrev-commit --pretty=oneline $tracking..$branch | cut -d ' ' -f1 |paste -s -d ' '/<code>

4、gitlog.grep

<code>#!/bin/bash
param1=$1
param2=$2

if test "x$param2" = x; then
branch=`git branch -a | grep "*" | cut -d ' ' -f2`
string=$param1
else
branch=$param1
string=$param2
fi

patches=0
tracking=`git rev-parse --abbrev-ref --symbolic-full-name @{u}`

LIST=`git log --reverse --abbrev-commit --pretty=oneline $tracking..$branch | cut -d ' ' -f1 |paste -s -d ' '`
for i in $LIST; do patches=$(echo $patches + 1 | bc);done
/usr/bin/echo "-----------------------[" $branch "-" $patches "patches ]-----------------------"
patches=$(echo $patches - 1 | bc);
for i in $LIST; do
if [ $patches -eq 1 ]; then
cnt=" ^"
elif [ $patches -eq 0 ]; then
cnt=" H"
else
if [ $patches -lt 10 ]; then
cnt=" $patches"
else
cnt="$patches"
fi
fi
/usr/bin/git show --abbrev-commit -s --pretty=format:"$cnt %h %/usr/bin/git show --pretty=email --patch-with-stat $i | grep -n "$string"
patches=$(echo $patches - 1 | bc)
done/<code>

5、gitbranchcmp3

<code>#!/bin/bash
#
# gitbranchcmp3  
 []
#
oldbranch=$1
newbranch=$2
script=/tmp/compare_mismatches.sh

/usr/bin/rm -f $script
echo "#!/bin/bash" > $script
/usr/bin/chmod 755 $script
echo "# Generated by gitbranchcmp3.sh" >> $script
echo "# Run this/>echo " " >> $script
echo "function compare_them()" >> $script
echo "{">> $script
echo "git show --pretty=email --patch-with-stat \\$1 > /tmp/gronk1" >> $script
echo "git show --pretty=email --patch-with-stat \\$2 > /tmp/gronk2" >> $script
echo "kompare /tmp/gronk1 /tmp/gronk2" >> $script
echo "}" >> $script
echo " " >> $script

if test "x$newbranch" = x; then
newbranch=`git branch -a | grep "*" | cut -d ' ' -f2`
fi

tracking=`git rev-parse --abbrev-ref --symbolic-full-name @{u}`

declare -a oldsha1s=(`git log --reverse --abbrev-commit --pretty=oneline $tracking..$oldbranch | cut -d ' ' -f1 |paste -s -d ' '`)
declare -a newsha1s=(`git log --reverse --abbrev-commit --pretty=oneline $tracking..$newbranch | cut -d ' ' -f1 |paste -s -d ' '`)

#echo "old: " $oldsha1s
oldcount=${#oldsha1s[@]}
echo "Branch $oldbranch has $oldcount patches"
oldcount=$(echo $oldcount - 1 | bc)
#for o in `seq 0 ${#oldsha1s[@]}`; do
#echo -n ${oldsha1s[$o]} " "
#desc=`git show $i | head -5 | tail -1|cut -b5-`
#done

#echo "new: " $newsha1s
newcount=${#newsha1s[@]}
echo "Branch $newbranch has $newcount patches"
newcount=$(echo $newcount - 1 | bc)
#for o in `seq 0 ${#newsha1s[@]}`; do
#echo -n ${newsha1s[$o]} " "
#desc=`git show $i | head -5 | tail -1|cut -b5-`
#done
echo

for new in `seq 0 $newcount`; do
newsha=${newsha1s[$new]} 

newdesc=`git show $newsha | head -5 | tail -1|cut -b5-`
oldsha=""
same="[]"
for old in `seq 0 $oldcount`; do
if test "${oldsha1s[$old]}" = "match"; then
continue;
fi
olddesc=`git show ${oldsha1s[$old]} | head -5 | tail -1|cut -b5-`
if test "$olddesc" = "$newdesc" ; then
oldsha=${oldsha1s[$old]}
#echo $oldsha
git show $oldsha |tail -n +2 |grep -v "index.*\\.\\." |grep -v "@@" > /tmp/gronk1
git show $newsha |tail -n +2 |grep -v "index.*\\.\\." |grep -v "@@"> /tmp/gronk2
diff /tmp/gronk1 /tmp/gronk2 &> /dev/null
if [ $? -eq 0 ] ;then
# No differences
same="[SAME]"
oldsha1s[$old]="match"
break
fi
git show $oldsha |sed -n '/diff/,$p' |grep -v "index.*\\.\\." |grep -v "@@" > /tmp/gronk1
git show $newsha |sed -n '/diff/,$p' |grep -v "index.*\\.\\." |grep -v "@@" > /tmp/gronk2
diff /tmp/gronk1 /tmp/gronk2 &> /dev/null
if [ $? -eq 0 ] ;then
# Differences in comments only
same="[same]"
oldsha1s[$old]="match"
break
fi
oldsha1s[$old]="match"
echo "compare_them $oldsha $newsha" >> $script
fi
done
echo "$new $oldsha $newsha $same $newdesc"
done

echo
echo "Missing from $newbranch:"
the_missing=""
# Now run through the olds we haven't matched up
for old in `seq 0 $oldcount`; do
if test ${oldsha1s[$old]} != "match"; then
olddesc=`git show ${oldsha1s[$old]} | head -5 | tail -1|cut -b5-`
echo "${oldsha1s[$old]} $olddesc"
the_missing=`echo "$the_missing ${oldsha1s[$old]}"`
fi
done

echo "The missing: " $the_missing
echo "Compare/>#git log --reverse --abbrev-commit --pretty=oneline $tracking..$branch | cut -d ' ' -f1 |paste -s -d ' ' 
/<code>

6、gitlog.find

<code>#!/bin/bash
#
# Find the upstream equivalent patch
#
# gitlog.find
#
cwd=$PWD
param1=$1
ubranch=$2
patches=0
script=/tmp/compare_upstream.sh
echo "#!/bin/bash" > $script
/usr/bin/chmod 755 $script
echo "# Generated by gitbranchcmp3.sh" >> $script
echo "# Run this/>echo " " >> $script
echo "function compare_them()" >> $script
echo "{">> $script
echo "cwd=$PWD" >> $script
echo "git show --pretty=email --patch-with-stat \\$2 > /tmp/gronk2" >> $script
echo "cd ~/linux.git/fs/gfs2" >> $script
echo "git show --pretty=email --patch-with-stat \\$1 > /tmp/gronk1" >> $script
echo "cd $cwd" >> $script
echo "kompare /tmp/gronk1 /tmp/gronk2" >> $script
echo "}" >> $script
echo " " >> $script

#echo "Gathering upstream patch info. Please wait."
branch=`git branch -a | grep "*" | cut -d ' ' -f2`
tracking=`git rev-parse --abbrev-ref --symbolic-full-name @{u}`

cd ~/linux.git
if test "X${ubranch}" = "X"; then
ubranch=`git branch -a | grep "*" | cut -d ' ' -f2`
fi
utracking=`git rev-parse --abbrev-ref --symbolic-full-name @{u}`
#
# gather a list of gfs2 patches from master just in case we can't find it
#
#git log --abbrev-commit --pretty=format:" %h % /tmp/gronk
git log --reverse --abbrev-commit --pretty=format:"ms %h % /tmp/gronk.gfs2
# ms = in Linus's master
git log --reverse --abbrev-commit --pretty=format:"ms %h % /tmp/gronk.dlm

cd $cwd
LIST=`git log --reverse --abbrev-commit --pretty=oneline $tracking..$branch | cut -d ' ' -f1 |paste -s -d ' '` 

for i in $LIST; do patches=$(echo $patches + 1 | bc);done
/usr/bin/echo "-----------------------[" $branch "-" $patches "patches ]-----------------------"
patches=$(echo $patches - 1 | bc);
for i in $LIST; do
if [ $patches -eq 1 ]; then
cnt=" ^"
elif [ $patches -eq 0 ]; then
cnt=" H"
else
if [ $patches -lt 10 ]; then
cnt=" $patches"
else
cnt="$patches"
fi
fi
/usr/bin/git show --abbrev-commit -s --pretty=format:"$cnt %h %desc=`/usr/bin/git show --abbrev-commit -s --pretty=format:"%s" $i`
cd ~/linux.git
cmp=1
up_eq=`git log --reverse --abbrev-commit --pretty=format:"lo %h %# lo = in local for-next
if test "X$up_eq" = "X"; then
up_eq=`git log --reverse --abbrev-commit --pretty=format:"fn %h %# fn = in for-next for next merge window
if test "X$up_eq" = "X"; then
up_eq=`grep "$desc" /tmp/gronk.gfs2`
if test "X$up_eq" = "X"; then
up_eq=`grep "$desc" /tmp/gronk.dlm`
if test "X$up_eq" = "X"; then
up_eq=" Not found upstream"
cmp=0
fi
fi
fi
fi
echo "$up_eq"
if [ $cmp -eq 1 ] ; then
UP_SHA1=`echo $up_eq|cut -d' ' -f2`
echo "compare_them $UP_SHA1 $i" >> $script
fi
cd $cwd
patches=$(echo $patches - 1 | bc)
done
echo "Compare>

via: https://opensource.com/article/20/1/bash-scripts-git

作者： Bob Peterson 選題： lujun9972 譯者： wxy 校對： wxy

本文由 LCTT 原創編譯， Linux中國 榮譽推出

閱讀更多 Linux技術 的文章

關鍵字: 格洛克 Bash 腳本語言