Skip to content

G
git

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

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

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

切换分支/标签
  1. 01 7月, 2013 1 次提交
  3. 29 6月, 2013 3 次提交
  5. 28 6月, 2013 14 次提交
  7. 21 6月, 2013 1 次提交
  9. 12 6月, 2013 3 次提交
  11. 11 6月, 2013 2 次提交
  13. 10 6月, 2013 4 次提交
  15. 05 6月, 2013 1 次提交
    • J
      t/README: test_must_fail is for testing Git · f445500e
      由 Junio C Hamano 提交于 
      When a test wants to make sure there is no <string> in an output
file, we should just say "! grep string output".

"test_must_fail" is there only to test Git command and catch unusual
deaths we know about (e.g. segv) as an error, not as an expected
failure.  "test_must_fail grep string output" is unnecessary, as
we are not making sure the system binaries do not dump core or
anything like that.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      f445500e
  17. 04 6月, 2013 1 次提交
  19. 03 6月, 2013 1 次提交
  21. 30 5月, 2013 7 次提交
    • R
      push: make push.default = current use resolved HEAD · 0f075b22
      由 Ramkumar Ramachandra 提交于 
      With this change, the output of the push (with push.default set to
current) changes subtly from:

  $ git push
  ...
   * [new branch]      HEAD -> push-current-head

to:

  $ git push
  ...
   * [new branch]      push-current-head -> push-current-head

This patch was written with a different motivation. There is a problem
unique to push.default = current:

  # on branch push-current-head
  $ git push
  # on another terminal
  $ git checkout master
  # return to the first terminal
  # the push tried to push master!

This happens because the 'git checkout' on the second terminal races
with the 'git push' on the first terminal.  Although this patch does not
solve the core problem (there is still no guarantee that 'git push' on
the first terminal will resolve HEAD before 'git checkout' changes HEAD
on the second), it works in practice.
Signed-off-by: NRamkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      0f075b22
    • R
      push: fail early with detached HEAD and current · 7b2ecd81
      由 Ramkumar Ramachandra 提交于 
      Setting push.default to current adds the refspec "HEAD" for the
transport layer to handle.  If "HEAD" doesn't resolve to a branch (and
since no refspec rhs is specified), the push fails after some time with
a cryptic error message:

  $ git push
  error: unable to push to unqualified destination: HEAD
  The destination refspec neither matches an existing ref on the remote nor
  begins with refs/, and we are unable to guess a prefix based on the source ref.
  error: failed to push some refs to 'git@github.com:artagnon/git'

Fail early with a nicer error message:

  $ git push
  fatal: You are not currently on a branch.
  To push the history leading to the current (detached HEAD)
  state now, use

    git push ram HEAD:<name-of-remote-branch>

Just like in the upstream and simple cases.
Signed-off-by: NRamkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      7b2ecd81
    • J
      Start 1.8.3.1 maintenance track · fada5221
      由 Junio C Hamano 提交于 
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      fada5221
    • J
      Merge branch 'maint-1.8.2' into maint · a717d9e1
      由 Junio C Hamano 提交于 
      * maint-1.8.2:
  trivial: Add missing period in documentation
      a717d9e1
    • K
      difftool --dir-diff: allow changing any clean working tree file · 32eaf1de
      由 Kenichi Saita 提交于 
      The temporary directory prepared by "difftool --dir-diff" to
show the result of a change can be modified by the user via
the tree diff program, and we try hard not to lose changes
to them after tree diff program returns to us.

However, the set of files to be copied back is computed
differently between --symlinks and --no-symlinks modes.  The
former checks all paths that start out as identical to the
working tree file, while the latter checks paths that
already had a local modification in the working tree,
allowing changes made in the tree diff program to paths that
did not have any local change to be lost.
Signed-off-by: NKenichi Saita <nitoyon@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      32eaf1de
    • R
      push: factor out the detached HEAD error message · 35ee69c0
      由 Ramkumar Ramachandra 提交于 
      With push.default set to upstream or simple, and a detached HEAD, git
push prints the following error:

  $ git push
  fatal: You are not currently on a branch.
  To push the history leading to the current (detached HEAD)
  state now, use

    git push ram HEAD:<name-of-remote-branch>

This error is not unique to upstream or simple: current cannot push with
a detached HEAD either.  So, factor out the error string in preparation
for using it in current.
Signed-off-by: NRamkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      35ee69c0
    • F
      prompt: fix for simple rebase · 1306321e
      由 Felipe Contreras 提交于 
      When we are rebasing without options ('am' mode), the head rebased lives
in '$g/rebase-apply/head-name', so lets use that information so it's
reported the same way as if we were doing other rebases (-i or -m).
Signed-off-by: NFelipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      1306321e
  23. 29 5月, 2013 2 次提交