首先我们git用的最频繁的指令估计就是 git add ,git commit ,git push ,git pull ,git log,git branch,等等了。对吧
假如今天我要查询一笔之前的提交记录 关于ota相关信息的。
1.git log --oneline | grep ota
caofeng@devserverxvi24:~/mocor_sc9820w_p2$ git log --oneline |grep ota
72a94dd sc9820 update fota
016cc97 Merge "sc9820 update fota"
602d77d sc9820 update fota
5eb33a4 sp9820 mkota
caofeng@devserverxvi24:~/mocor_sc9820w_p2$
查询到之前提交中存在相关信息。
2.查询到相关信息后,我们查看一下它具体的相关信息
git show 72a94dd
caofeng@devserverxvi24:~/mocor_sc9820w_p2$ git show 72a94dd
commit 72a94ddc945af4a93c64fcca7eafa8a61692cb27
Author: gulei <gulei@revoview.com>
Date: Wed Aug 16 16:27:59 2017 +0800
sc9820 update fota
Change-Id: Idc293a90e4e6b2e06ff3390116b992dbf351ffa7
diff --git a/packages/apps/SWUpgrade/app/noIcon/FotaUpdate.apk b/packages/apps/SWUpgrade/app/noIcon/FotaUpdate.apk
index ba558f4..5937ae0 100755
Binary files a/packages/apps/SWUpgrade/app/noIcon/FotaUpdate.apk and b/packages/apps/SWUpgrade/app/noIcon/FotaUpdate.apk differ
diff --git a/packages/apps/SWUpgrade/app/withIcon/FotaUpdate.apk b/packages/apps/SWUpgrade/app/withIcon/FotaUpdate.apk
index 1464945..aae9c2f 100755
Binary files a/packages/apps/SWUpgrade/app/withIcon/FotaUpdate.apk and b/packages/apps/SWUpgrade/app/withIcon/FotaUpdate.apk differ
3.查询一下当前分支所有的提交信息 与列表显示出来。
git log --oneline --name-status
caofeng@devserverxvi24:~/mocor_sc9820w_p2$ git log --oneline --name-status
6b6c447 a53a claro modify custmoer require 07
M packages/apps/Camera2/res/values-es-rUS/strings.xml
M zrevo/a53a_xx02-ruiou/binary/claro/logo/QVGA_logo_256_td.bmp
M zrevo/a53a_xx02-ruiou/env_a53a_xx02-ruiou.ini
A zrevo/a53a_xx02-ruiou/overlay/claro/frameworks/base/core/res/res/values-es-rUS/strings.xml
M zrevo/a53a_xx02-ruiou/overlay/claro/packages/apps/Settings/res/values-es-rUS/strings.xml
A zrevo/a53a_xx02-ruiou/overlay/claro/packages/apps/Settings/res/values-pt-rBR/strings.xml
M zrevo/a53a_xx02-ruiou/overlay/claro/packages/apps/Settings/res/values/strings.xml
a083376 9820w ntc setting [a53a ruiou ais]
M kernel/arch/arm/boot/dts/sprd-battery.dtsi
M kernel/drivers/power/sprd_2713_charge.c
5d196ad Merge "[a53a_ais] debug for show plmn"
6f395ab [a53a_ais] debug for show plmn
M frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
981f2fc a53a claro update version number
M zrevo/a53a_xx02-ruiou/env_a53a_xx02-ruiou.ini
47a8d43 a53a_ais modify simstate broadcast
M frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
M packages/apps/Settings/AndroidManifest.xml
M packages/apps/Settings/src/com/android/settings/widget/SimStateWidgetProvider.java
M zrevo/a53a_xx02-ruiou/env_a53a_xx02-ruiou.ini
6dd630e a53a update SPCSS00577195
M frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
很多很多 只是截取了一点点的,这些就是我们分支所有的提交记录,而且会显示每一笔提交的相关文件信息。
4.针对不同的分支不同,而且单独每个每个的找比较费劲,我们可以制作一个目录,方便查找,我们只需要根据目录,做git show id 相关的操作就行。
4.1 先copy出所有的提交记录信息。
caofeng@devserverxvi24:~/mocor_sc9820w_p2$ git log --oneline > mocor_sc9820w_p2.git.text
这样代码的根目录,mocor_sc9820w_p2就会copy出一份mocor_sc9820w_p2.git.text文件了。
4.2 后面我们只要搜索相关的关键字 就能搜索出对应的相关提交记录。
caofeng@devserverxvi24:~/mocor_sc9820w_sublog$ grep -Rn "ota" mocor_sc9820w_p2.git.text
185:72a94dd sc9820 update fota
191:016cc97 Merge "sc9820 update fota"
192:602d77d sc9820 update fota
371:5eb33a4 sp9820 mkota
caofeng@devserverxvi24:~/mocor_sc9820w_sublog$
4.3找到相关信息 调用git show 016cc97 就能查看到具体的tiji提交信息:
caofeng@devserverxvi24:~/mocor_sc9820w_p2$ git show 602d77d
commit 602d77d6de3d241acd2a9f74633f61fe91870227
Author: gulei <gulei@revoview.com>
Date: Thu Aug 10 17:58:12 2017 +0800
sc9820 update fota
Change-Id: I31bca6656996c310d9a1f6d9e8cd2988d7220007
diff --git a/packages/apps/SWUpgrade/app/noIcon/FotaUpdate.apk b/packages/apps/SWUpgrade/app/noIcon/FotaUpdate.apk
index 4d0fc67..ba558f4 100755
Binary files a/packages/apps/SWUpgrade/app/noIcon/FotaUpdate.apk and b/packages/apps/SWUpgrade/app/noIcon/FotaUpdate.apk differ
diff --git a/packages/apps/SWUpgrade/app/withIcon/FotaUpdate.apk b/packages/apps/SWUpgrade/app/withIcon/FotaUpdate.apk
index d988fd0..1464945 100755
Binary files a/packages/apps/SWUpgrade/app/withIcon/FotaUpdate.apk and b/packages/apps/SWUpgrade/app/withIcon/FotaUpdate.apk differ