Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jan 7, 2015
  1. @gitster

    Merge branch 'maint-2.1' into maint

    gitster authored
    * maint-2.1:
      is_hfs_dotgit: loosen over-eager match of \u{..47}
  2. @gitster

    Merge branch 'maint-2.0' into maint-2.1

    gitster authored
    * maint-2.0:
      is_hfs_dotgit: loosen over-eager match of \u{..47}
  3. @gitster

    Merge branch 'maint-1.9' into maint-2.0

    gitster authored
    * maint-1.9:
      is_hfs_dotgit: loosen over-eager match of \u{..47}
  4. @gitster

    Merge branch 'maint-1.8.5' into maint-1.9

    gitster authored
    * maint-1.8.5:
      is_hfs_dotgit: loosen over-eager match of \u{..47}
Commits on Dec 17, 2014
  1. @gitster

    Sync with v2.1.4

    gitster authored
    * maint-2.1:
      Git 2.1.4
      Git 2.0.5
      Git 1.9.5
      Git 1.8.5.6
      fsck: complain about NTFS ".git" aliases in trees
      read-cache: optionally disallow NTFS .git variants
      path: add is_ntfs_dotgit() helper
      fsck: complain about HFS+ ".git" aliases in trees
      read-cache: optionally disallow HFS+ .git variants
      utf8: add is_hfs_dotgit() helper
      fsck: notice .git case-insensitively
      t1450: refactor ".", "..", and ".git" fsck tests
      verify_dotfile(): reject .git case-insensitively
      read-tree: add tests for confusing paths like ".." and ".git"
      unpack-trees: propagate errors adding entries to the index
  2. @gitster

    Sync with v2.0.5

    gitster authored
    * maint-2.0:
      Git 2.0.5
      Git 1.9.5
      Git 1.8.5.6
      fsck: complain about NTFS ".git" aliases in trees
      read-cache: optionally disallow NTFS .git variants
      path: add is_ntfs_dotgit() helper
      fsck: complain about HFS+ ".git" aliases in trees
      read-cache: optionally disallow HFS+ .git variants
      utf8: add is_hfs_dotgit() helper
      fsck: notice .git case-insensitively
      t1450: refactor ".", "..", and ".git" fsck tests
      verify_dotfile(): reject .git case-insensitively
      read-tree: add tests for confusing paths like ".." and ".git"
      unpack-trees: propagate errors adding entries to the index
  3. @gitster

    Sync with v1.9.5

    gitster authored
    * maint-1.9:
      Git 1.9.5
      Git 1.8.5.6
      fsck: complain about NTFS ".git" aliases in trees
      read-cache: optionally disallow NTFS .git variants
      path: add is_ntfs_dotgit() helper
      fsck: complain about HFS+ ".git" aliases in trees
      read-cache: optionally disallow HFS+ .git variants
      utf8: add is_hfs_dotgit() helper
      fsck: notice .git case-insensitively
      t1450: refactor ".", "..", and ".git" fsck tests
      verify_dotfile(): reject .git case-insensitively
      read-tree: add tests for confusing paths like ".." and ".git"
      unpack-trees: propagate errors adding entries to the index
  4. @gitster

    Sync with v1.8.5.6

    gitster authored
    * maint-1.8.5:
      Git 1.8.5.6
      fsck: complain about NTFS ".git" aliases in trees
      read-cache: optionally disallow NTFS .git variants
      path: add is_ntfs_dotgit() helper
      fsck: complain about HFS+ ".git" aliases in trees
      read-cache: optionally disallow HFS+ .git variants
      utf8: add is_hfs_dotgit() helper
      fsck: notice .git case-insensitively
      t1450: refactor ".", "..", and ".git" fsck tests
      verify_dotfile(): reject .git case-insensitively
      read-tree: add tests for confusing paths like ".." and ".git"
      unpack-trees: propagate errors adding entries to the index
Commits on Sep 19, 2014
  1. @gitster

    Merge branch 'rs/export-strbuf-addchars'

    gitster authored
    Code clean-up.
    
    * rs/export-strbuf-addchars:
      strbuf: use strbuf_addchars() for adding a char multiple times
      strbuf: export strbuf_addchars()
Commits on Sep 9, 2014
  1. @gitster

    Merge branch 'nd/strbuf-utf8-replace'

    gitster authored
    * nd/strbuf-utf8-replace:
      utf8.c: fix strbuf_utf8_replace() consuming data beyond input string
Commits on Jun 6, 2014
  1. @gitster

    Merge branch 'tb/unicode-6.3-zero-width'

    gitster authored
    Update the logic to compute the display width needed for utf8
    strings and allow us to more easily maintain the tables used in
    that logic.
    
    We may want to let the users choose if codepoints with ambiguous
    widths are treated as a double or single width in a follow-up patch.
    
    * tb/unicode-6.3-zero-width:
      utf8: make it easier to auto-update git_wcwidth()
      utf8.c: use a table for double_width
Commits on Apr 16, 2014
  1. @gitster

    Merge branch 'tb/unicode-6.3-zero-width'

    gitster authored
    Teach our display-column-counting logic about decomposed umlauts
    and friends.
    
    * tb/unicode-6.3-zero-width:
      utf8.c: partially update to version 6.3
