Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v1.7.2.1

Jul 27, 2010

  1. Junio C Hamano

    Git 1.7.2.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored
  2. Junio C Hamano

    Sync with 1.7.1.2

    authored
  3. Junio C Hamano

    Git 1.7.1.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored
  4. Junio C Hamano

    Sync with 1.7.0 series

    authored
  5. Junio C Hamano

    Git 1.7.0.7

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored
  6. jrn

    config --get --path: check for unset $HOME

    If $HOME is unset (as in some automated build situations),
    currently
    
    	git config --path path.home "~"
    	git config --path --get path.home
    
    segfaults.  Error out with
    
    	Failed to expand user dir in: '~/'
    
    instead.
    
    Reported-by: Julien Cristau <jcristau@debian.org>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed
  7. Stephen Boyd

    commit: remove full stop from usage help for -u

    From api-parse-options.txt:
    
      `description` is a short string to describe the effect of the option.
      It shall begin with a lower-case letter and a full stop (`.`) shall be
      omitted at the end.
    
    It also makes it less confusing if the argument is 'no.' or 'no'.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed
  8. Matthieu Moy

    Clarify help message when no remote is specified in fetch/pull.

    The message is especially confusing when "git fetch" is ran from "git
    pull", for users not aware of "git fetch". The new message makes it clear
    that "fetch" means "fetch new revisions", and gives hint on the solution.
    
    We don't add a advice.* configuration option since this message doesn't
    appear in normal use, and shouldn't disturb advanced users.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed
  9. trast

    Makefile: add check-docs exception for gitrevisions

    The manpage was added in 1ed6f2c (Documentation: gitrevisions,
    2010-07-05), but since it does not have a corresponding git command,
    it needs an exception for check-docs.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Acked-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed
  10. trast

    Fix 'git' wrapper usage string

    8b1fa77 (Allow passing of configuration parameters in the command
    line, 2010-03-26) forgot the closing ']' for the -c option.
    
    While we're there, also rewrap.  Instead of folding the last two lines
    together, try to highlight that COMMAND is required by starting a line
    with it.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed

Jul 26, 2010

  1. trast

    Documentation/git-push: Explain status output in more detail

    Mention the effects of the receive.deny* family of options for the
    "remote rejected" case.  While there, also split up the explanation
    into an easier-to-parse list format.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed
  2. trast

    Document receive.denyDeleteCurrent

    This option was introduced by 747ca24 (receive-pack:
    receive.denyDeleteCurrent, 2009-02-08) but never documented.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed
  3. trast

    Cast execl*() NULL sentinels to (char *)

    The NULL sentinel argument to the execl*() family of calls must be
    cast to (char *), as otherwise:
    
    - platforms where NULL is just 0 (not (void *)) would pass an int
    
    - (admittedly esoteric) platforms where NULL is (void *)0 and (void *)
      and (char *) have different memory layouts would pass the wrong kind
      of pointer
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed
  4. Nguyễn Thái Ngọc Duy

    git-read-tree.txt: acknowledge the directory matching bug in sparse c…

    …heckout
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed
  5. jonseymour

    INSTALL: configure /etc/xml/catalog to build docs on Cygwin

    Without additional configuration steps, the documentation build on Cygwin
    fails because the XML catalog is missing required rewrites for certain
    docbook resources.
    
    This patch documents the required configuration.
    
    Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed
  6. t3700-add: fix dependence on stdout and stderr buffering

    One test case checked the stdout and stderr of 'git add' by constructing a
    single 'expect' file that contained both streams. But when the command
    runs, the order of stdout and stderr output is unpredictable because it
    depends on how the streams are buffered. At least on Windows, the buffering
    is different from what the test case expected. Hence, check the two output
    texts separately.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed
  7. Brandon Casey

    git-rebase--interactive.sh: use printf instead of echo to print commi…

    …t message
    
    On systems with an echo which defaults to the XSI-conformant behavior
    (Solaris, or others using Ksh), echo will interpret certain backslashed
    characters as control sequences.  This can cause a problem for interactive
    rebase when it is used to rebase commits whose commit "subject" (the first
    line) contains any of these backslashed sequences.  In this case, echo will
    substitute the control sequence for the backslashed characters and either
    the rebased commit message will differ from the original, or the rebase
    process will fail.  Neither is desirable.
    
    So work around this issue by replacing the echo statements used to print
    out portions of the commit message, with printf.
    
    Also, add a test to test for this breakage.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Acked-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed
  8. Nathan Panike

    Add a google-chrome option for web--browse

    On some systems, the chrome browser is named google-chrome.  We add
    support for this case.
    
    Signed-off-by: Nathan W. Panike <nathan.panike@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed
  9. Junio C Hamano

    Merge branch 'maint-1.7.1' into maint

    * maint-1.7.1:
      request-pull.txt: Document -p option
      Check size of path buffer before writing into it
    authored
  10. Junio C Hamano

    Merge branch 'maint-1.7.0' into maint-1.7.1

    * maint-1.7.0:
      request-pull.txt: Document -p option
      Check size of path buffer before writing into it
    authored
  11. Junio C Hamano

    Merge branch 'maint-1.6.6' into maint-1.7.0

    * maint-1.6.6:
      request-pull.txt: Document -p option
      Check size of path buffer before writing into it
      rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
    authored
  12. Junio C Hamano

    Merge branch 'maint-1.6.5' into maint-1.6.6

    * maint-1.6.5:
      request-pull.txt: Document -p option
      Check size of path buffer before writing into it
      rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
    authored
  13. Stephen Boyd

    request-pull.txt: Document -p option

    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed
  14. Junio C Hamano

    Merge branch 'maint-1.6.4' into maint-1.6.5

    * maint-1.6.4:
      Check size of path buffer before writing into it
      rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
    authored

