Skip to content

G
git

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

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

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

切换分支/标签
  1. 09 10月, 2009 1 次提交
  3. 08 10月, 2009 6 次提交
  5. 06 10月, 2009 1 次提交
    • J
      git-pull: dead code removal · 4973aa22
      由 Junio C Hamano 提交于 
      Back when a74b1706 (git-pull: disallow implicit merging to detached HEAD,
2007-01-15) added this check, $? referred to the error status of reading
HEAD as a symbolic-ref; but cd67e4d4 (Teach 'git pull' about --rebase,
2007-11-28) moved the command away from where the check is, and nobody
noticed the breakage.  Ever since, $? has always been 0 (tr at the end of
the pipe to find merge_head never fails) and other case arms were never
reached.

These days, error_on_no_merge_candidates function is prepared to handle a
detached HEAD case, which was what the code this patch removes used to
handle.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      4973aa22
  7. 05 10月, 2009 3 次提交
    • J
      Merge branch 'maint' · a7aebb9d
      由 Junio C Hamano 提交于 
      * maint:
  show-branch: fix segfault when showbranch.default exists
      a7aebb9d
    • J
      Merge branch 'jc/maint-1.6.4-show-branch-default' into maint · 04ce83e2
      由 Junio C Hamano 提交于 
      * jc/maint-1.6.4-show-branch-default:
  show-branch: fix segfault when showbranch.default exists
      04ce83e2
    • J
      show-branch: fix segfault when showbranch.default exists · 3af1cae4
      由 Junio C Hamano 提交于 
      When running "git show-branch" without any parameter in a repository that
has showbranch.default defined, we used to rely on the fact that our
handcrafted option parsing loop never looked at av[0].

The array of default strings had the first real command line argument in
default_arg[0], but the option parser wanted to look at the array starting
at av[1], so we assigned the address of -1th element to av to force the
loop start working from default_arg[0].

This no longer worked since 57343652 (show-branch: migrate to parse-options
API, 2009-05-21), as parse_options_start() saved the incoming &av[0] in
its ctx->out and later in parse_options_end() it did memmove to ctx->out
(with ctx->cpidx == 0), overwriting the memory before default_arg[] array.

I am not sure if this is a bug in parse_options(), or a bug in the caller,
and tonight I do not have enough concentration to figure out which.  In
any case, this patch works the issue around.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      3af1cae4
  9. 03 10月, 2009 1 次提交
  11. 02 10月, 2009 3 次提交
    • M
      tests: make all test files executable · b4ae5e2a
      由 Mark Rada 提交于 
      For consistency with the rest of the test files.
Signed-off-by: NMark Rada <marada@uwaterloo.ca>
Signed-off-by: NJeff King <peff@peff.net>
      b4ae5e2a
    • A
      filter-branch: add --prune-empty to option summary · e3679ab4
      由 Adam Brewster 提交于 
      Signed-off-by: NAdam Brewster <adambrewster@gmail.com>
Signed-off-by: NJeff King <peff@peff.net>
      e3679ab4
    • R
      Fix some printf format warnings · 5322ef20
      由 Ramsay Jones 提交于 
      commit 51ea5519 ("make sure byte swapping is optimal for git"
2009-08-18) introduced a "sane definition for ntohl()/htonl()"
for use on some GNU C platforms. Unfortunately, for some of
these platforms, this results in the introduction of a problem
which is essentially the reverse of a problem that commit 6e1c2344
("Fix some warnings (on cygwin) to allow -Werror" 2008-07-3) was
intended to fix.

In particular, on platforms where the uint32_t type is defined
to be unsigned long, the return type of the new ntohl()/htonl()
is causing gcc to issue printf format warnings, such as:

    warning: long unsigned int format, unsigned int arg (arg 3)

(nine such warnings, covering six different files). The earlier
commit (6e1c2344) needed to suppress these same warnings, except
that the types were in the opposite direction; namely the format
specifier ("%u") was 'unsigned int' and the argument type (ie the
return type of ntohl()) was 'long unsigned int' (aka uint32_t).

In order to suppress these warnings, the earlier commit used the
(C99) PRIu32 format specifier, since the definition of this macro
is suitable for use with the uint32_t type on that platform.
This worked because the return type of the (original) platform
ntohl()/htonl() functions was uint32_t.

In order to suppress these warnings, we change the return type of
the new byte swapping functions in the compat/bswap.h header file
from 'unsigned int' to uint32_t.
Signed-off-by: NRamsay Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: NNicolas Pitre <nico@fluxnic.net>
Signed-off-by: NJeff King <peff@peff.net>
      5322ef20
  13. 30 9月, 2009 1 次提交
  15. 29 9月, 2009 8 次提交
  17. 27 9月, 2009 1 次提交
    • N
      make 'git clone' ask the remote only for objects it cares about · 5bdc32d3
      由 Nicolas Pitre 提交于 
      Current behavior of 'git clone' when not using --mirror is to fetch
everything from the peer, and then filter out unwanted refs just before
writing them out to the cloned repository.  This may become highly
inefficient if the peer has an unusual ref namespace, or if it simply
has "remotes" refs of its own, and those locally unwanted refs are
connecting to a large set of objects which becomes unreferenced as soon
as they are fetched.

Let's filter out those unwanted refs from the peer _before_ asking it
what refs we want to fetch instead, which is the most logical thing to
do anyway.
Signed-off-by: NNicolas Pitre <nico@fluxnic.net>
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
      5bdc32d3
  19. 26 9月, 2009 3 次提交
  21. 23 9月, 2009 7 次提交
  23. 22 9月, 2009 1 次提交
  25. 21 9月, 2009 4 次提交