Commits on Mar 25, 2013
  1. @gitster

    Merge branch 'ks/rfc2047-one-char-at-a-time'

    gitster authored
    When "format-patch" quoted a non-ascii strings on the header files,
    it incorrectly applied rfc2047 and chopped a single character in
    the middle of it.
    
    * ks/rfc2047-one-char-at-a-time:
      format-patch: RFC 2047 says multi-octet character may not be split
Commits on Mar 21, 2013
  1. @gitster

    Merge branch 'jk/utf-8-can-be-spelled-differently'

    gitster authored
    Some platforms and users spell UTF-8 differently; retry with the
    most official "UTF-8" when the system does not understand the
    user-supplied encoding name that are the common alternative
    spellings of UTF-8.
    
    * jk/utf-8-can-be-spelled-differently:
      utf8: accept alternate spellings of UTF-8
Commits on Feb 14, 2013
  1. @gitster

    Merge branch 'jx/utf8-printf-width'

    gitster authored
    Use a new helper that prints a message and counts its display width
    to align the help messages parse-options produces.
    
    * jx/utf8-printf-width:
      Add utf8_fprintf helper that returns correct number of columns
Commits on Jan 2, 2013
  1. @gitster

    Merge branch 'sp/shortlog-missing-lf'

    gitster authored
    When a line to be wrapped has a solid run of non space characters
    whose length exactly is the wrap width, "git shortlog -w" failed to
    add a newline after such a line.
    
    * sp/shortlog-missing-lf:
      strbuf_add_wrapped*(): Remove unused return value
      shortlog: fix wrapping lines of wraplen
Commits on Dec 7, 2012
  1. @gitster

    Merge branch 'jc/same-encoding' into maint

    gitster authored
    Various codepaths checked if two encoding names are the same using
    ad-hoc code and some of them ended up asking iconv() to convert
    between "utf8" and "UTF-8".  The former is not a valid way to spell
    the encoding name, but often people use it by mistake, and we
    equated them in some but not all codepaths. Introduce a new helper
    function to make these codepaths consistent.
    
    * jc/same-encoding:
      reencode_string(): introduce and use same_encoding()
Commits on Nov 20, 2012
  1. @gitster

    Merge branch 'js/format-2047' into maint

    gitster authored
    Various rfc2047 quoting issues around a non-ASCII name on the From:
    line in the output from format-patch have been corrected.
    
    * js/format-2047:
      format-patch tests: check quoting/encoding in To: and Cc: headers
      format-patch: fix rfc2047 address encoding with respect to rfc822 specials
      format-patch: make rfc2047 encoding more strict
      format-patch: introduce helper function last_line_length()
      format-patch: do not wrap rfc2047 encoded headers too late
      format-patch: do not wrap non-rfc2047 headers too early
      utf8: fix off-by-one wrapping of text
Commits on Nov 15, 2012
  1. @gitster

    Merge branch 'jc/same-encoding'

    gitster authored
    Various codepaths checked if two encoding names are the same using
    ad-hoc code and some of them ended up asking iconv() to convert
    between "utf8" and "UTF-8".  The former is not a valid way to spell
    the encoding name, but often people use it by mistake, and we
    equated them in some but not all codepaths. Introduce a new helper
    function to make these codepaths consistent.
    
    * jc/same-encoding:
      reencode_string(): introduce and use same_encoding()
    
    Conflicts:
    	builtin/mailinfo.c
Commits on Nov 4, 2012
  1. @gitster @peff

    reencode_string(): introduce and use same_encoding()

    gitster authored peff committed
    Callers of reencode_string() that re-encodes a string from one
    encoding to another all used ad-hoc way to bypass the case where the
    input and the output encodings are the same.  Some did strcmp(),
    some did strcasecmp(), yet some others when converting to UTF-8 used
    is_encoding_utf8().
    
    Introduce same_encoding() helper function to make these callers use
    the same logic.  Notably, is_encoding_utf8() has a work-around for
    common misconfiguration to use "utf8" to name UTF-8 encoding, which
    does not match "UTF-8" hence strcasecmp() would not consider the
    same.  Make use of it in this helper function.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 2, 2010
  1. @gitster

    Merge branch 'rs/optim-text-wrap'

    gitster authored
    * rs/optim-text-wrap:
      utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
      utf8.c: remove strbuf_write()
      utf8.c: remove print_spaces()
      utf8.c: remove print_wrapped_text()
Commits on Jan 12, 2010
  1. @gitster

    utf8.c: mark file-local function static

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 23, 2009
  1. @gitster

    Teach --wrap to only indent without wrapping

    gitster authored
    When a zero or negative width is given to "shortlog -w<width>,<in1>,<in2>"
    and --format=%[wrap(w,in1,in2)...%], just indent the text by in1 without
    wrapping.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 7, 2008
  1. @gitster

    utf8_width(): allow non NUL-terminated input

    gitster authored
    The original interface assumed that the input string is
    always terminated with a NUL, but that wasn't too useful.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    utf8: pick_one_utf8_char()

    gitster authored
    utf8_width() function was doing two different things.  To pick a
    valid character from UTF-8 stream, and compute the display width of
    that character.  This splits the former to a separate function
    pick_one_utf8_char().
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 8, 2007
  1. @gitster

    Style: place opening brace of a function definition at column 1

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.