Permalink
Commits on Jun 1, 2011
  1. Git 1.7.5.4

    gitster committed Jun 1, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jk/maint-config-alias-fix' into maint

    gitster committed Jun 1, 2011
    * jk/maint-config-alias-fix:
      handle_options(): do not miscount how many arguments were used
      config: always parse GIT_CONFIG_PARAMETERS during git_config
      git_config: don't peek at global config_parameters
      config: make environment parsing routines static
  3. Merge branch 'jc/fmt-req-fix' into maint

    gitster committed Jun 1, 2011
    * jc/fmt-req-fix:
      userformat_find_requirements(): find requirement for the correct format
  4. Merge branch 'jk/maint-docs' into maint

    gitster committed Jun 1, 2011
    * jk/maint-docs:
      docs: fix some antique example output
      docs: make sure literal "->" isn't converted to arrow
      docs: update status --porcelain format
      docs: minor grammar fixes to git-status
  5. Merge branch 'jn/doc-remote-helpers' into maint

    gitster committed Jun 1, 2011
    * jn/doc-remote-helpers:
      Documentation: do not misinterpret refspecs as bold text
  6. Merge branch 'kk/maint-prefix-in-config-mak' into maint

    gitster committed Jun 1, 2011
    * kk/maint-prefix-in-config-mak:
      config.mak.in: allow "configure --sysconfdir=/else/where"
  7. diffcore-rename.c: avoid set-but-not-used warning

    meyering authored and gitster committed Apr 29, 2011
    Since 9d8a5a5 (diffcore-rename: refactor "too many candidates" logic,
    2011-01-06), diffcore_rename() initializes num_src but does not use it
    anymore.  "-Wunused-but-set-variable" in gcc-4.6 complains about this.
    
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 31, 2011
  1. Start 1.7.5.4 draft release notes

    gitster committed May 31, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'tr/add-i-no-escape' into maint

    gitster committed May 31, 2011
    * tr/add-i-no-escape:
      add -i: ignore terminal escape sequences
  3. Merge branch 'vh/config-interactive-singlekey-doc' into maint

    gitster committed May 31, 2011
    * vh/config-interactive-singlekey-doc:
      git-reset.txt: better docs for '--patch'
      git-checkout.txt: better docs for '--patch'
      git-stash.txt: better docs for '--patch'
      git-add.txt: document 'interactive.singlekey'
      config.txt: 'interactive.singlekey; is used by...
  4. Merge branch 'ml/test-readme' into maint

    gitster committed May 31, 2011
    * ml/test-readme:
      t/README: unify documentation of test function args
  5. Merge branch 'ab/i18n-fixup' into maint

    gitster committed May 31, 2011
    * ab/i18n-fixup: (24 commits)
      i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
      i18n: use test_i18n{grep,cmp} in t7508
      i18n: use test_i18ngrep in t7506
      i18n: use test_i18ngrep and test_i18ncmp in t7502
      i18n: use test_i18ngrep in t7501
      i18n: use test_i18ncmp in t7500
      i18n: use test_i18ngrep in t7201
      i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
      i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
      i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
      i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
      i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
      i18n: use test_i18ngrep in lib-httpd and t2019
      i18n: do not overuse C_LOCALE_OUTPUT (grep)
      i18n: use test_i18ncmp in t1200 and t2200
      i18n: .git file is not a human readable message (t5601)
      i18n: do not overuse C_LOCALE_OUTPUT
      i18n: mark init-db messages for translation
      i18n: mark checkout plural warning for translation
      i18n: mark checkout --detach messages for translation
      ...
  6. Merge branch 'jc/rename-degrade-cc-to-c' into maint

    gitster committed May 31, 2011
    * jc/rename-degrade-cc-to-c:
      diffcore-rename: fall back to -C when -C -C busts the rename limit
      diffcore-rename: record filepair for rename src
      diffcore-rename: refactor "too many candidates" logic
      builtin/diff.c: remove duplicated call to diff_result_code()
  7. Merge branch 'rr/doc-content-type' into maint

    gitster committed May 31, 2011
    * rr/doc-content-type:
      Documentation: Allow custom diff tools to be specified in 'diff.tool'
      Documentation: Add diff.<driver>.* to config
      Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
      Documentation: Add filter.<driver>.* to config
Commits on May 30, 2011
  1. Documentation: do not misinterpret refspecs as bold text

    jrn authored and gitster committed May 30, 2011
    In v1.7.3.3~2 (Documentation: do not misinterpret pull refspec as bold
    text, 2010-12-03) many uses of asterisks in expressions like
    "refs/heads/*:refs/svn/origin/branches/*" were escaped as {asterisk}
    to avoid being treated as delimiters for bold text, but these two were
    missed.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jm/maint-misc-fix' into maint

    gitster committed May 30, 2011
    * jm/maint-misc-fix:
      read_gitfile_gently: use ssize_t to hold read result
      remove tests of always-false condition
      rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
  3. Merge branch 'bc/maint-submodule-fix-parked' into maint

    gitster committed May 30, 2011
    * bc/maint-submodule-fix-parked:
      git-submodule.sh: separate parens by a space to avoid confusing some shells
  4. Merge branch 'bc/maint-api-doc-parked' into maint

    gitster committed May 30, 2011
    * bc/maint-api-doc-parked:
      Documentation/technical/api-diff.txt: correct name of diff_unmerge()
  5. Merge branch 'jn/run-command-error-failure' into maint

    gitster committed May 30, 2011
    * jn/run-command-error-failure:
      run-command: handle short writes and EINTR in die_child
      tests: check error message from run_command
