Skip to content

G
git

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

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

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

切换分支/标签
  1. 14 6月, 2014 29 次提交
  3. 30 4月, 2014 3 次提交
  5. 29 4月, 2014 3 次提交
    • J
      Merge branch 'db/make-with-curl' · d8779e1e
      由 Junio C Hamano 提交于 
      It turns out that some platforms do ship without curl-config even
though they build with the hardcoded default -lcurl and rely on it
to work.

* db/make-with-curl:
  Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR
      d8779e1e
    • J
      Merge branch 'jk/external-diff-use-argv-array' (early part) · 5f11a7aa
      由 Junio C Hamano 提交于 
      Crash fix for codepath that miscounted the necessary size for an
array when spawning an external diff program.

* 'jk/external-diff-use-argv-array' (early part):
  run_external_diff: use an argv_array for the command line
      5f11a7aa
    • D
      Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR · f3f11fa6
      由 Dave Borowitz 提交于 
      The original implementation of CURL_CONFIG support did not match the
original behavior of using -lcurl when CURLDIR was not set. This broke
implementations that were lacking curl-config but did have libcurl
installed along system libraries, such as MSysGit. In other words, the
assumption that curl-config is always installed was incorrect.

Instead, if CURL_CONFIG is empty or returns an empty result (e.g. due
to curl-config being missing), use the old behavior of falling back to
-lcurl.
Signed-off-by: NDave Borowitz <dborowitz@google.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      f3f11fa6
  7. 26 4月, 2014 1 次提交
  9. 25 4月, 2014 3 次提交
    • J
      Merge branch 'jk/pack-bitmap' · 1697bf30
      由 Junio C Hamano 提交于 
      A last minute (and hopefully the last) fix to avoid coredumps due
to an incorrect pointer arithmetic.

* jk/pack-bitmap:
  ewah_bitmap.c: do not assume size_t and eword_t are the same size
      1697bf30
    • J
      Merge branch 'fc/transport-helper-sync-error-fix' · d508e4a8
      由 Junio C Hamano 提交于 
      Make sure the marks are not written out when the transport helper
did not finish happily, to avoid leaving a marks file that is out of
sync with the reality.

* fc/transport-helper-sync-error-fix:
  t5801 (remote-helpers): cleanup environment sets
  transport-helper: fix sync issue on crashes
  transport-helper: trivial cleanup
  transport-helper: propagate recvline() error pushing
  remote-helpers: make recvline return an error
  transport-helper: remove barely used xchgline()
      d508e4a8
    • J
      Merge branch 'db/make-with-curl' · e4255213
      由 Junio C Hamano 提交于 
      Ask curl-config how to link with the curl library, instead of
having only a limited configurability knobs in the Makefile.

* db/make-with-curl:
  Makefile: allow static linking against libcurl
  Makefile: use curl-config to determine curl flags
      e4255213
  11. 23 4月, 2014 1 次提交
    • K
      ewah_bitmap.c: do not assume size_t and eword_t are the same size · 68f4e1fc
      由 Kyle J. McKay 提交于 
      When buffer_grow changes the size of the buffer using realloc,
it first computes and saves the rlw pointer's offset into the
buffer using (uint8_t *) math before the realloc but then
restores it using (eword_t *) math.

In order to do this it's necessary to convert the (uint8_t *)
offset into an (eword_t *) offset.  It was doing this by
dividing by the sizeof(size_t).  Unfortunately sizeof(size_t)
is not same as sizeof(eword_t) on all platforms.

This causes illegal memory accesses and other bad things to
happen when attempting to use bitmaps on those platforms.

Fix this by dividing by the sizeof(eword_t) instead which
will always be correct for all platforms.
Signed-off-by: NKyle J. McKay <mackyle@gmail.com>
Acked-by: NJeff King <peff@peff.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      68f4e1fc