Skip to content
Commits on Dec 15, 2012
  1. @gitster

    Git 1.8.1-rc2

    gitster committed Dec 15, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @tacker66 @gitster

    Renumber list in api-command.txt

    tacker66 committed with gitster Dec 15, 2012
    Start list with 1 instead of 0; ASCIIDOC will renumber it anyway.
    
    Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @peff @gitster

    remote-testsvn: fix unitialized variable

    peff committed with gitster Dec 14, 2012
    In remote-test-svn, there is a parse_rev_note function to
    parse lines of the form "Revision-number" from notes. If it
    finds such a line and parses it, it returns 0, copying the
    value into a "struct rev_note". If it finds an entry that is
    garbled or out of range, it returns -1 to signal an error.
    
    However, if it does not find any "Revision-number" line at
    all, it returns success but does not put anything into the
    rev_note. So upon a successful return, the rev_note may or
    may not be initialized, and the caller has no way of
    knowing.
    
    gcc does not usually catch the use of the unitialized
    variable because the conditional assignment happens in a
    separate function from the point of use. However, when
    compiling with -O3, gcc will inline parse_rev_note and
    notice the problem.
    
    We can fix it by returning "-1" when no note is found (so on
    a zero return, we always found a valid value).
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 13, 2012
  1. @gitster

    Merge branch 'maint'

    gitster committed Dec 13, 2012
  2. @gitster

    Fix sizeof usage in get_permutations

    Matthew Daley committed with gitster Dec 14, 2012
    Currently it gets the size of an otherwise unrelated, unused variable
    instead of the expected struct size.
    
    Signed-off-by: Matthew Daley <mattjd@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'mh/doc-remote-helpers'

    gitster committed Dec 13, 2012
    * mh/doc-remote-helpers:
      git-remote-helpers.txt: clarify options & ref list attributes
      git-remote-helpers.txt: clarify command <-> capability correspondences
      git-remote-helpers.txt: rearrange description of capabilities
      git-remote-helpers.txt: minor grammar fix
      git-remote-helpers.txt: document missing capabilities
      git-remote-helpers.txt: document invocation before input format
  4. @perillo @gitster

    git.txt: add missing info about --git-dir command-line option

    perillo committed with gitster Dec 13, 2012
    Unlike other environment variables (e.g. GIT_WORK_TREE,	GIT_NAMESPACE),
    the Documentation/git.txt file did not mention that the GIT_DIR
    environment variable can also be set using the --git-dir command line
    option.
    
    Signed-off-by: Manlio Perillo <manlio.perillo@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 12, 2012
  1. @gitster

    git(1): show link to contributor summary page

    gitster committed Dec 12, 2012
    We earlier removed a link to list of contributors that pointed to a
    defunct page; let's use a working one from Ohloh.net to replace it
    instead.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'so/prompt-command'

    gitster committed Dec 12, 2012
    * so/prompt-command:
      git-prompt.sh: update PROMPT_COMMAND documentation
  3. @gitster

    git-prompt.sh: update PROMPT_COMMAND documentation

    gitster committed Dec 11, 2012
    The description of __git_ps1 function operating in two-arg mode was
    not very clear.  It said "set PROMPT_COMMAND=__git_ps1" which is not
    the right usage for this mode, followed by "To customize the prompt,
    do this", giving a false impression that those who do not want to
    customize it can get away with no-arg form, which was incorrect.
    
    Make it clear that this mode always takes two arguments, pre and
    post, with an example.
    
    The straight-forward one should be listed as the primary usage, and
    the confusing one should be an alternate for advanced users.  Swap
    the order of these two.
    
    Acked-by: Simon Oosthoek <s.oosthoek@xs4all.nl>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Add file completion to tcsh git completion.

    Marc Khouzam committed with gitster Dec 11, 2012
    For bash completion, the option '-o bashdefault' is used to indicate
    that when no other choices are available, file completion should be
    performed.  Since this option is not available in tcsh, no file
    completion is ever performed.  Therefore, commands like 'git add ',
    'git send-email ', etc, require the user to manually type out
    the file name.  This can be quite annoying.
    
    To improve the user experience we try to simulate file completion
    directly in this script (although not perfectly).
    
    The known issues with the file completion simulation are:
    - Possible completions are shown with their directory prefix.
    - Completions containing shell variables are not handled.
    - Completions with ~ as the first character are not handled.
    
    Signed-off-by: Marc Khouzam <marc.khouzam@ericsson.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 11, 2012
  1. @gitster

    Merge branch 'ef/mingw-rmdir'

    gitster committed Dec 11, 2012
    MinGW has a workaround when rmdir unnecessarily fails to retry with
    a prompt, but the logic was kicking in when the rmdir failed with
    ENOTEMPTY, i.e. was expected to fail and there is no point retrying.
    
    * ef/mingw-rmdir:
      mingw_rmdir: do not prompt for retry when non-empty
  2. @gitster

    Merge branch 'ef/mingw-tty-getpass'

    gitster committed Dec 11, 2012
    Update getpass() emulation for MinGW.
    
    * ef/mingw-tty-getpass:
      mingw: get rid of getpass implementation
      mingw: reuse tty-version of git_terminal_prompt
      compat/terminal: separate input and output handles
      compat/terminal: factor out echo-disabling
      mingw: make fgetc raise SIGINT if apropriate
      mingw: correct exit-code for SIGALRM's SIG_DFL
  3. @gitster

    Merge branch 'maint'

    gitster committed Dec 11, 2012
    * maint:
      git-prompt: Document GIT_PS1_DESCRIBE_STYLE
  4. @andersk @gitster

    git-prompt: Document GIT_PS1_DESCRIBE_STYLE

    andersk committed with gitster Dec 11, 2012
    GIT_PS1_DESCRIBE_STYLE was introduced in v1.6.3.2~35.  Document it in the
    header comments.
    
    Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 10, 2012
  1. @gitster

    Sync with 1.8.0.2

    gitster committed Dec 10, 2012
    * maint:
      Git 1.8.0.2
      Documentation/git-stash.txt: add a missing verb
      git(1): remove a defunct link to "list of authors"
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Git 1.8.0.2

    gitster committed Dec 10, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @slattarini @gitster

    Makefile: whitespace style fixes in macro definitions

    slattarini committed with gitster Dec 9, 2012
    Consistently use a single space before and after the "=" (or ":=", "+=",
    etc.) in assignments to make macros.  Granted, this was not a big deal,
    but I did find the needless inconsistency quite distracting.
    
    Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @kusma @gitster

    mingw_rmdir: do not prompt for retry when non-empty

    kusma committed with gitster Dec 10, 2012
    in ab1a11b ("mingw_rmdir: set errno=ENOTEMPTY when appropriate"),
    a check was added to prevent us from retrying to delete a directory
    that is both in use and non-empty.
    
    However, this logic was slightly flawed; since we didn't return
    immediately, we end up falling out of the retry-loop, but right into
    the prompting-loop.
    
    Fix this by setting errno, and guarding the prompting-loop with an
    errno-check.
    
    Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @sloriot @gitster

    Documentation/git-stash.txt: add a missing verb

    sloriot committed with gitster Dec 10, 2012
    Signed-off-by: Sébastien Loriot <sloriot.ml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 9, 2012
  1. @gitster

    git(1): remove a defunct link to "list of authors"

    gitster committed Dec 7, 2012
    The linked page has not been showing the promised "more complete
    list" for more than 6 months by now, and nobody has resurrected
    the list there nor elsewhere since then.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 7, 2012
  1. @gitster

    Git 1.8.1-rc1

    gitster committed Dec 7, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Documentation/diff-config: work around AsciiDoc misfortune

    gitster committed Dec 7, 2012
    The line that happens to begin with indent followed by "3. " was
    interpreted as if it was an enumerated list; just wrap the lines
    differently to work it around for now.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'maint'

    gitster committed Dec 7, 2012
    * maint:
      Update draft release notes to 1.8.0.2
  4. @gitster

    Update draft release notes to 1.8.0.2

    gitster committed Dec 7, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    Merge branch 'jc/doc-push-satellite' into maint

    gitster committed Dec 7, 2012
    * jc/doc-push-satellite:
      Documentation/git-push.txt: clarify the "push from satellite" workflow
  6. @gitster

    Merge branch 'jc/same-encoding' into maint

    gitster committed Dec 7, 2012
    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()
  7. @gitster

    Merge branch 'lt/diff-stat-show-0-lines' into maint

    gitster committed Dec 7, 2012
    "git diff --stat" miscounted the total number of changed lines when
    binary files were involved and hidden beyond --stat-count.  It also
    miscounted the total number of changed files when there were
    unmerged paths.
    
    * lt/diff-stat-show-0-lines:
      t4049: refocus tests
      diff --shortstat: do not count "unmerged" entries
      diff --stat: do not count "unmerged" entries
      diff --stat: move the "total count" logic to the last loop
      diff --stat: use "file" temporary variable to refer to data->files[i]
      diff --stat: status of unmodified pair in diff-q is not zero
      test: add failing tests for "diff --stat" to t4049
      Fix "git diff --stat" for interesting - but empty - file changes
  8. @fingolfin @gitster

    git-remote-helpers.txt: clarify options & ref list attributes

    fingolfin committed with gitster Nov 28, 2012
    The documentation was misleading in that it gave the impression that
    'for-push' could be used as a ref attribute in the output of the
    'list' command. That is wrong.
    
    Also, explicitly point out the connection between the commands
    'list' and 'options' on the one hand, and the sections
    'REF LIST ATTRIBUTES' and 'OPTIONS' on the other hand.
    
    Signed-off-by: Max Horn <max@quendi.de>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. @fingolfin @gitster

    git-remote-helpers.txt: clarify command <-> capability correspondences

    fingolfin committed with gitster Nov 28, 2012
    In particular, document 'list for-push' separately from 'list', as
    the former needs only be supported for the push/export
    capabilities, and the latter only for fetch/import. Indeed, a
    hypothetically 'push-only' helper would only need to support the
    former, not the latter.
    
    Signed-off-by: Max Horn <max@quendi.de>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. @fingolfin @gitster

    git-remote-helpers.txt: rearrange description of capabilities

    fingolfin committed with gitster Nov 28, 2012
    This also remove some duplication in the descriptions
    (e.g. refspec was explained twice with similar level of detail).
    
    Signed-off-by: Max Horn <max@quendi.de>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. @fingolfin @gitster

    git-remote-helpers.txt: minor grammar fix

    fingolfin committed with gitster Nov 28, 2012
    Signed-off-by: Max Horn <max@quendi.de>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. @fingolfin @gitster

    git-remote-helpers.txt: document missing capabilities

    fingolfin committed with gitster Nov 28, 2012
    Specifically, document the 'export' and '(im|ex)port-marks'
    capabilities as well as the export command, which were
    undocumented (but in active use).
    
    Signed-off-by: Max Horn <max@quendi.de>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. @fingolfin @gitster

    git-remote-helpers.txt: document invocation before input format

    fingolfin committed with gitster Nov 28, 2012
    In the distant past, the order things were documented was
    'Invocation', 'Commands', 'Capabilities', ...
    
    Then it was decided that before giving a list of Commands, there
    should be an overall description of the 'Input format', which was
    a wise decision. However, this description was put as the very
    first thing, with the rationale that any implementor would want
    to know that first.
    
    However, it seems an implementor would actually first need to
    know how the remote helper will be invoked, so moving
    'Invocation' to the front again seems logical. Moreover, we now
    don't switch from discussing the input format to the invocation
    style and then back to input related stuff.
    
    Signed-off-by: Max Horn <max@quendi.de>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. @gitster

    Merge branch 'master' of git://github.com/git-l10n/git-po

    gitster committed Dec 7, 2012
    * 'master' of git://github.com/git-l10n/git-po:
      l10n: de.po: translate 22 new messages
      l10n: de.po: translate 825 new messages
      l10n: Update Swedish translation (1979t0f0u)
      l10n: vi.po: update to git-v1.8.0.1-347-gf94c3
      l10n: Update git.pot (5 new, 1 removed messages)
Something went wrong with that request. Please try again.