1. 13 Jun, 2014 8 commits
  2. 29 Apr, 2014 3 commits
  3. 28 Apr, 2014 3 commits
    • Junio C Hamano's avatar
      Merge branch 'db/make-with-curl' · d8779e1e
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'jk/external-diff-use-argv-array' (early part) · 5f11a7aa
      Junio C Hamano authored
      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
    • Dave Borowitz's avatar
      Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR · f3f11fa6
      Dave Borowitz authored
      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: default avatarDave Borowitz <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      f3f11fa6
  4. 25 Apr, 2014 1 commit
  5. 24 Apr, 2014 3 commits
    • Junio C Hamano's avatar
      Merge branch 'jk/pack-bitmap' · 1697bf30
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'fc/transport-helper-sync-error-fix' · d508e4a8
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'db/make-with-curl' · e4255213
      Junio C Hamano authored
      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
  6. 22 Apr, 2014 1 commit
    • mackyle's avatar
      ewah_bitmap.c: do not assume size_t and eword_t are the same size · 68f4e1fc
      mackyle authored
      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: mackyle's avatarKyle J. McKay <[email protected]>
      Acked-by: default avatarJeff King <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      68f4e1fc
  7. 21 Apr, 2014 7 commits
    • Junio C Hamano's avatar
      Update draft release notes to 2.0 · 779792a5
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      779792a5
    • Junio C Hamano's avatar
      Merge git://bogomips.org/git-svn · aeaa7e27
      Junio C Hamano authored
      * git://bogomips.org/git-svn:
        Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given
      aeaa7e27
    • Junio C Hamano's avatar
      Merge branch 'jx/i18n' · 8fe3ee67
      Junio C Hamano authored
      * jx/i18n:
        i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelines
        i18n: only extract comments marked with "TRANSLATORS:"
        i18n: remove obsolete comments for translators in diffstat generation
        i18n: fix uncatchable comments for translators in date.c
      8fe3ee67
    • Junio C Hamano's avatar
      Merge branch 'km/avoid-non-function-return-in-rebase' · 0b17b433
      Junio C Hamano authored
      Work around /bin/sh that does not like "return" at the top-level
      of a file that is dot-sourced from inside a function definition.
      
      * km/avoid-non-function-return-in-rebase:
        Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
        rebase: avoid non-function use of "return" on FreeBSD
      0b17b433
    • Junio C Hamano's avatar
      Merge branch 'ep/shell-command-substitution' · 0e6e1a5f
      Junio C Hamano authored
      * ep/shell-command-substitution:
        t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command substitution
        t9360-mw-to-git-clone.sh: use the $( ... ) construct for command substitution
        git-tag.sh: use the $( ... ) construct for command substitution
        git-revert.sh: use the $( ... ) construct for command substitution
        git-resolve.sh: use the $( ... ) construct for command substitution
        git-repack.sh: use the $( ... ) construct for command substitution
        git-merge.sh: use the $( ... ) construct for command substitution
        git-ls-remote.sh: use the $( ... ) construct for command substitution
        git-fetch.sh: use the $( ... ) construct for command substitution
        git-commit.sh: use the $( ... ) construct for command substitution
        git-clone.sh: use the $( ... ) construct for command substitution
        git-checkout.sh: use the $( ... ) construct for command substitution
        install-webdoc.sh: use the $( ... ) construct for command substitution
        howto-index.sh: use the $( ... ) construct for command substitution
      0e6e1a5f
    • Felipe Contreras's avatar
      t5801 (remote-helpers): cleanup environment sets · 3667a5b6
      Felipe Contreras authored
      Commit 512477b1 (tests: use "env" to run commands with temporary env-var
      settings) missed some variables in the remote-helpers test. Also
      standardize these.
      Signed-off-by: Felipe Contreras's avatarFelipe Contreras <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      3667a5b6
    • Jeff King's avatar
      run_external_diff: use an argv_array for the command line · 82fbf269
      Jeff King authored
      We currently generate the command-line for the external
      command using a fixed-length array of size 10. But if there
      is a rename, we actually need 11 elements (10 items, plus a
      NULL), and end up writing a random NULL onto the stack.
      
      Rather than bump the limit, let's just use an argv_array, which
      makes this sort of error impossible.
      Noticed-by: default avatarMax L <[email protected]>
      Signed-off-by: default avatarJeff King <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      82fbf269
  8. 19 Apr, 2014 1 commit
    • Johan Herland's avatar
      Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given · fe191fca
      Johan Herland authored
      git-svn by default puts its Subversion-tracking refs directly in
      refs/remotes/*. This runs counter to Git's convention of using
      refs/remotes/$remote/* for storing remote-tracking branches.
      
      Furthermore, combining git-svn with regular git remotes run the risk of
      clobbering refs under refs/remotes (e.g. if you have a git remote
      called "tags" with a "v1" branch, it will overlap with the git-svn's
      tracking branch for the "v1" tag from Subversion.
      
      Even though the git-svn refs stored in refs/remotes/* are not "proper"
      remote-tracking branches (since they are not covered by a proper git
      remote's refspec), they clearly represent a similar concept, and would
      benefit from following the same convention.
      
      For example, if git-svn tracks Subversion branch "foo" at
      refs/remotes/foo, and you create a local branch refs/heads/foo to add
      some commits to be pushed back to Subversion (using "git svn dcommit),
      then it is clearly unhelpful of Git to throw
      
        warning: refname 'foo' is ambiguous.
      
      every time you checkout, rebase, or otherwise interact with the branch.
      
      The existing workaround for this is to supply the --prefix=quux/ to
      git svn init/clone, so that git-svn's tracking branches end up in
      refs/remotes/quux/* instead of refs/remotes/*. However, encouraging
      users to specify --prefix to work around a design flaw in git-svn is
      suboptimal, and not a long term solution to the problem. Instead,
      git-svn should default to use a non-empty prefix that saves
      unsuspecting users from the inconveniences described above.
      
      This patch will only affect newly created git-svn setups, as the
      --prefix option only applies to git svn init (and git svn clone).
      Existing git-svn setups will continue with their existing (lack of)
      prefix. Also, if anyone somehow prefers git-svn's old layout, they
      can recreate that by explicitly passing an empty prefix (--prefix "")
      on the git svn init/clone command line.
      
      The patch changes the default value for --prefix from "" to "origin/",
      updates the git-svn manual page, and fixes the fallout in the git-svn
      testcases.
      
      (Note that this patch might be easier to review using the --word-diff
      and --word-diff-regex=. diff options.)
      
      [ew: squashed description of <= 1.9 behavior into manpage]
      Suggested-by: Thomas Ferris Nicolaisen's avatarThomas Ferris Nicolaisen <[email protected]>
      Signed-off-by: default avatarJohan Herland <[email protected]>
      Signed-off-by: default avatarEric Wong <[email protected]>
      fe191fca
  9. 18 Apr, 2014 6 commits
  10. 17 Apr, 2014 7 commits