Jul 25, 2010

  1. Check size of path buffer before writing into it

    This prevents a buffer overrun that could otherwise be triggered by
    creating a file called '.git' with contents
    
      gitdir: (something really long)
    
    Signed-off-by: Greg Brockman <gdb@mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed

Jul 23, 2010

  1. Dan McGee

    git-instaweb: Don't assume Apache executable is named apache2

    On Arch Linux, the executable for the Apache HTTP server keeps
    the 'httpd' name and is not named 'apache2'. The path to the
    server modules also contains 'httpd' rather than 'apache2'.
    Remove some of these assumptions and add the httpd name in where
    it may be required. Finally, make some slight style adjustments
    to the code we are touching to make it fit the style of the rest
    of the script.
    
    Signed-off-by: Dan McGee <dpmcgee@gmail.com>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    authored Eric Wong committed
  2. Dan McGee

    git-instaweb: Fix Apache environment variable passing

    We were passing the non-existent GIT_EXEC_DIR through instead of the real
    GIT_EXEC_PATH. In addition, these weren't being passed at all for CGI (non
    mod_perl) execution so get them included there as well.
    
    Signed-off-by: Dan McGee <dpmcgee@gmail.com>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    authored Eric Wong committed
  3. Dan McGee

    git-instaweb: Fix custom apache log placement

    'CustomLog' is provided by mod_log_config so we need to include the module
    in our generated config. This was added in d94775e.
    
    Signed-off-by: Dan McGee <dpmcgee@gmail.com>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    authored Eric Wong committed

Jul 21, 2010

  1. Junio C Hamano

    Git 1.7.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored
  2. Junio C Hamano

    tests: correct "does reflog exist?" tests

    These two tests weren't about how "git reflog show <branch>" exits when
    there is no reflog, but were about "checkout" and "branch" create or not
    create reflog when creating a new <branch>.  Update the tests to check
    what we are interested in, using "git rev-parse --verify".
    
    Also lose tests based on "test -f .git/logs/refs/heads/<branch>" from
    nearby, to avoid exposing this particular implementation detail
    unnecessarily.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored
  3. Brandon Casey

    t/: work around one-shot variable assignment with test_must_fail

    See e200783
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed
  4. jrn

    t/README: correct an exception when breaking a && chain in tests

    The correct advice should have been taken from c289c31 (t/t7006: ignore
    return status of shell's unset builtin, 2010-06-02).  A real-life issue
    we experienced was with "unset", not with "export" (exporting an
    unset variable may have similar portability issues, though).
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed

Jul 20, 2010

  1. Brandon Casey

    t/{t5541,lib-httpd}: replace problematic '!()' notation with test_mus…

    …t_fail
    
    The '!()' notation is interpreted as a pattern-list on Ksh.  The Ksh man
    page describe it as follows:
    
       !(pattern-list)
          Matches anything except one of the given patterns.
    
    Ksh performs a file glob using the pattern-list and then tries to execute
    the first file in the list.  If a space is added between the '!' and the
    open parens, then Ksh will not interpret it as a pattern list, but in this
    case, it is preferred to use test_must_fail, so lets do so.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed
  2. Brandon Casey

    t/t3700: convert two uses of negation operator '!' to use test_must_fail

    These two lines use the negation '!' operator to negate the result of a
    simple command.  Since these commands do not contain any pipes or other
    complexities, the test_must_fail function can be used and is preferred
    since it will additionally detect termination due to a signal.
    
    This was noticed because the second use of '!' does not include a space
    between the '!' and the opening parens.  Ksh interprets this as follows:
    
       !(pattern-list)
          Matches anything except one of the given patterns.
    
    Ksh performs a file glob using the pattern-list and then tries to execute
    the first file in the list.  If a space is added between the '!' and the
    open parens, then Ksh will not interpret it as a pattern list, but in this
    case, it is preferred to use test_must_fail, so lets do so.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored gitster committed
  3. Junio C Hamano

    Merge branch 'maint'

    * maint:
      t/README: clarify test_must_fail description
      Check size of path buffer before writing into it
    
    Conflicts:
    	t/README
    authored
Something went wrong with that request. Please try again.