Commits on May 27, 2011
  1. config.mak.in: allow "configure --sysconfdir=/else/where"

    gitster committed May 5, 2011
    We do allow vanilla Makefile users to say make sysconfdir=/else/where
    and config.mak can also be tweaked manually for the same effect. Give
    the same configurablity to ./configure users as well.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. docs: fix some antique example output

    peff authored and gitster committed May 27, 2011
    These diff-index and diff-tree sample outputs date back to
    the first month of git's existence. The output format has
    changed slightly since then, so let's have it match the
    current output.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. docs: make sure literal "->" isn't converted to arrow

    peff authored and gitster committed May 27, 2011
    Recent versions of asciidoc will treat "->" as a
    single-glyph arrow symbol, unless it is inside a literal
    code block. This is a problem if we are discussing literal
    output and want to show the ASCII characters.
    
    Our usage falls into three categories:
    
      1. Inside a code block. These can be left as-is.
    
      2. Discussing literal output or code, but inside a
         paragraph. This patch escapes these as "\->".
    
      3. Using the arrow as a symbolic element, such as "use the
         Edit->Account Settings menu". In this case, the
         arrow symbol is preferable, so we leave it as-is.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. docs: update status --porcelain format

    peff authored and gitster committed May 27, 2011
    The --porcelain format was originally identical to the
    --short format, but designed to be stable as the short
    format changed. Since this was written, the short format
    picked up a few incompatible niceties, but this description
    was never changed.
    
    Let's mention the differences. While we're at it, let's add
    some sub-section headings to make the "output" section a
    little easier to navigate.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. docs: minor grammar fixes to git-status

    peff authored and gitster committed May 27, 2011
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 26, 2011
  1. git-submodule.sh: separate parens by a space to avoid confusing some …

    drafnel authored and gitster committed May 26, 2011
    …shells
    
    Some shells interpret '(( ))' according to the rules for arithmetic
    expansion.  This may not follow POSIX, but is prevalent in commonly used
    shells.  Bash does not have a problem with this particular instance of
    '((', likely because it is not followed by a '))', but the public domain
    ksh does, and so does ksh on IRIX 6.5.
    
    So, add a space between the parenthesis to avoid confusing these shells.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Documentation/technical/api-diff.txt: correct name of diff_unmerge()

    drafnel authored and gitster committed May 26, 2011
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. read_gitfile_gently: use ssize_t to hold read result

    peff authored and gitster committed May 26, 2011
    Otherwise, a negative error return becomes a very large read
    value. We catch this in practice because we compare the
    expected and actual numbers of bytes (and you are not likely
    to be reading (size_t)-1 bytes), but this makes the
    correctness a little more obvious.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. remove tests of always-false condition

    meyering authored and gitster committed May 26, 2011
    * fsck.c (fsck_error_function): Don't test obj->sha1 == 0.
    It can never be true, since that sha1 member is an array.
    * transport.c (set_upstreams): Likewise for ref->new_sha1.
    
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB an…

    meyering authored and gitster committed May 26, 2011
    …d '\0'
    
    If we reach EOF after the SHA1-then-TAB, yet before the NUL that
    terminates each file name, we would fill the file name buffer with \255
    bytes resulting from the repeatedly-failing fgetc (returns EOF/-1) and
    ultimately complain about "filename too long", because no NUL was
    encountered.
    
    Signed-off-by: Jim Meyering <jim@meyering.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Git 1.7.5.3

    gitster committed May 26, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Merge branch 'maint-1.7.4' into maint

    gitster committed May 26, 2011
    * maint-1.7.4:
  8. Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4

    gitster committed May 26, 2011
    * jk/git-connection-deadlock-fix:
      test core.gitproxy configuration
      send-pack: avoid deadlock on git:// push with failed pack-objects
      connect: let callers know if connection is a socket
      connect: treat generic proxy processes like ssh processes
    
    Conflicts:
    	connect.c
  9. Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into mai…

    gitster committed May 26, 2011
    …nt-1.7.4
    
    * js/maint-send-pack-stateless-rpc-deadlock-fix:
      sideband_demux(): fix decl-after-stmt
      send-pack: unbreak push over stateless rpc
      send-pack: avoid deadlock when pack-object dies early
  10. Merge branch 'jk/maint-upload-pack-shallow' into maint-1.7.4

    gitster committed May 26, 2011
    * jk/maint-upload-pack-shallow:
      upload-pack: start pack-objects before async rev-list
  11. Merge branch 'jm/maint-diff-words-with-sbe' into maint

    gitster committed May 26, 2011
    * jm/maint-diff-words-with-sbe:
      do not read beyond end of malloc'd buffer