Skip to content

G
git

李少辉-开发者 / git
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

体验新版 GitCode，发现更多精彩内容 >>

切换分支/标签
  1. 06 12月, 2009 1 次提交
  3. 28 11月, 2009 1 次提交
  5. 27 11月, 2009 1 次提交
  7. 06 9月, 2009 6 次提交
  9. 23 8月, 2009 3 次提交
    • J
      git status: not "commit --dry-run" anymore · 9e4b7ab6
      由 Junio C Hamano 提交于 
      This removes tentative "git stat" and make it take over "git status".

There are some tests that expect "git status" to exit with non-zero status
when there is something staged.  Some tests expect "git status path..." to
show the status for a partial commit.

For these, replace "git status" with "git commit --dry-run".  For the
ones that do not attempt a dry-run of a partial commit that check the
output from the command, check the output from "git status" as well, as
they should be identical.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      9e4b7ab6
    • J
      git stat -s: short status output · 173e6c88
      由 Junio C Hamano 提交于 
      Give -s(hort) option to "git stat" that shows the status of paths in a
more concise way.

    XY PATH1 -> PATH2

format to be more machine readable than output from "git status", which is
about previewing of "git commit" with the same arguments.

PATH1 is the path in the HEAD, and " -> PATH2" part is shown only when
PATH1 corresponds to a different path in the index/worktree.

For unmerged entries, X shows the status of stage #2 (i.e. ours) and Y
shows the status of stage #3 (i.e. theirs).  For entries that do not have
conflicts, X shows the status of the index, and Y shows the status of the
work tree.  For untracked paths, XY are "??".

    X          Y     Meaning
    -------------------------------------------------
              [MD]   not updated
    M        [ MD]   updated in index
    A        [ MD]   added to index
    D        [ MD]   deleted from index
    R        [ MD]   renamed in index
    C        [ MD]   copied in index
    [MARC]           index and work tree matches
    [ MARC]     M    work tree changed since index
    [ MARC]     D    deleted in work tree

    D           D    unmerged, both deleted
    A           U    unmerged, added by us
    U           D    unmerged, deleted by them
    U           A    unmerged, added by them
    D           U    unmerged, deleted by us
    A           A    unmerged, both added
    U           U    unmerged, both modified

    ?           ?    untracked

When given -z option, the records are terminated by NUL characters for
better machine readability.  Because the traditional long format is
designed for human consumption, NUL termination does not make sense.
For this reason, -z option implies -s (short output).
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      173e6c88
    • J
      git stat: the beginning of "status that is not a dry-run of commit" · 76e2f7ce
      由 Junio C Hamano 提交于 
      Tentatively add "git stat" as a new command.

This is not "preview of commit with the same arguments"; the path parameters
are not paths to be added to the pristine index (aka "--only" option), but
are taken as pathspecs to limit the output.  Later in 1.7.0 release, it will
take over "git status".
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      76e2f7ce
  11. 15 8月, 2009 2 次提交
  13. 11 8月, 2009 4 次提交
  15. 08 8月, 2009 1 次提交
    • J
      commit: --dry-run · 3a5d13a3
      由 Junio C Hamano 提交于 
      This teaches --dry-run option to "git commit".

It is the same as "git status", but in the longer term we would want to
change the semantics of "git status" not to be the preview of commit, and
this is the first step for doing so.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      3a5d13a3
  17. 07 8月, 2009 1 次提交
    • J
      status: show worktree status of conflicted paths separately · 4d4d5726
      由 Junio C Hamano 提交于 
      When a path is unmerged in the index, we used to always say "unmerged" in
the "Changed but not updated" section, even when the path was deleted in
the work tree.

Remove unmerged entries from the "Updated" section, and create a new
section "Unmerged paths".  Describe how the different stages conflict
in more detail in this new section.

Note that with the current 3-way merge policy (with or without recursive),
certain combinations of index stages should never happen.  For example,
having only stage #2 means that a path that did not exist in the common
ancestor was added by us while the other branch did not do anything to it,
which would have autoresolved to take our addition.  The code nevertheless
prepares for the possibility that future merge policies may leave a path
in such a state.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      4d4d5726
  19. 06 8月, 2009 1 次提交
  21. 05 8月, 2009 2 次提交
    • J
      diff-index: keep the original index intact · 26da1d78
      由 Junio C Hamano 提交于 
      When comparing the index and a tree, we used to read the contents of the
tree into stage #1 of the index and compared them with stage #0.  In order
not to lose sight of entries originally unmerged in the index, we hoisted
them to stage #3 before reading the tree.

Commit d1f2d7e8 (Make run_diff_index() use unpack_trees(), not read_tree(),
2008-01-19) changed all this.  These days, we instead use unpack_trees()
API to traverse the tree and compare the contents with the index, without
modifying the index at all.  There is no reason to hoist the unmerged
entries to stage #3 anymore.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      26da1d78
    • J
      diff-index: report unmerged new entries · 29796c6c
      由 Junio C Hamano 提交于 
      Since an earlier change to diff-index by d1f2d7e8 (Make run_diff_index()
use unpack_trees(), not read_tree(), 2008-01-19), we stopped reporting an
unmerged path that does not exist in the tree, but we should.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      29796c6c
  23. 01 8月, 2009 2 次提交
  25. 31 7月, 2009 3 次提交
  27. 30 7月, 2009 5 次提交
  29. 29 7月, 2009 7 次提交