Git查询

Git查询

查询分支

git branch # 查询本地分支

git branch -a # 查询所有分支

$ git branch -a
* master
  remotes/origin/HEAD -> origin/master
  remotes/origin/master

$ git branch
* master

查询仓库

git remote -v # origin为仓库名

$ git remote -v
origin  https://anongit.freedesktop.org/git/spice/spice-gtk.git (fetch)
origin  https://anongit.freedesktop.org/git/spice/spice-gtk.git (push)

查询提交记录

git log

git log id # 查询某次commit的信息

$ git log
commit 2293b293e83a95a9b939a04a916adf8abed1a100
Author: Takao Fujiwara <tfujiwar@redhat.com>
Date:   Fri Apr 15 18:09:37 2016 +0900

    Send Hangul key in KR keyboard

    Korean keyboard assigns Hangul key on the position of Right Alt and
    Left Alt and Hangul keys have the different scancodes but MapVirtualKey()
    returned the same scancode and could not use Hangul key on Linux desktop.

    The fix is to send the right scancode of VK_HANGUL.

commit 046de27c2eea2b3ee2ade80780f51b2ca140f92d
Author: Takao Fujiwara <tfujiwar@redhat.com>
Date:   Fri Apr 15 18:08:37 2016 +0900

    Send key release event for some keys in JP keyboard

    With the previous fix, WM_KEYDOWN of Alt+Zenkaku_Hankaku (VK_KANJI) can
    be sent with spice-gtk but Alt+Zenkaku_Hankaku does not send the WM_KEYUP
    event in Windows and it caused Linux desktop freeze with unlimited key
    press events.

查询文件修改内容

git status #查询当前修改状态

git diff file #在没有执行git add file的情况下查看文件修改内容

git diff id id #比较两次commit之间的差异

git diff --cached #已经执行了git add file但是没有git commit的情况下查看文件修改内容

$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   src/Makefile.am

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        spice-gtk.IAB
        spice-gtk.IAD
        spice-gtk.IMB
        spice-gtk.IMD
        spice-gtk.PFI
        spice-gtk.PO
        spice-gtk.PR
        spice-gtk.PRI
        spice-gtk.PS
        spice-gtk.SearchResults
        spice-gtk.WK3

no changes added to commit (use "git add" and/or "git commit -a")

$ git diff src/Makefile.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 0ef3bea..44959cf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -202,6 +202,7 @@ libspice_client_glib_2_0_la_LIBADD =                                        \
        $(USBREDIR_LIBS)                                                \
        $(GUDEV_LIBS)                                                   \
        $(PHODAV_LIBS)                                                  \
+       $(GTK_LIBS)                     \
        $(NULL)

 if WITH_POLKIT

$ git add src/Makefile.am
$ git diff src/Makefile.am
$ git diff --cached src/Makefile.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 0ef3bea..44959cf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -202,6 +202,7 @@ libspice_client_glib_2_0_la_LIBADD =                                        \
        $(USBREDIR_LIBS)                                                \
        $(GUDEV_LIBS)                                                   \
        $(PHODAV_LIBS)                                                  \
+       $(GTK_LIBS)                     \
        $(NULL)

 if WITH_POLKIT

$ git diff 2293b293e83a95a9b939a04a916adf8abed1a100 046de27c2eea2b3ee2ade80780f51b2ca140f92d
diff --git a/src/spice-widget.c b/src/spice-widget.c
index 617cd26..4878e00 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -30,7 +30,6 @@
 #endif
 #ifdef G_OS_WIN32
 #include <windows.h>
-#include <dinput.h>
 #include <ime.h>
 #include <gdk/gdkwin32.h>
 #ifndef MAPVK_VK_TO_VSC /* may be undefined in older mingw-headers */
@@ -1488,14 +1487,6 @@ static gboolean key_event(GtkWidget *widget, GdkEventKey *key)
             }
         }
         break;
-    case MAKELANGID(LANG_KOREAN, SUBLANG_KOREAN):
-        if (key->hardware_keycode == VK_HANGUL && native_scancode == DIK_LALT) {
-            /* Left Alt (VK_MENU) has the scancode DIK_LALT (0x38) but
-             * Hangul (VK_HANGUL) has the scancode 0x138
-             */
-            scancode = native_scancode | 0x100;
-        }
-        break;

查询commit修改内容

git show

git show $id #显示某次提交的修改内容

$ git show
commit 2293b293e83a95a9b939a04a916adf8abed1a100
Author: Takao Fujiwara <tfujiwar@redhat.com>
Date:   Fri Apr 15 18:09:37 2016 +0900

    Send Hangul key in KR keyboard

    Korean keyboard assigns Hangul key on the position of Right Alt and
    Left Alt and Hangul keys have the different scancodes but MapVirtualKey()
    returned the same scancode and could not use Hangul key on Linux desktop.

    The fix is to send the right scancode of VK_HANGUL.

diff --git a/src/spice-widget.c b/src/spice-widget.c
index 4878e00..617cd26 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -30,6 +30,7 @@
 #endif
 #ifdef G_OS_WIN32
 #include <windows.h>
+#include <dinput.h>
 #include <ime.h>
 #include <gdk/gdkwin32.h>

$ git show 046de27c2eea2b3ee2ade80780f51b2ca140f92d
commit 046de27c2eea2b3ee2ade80780f51b2ca140f92d
Author: Takao Fujiwara <tfujiwar@redhat.com>
Date:   Fri Apr 15 18:08:37 2016 +0900

    Send key release event for some keys in JP keyboard

    With the previous fix, WM_KEYDOWN of Alt+Zenkaku_Hankaku (VK_KANJI) can
    be sent with spice-gtk but Alt+Zenkaku_Hankaku does not send the WM_KEYUP
    event in Windows and it caused Linux desktop freeze with unlimited key
    press events.

    The proposed fix is to send the key release event in spice-gtk.

    VK_DBE_ALPHANUMERIC, VK_DBE_HIRAGANA, VK_DBE_ROMAN are applied the
    similar fixes.

diff --git a/src/spice-widget.c b/src/spice-widget.c
index be0d747..4878e00 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -1404,6 +1404,7 @@ static gboolean key_event(GtkWidget *widget, GdkEventKey *key)
 #ifdef G_OS_WIN32

查询某个文件的历史修改记录

git log --pretty=oneline filename

[work@bogon spice-common]$ git log --pretty=oneline common/ssl_verify.h
6175014ed77be6d1acd6420e36ca6582b573532c ssl: Don't use uninitialized variable in verify_subject()
c4482c7ff2bf441e6a9e06f30f1b247171bb0738 Use SPICE_{BEGIN,END}_DECLS
3e4b2571a2908ac6a4bd8c48e985ad8d8fd009cb ssl_verify: comment X509_NAME undef
5d02123499ff68f8584384aac7b7a715a3a76a1b mingw: workaround weird openssl build failure
a2e0db03a95de1aab268a41a5496a1c09a7be4e2 common/ssl_verify: special case to WIN32 that isn't MINGW32
4cb26e06f7a5425f84eaafbdc57f7087e184a92d common: fix ssl_verify windows build errors
5de42c768d788c02083cc4455ddc796261419f84 common: add ssl_verify.c common code