Permalink
Commits on Jul 27, 2010
  1. Git 1.7.1.2

    gitster committed Jul 27, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Sync with 1.7.0 series

    gitster committed Jul 27, 2010
  3. Git 1.7.0.7

    gitster committed Jul 27, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. config --get --path: check for unset $HOME

    jrn committed with gitster Jul 26, 2010
    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>
Commits on Jul 26, 2010
  1. Merge branch 'maint-1.7.0' into maint-1.7.1

    gitster committed Jul 26, 2010
    * maint-1.7.0:
      request-pull.txt: Document -p option
      Check size of path buffer before writing into it
  2. Merge branch 'maint-1.6.6' into maint-1.7.0

    gitster committed Jul 26, 2010
    * 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
  3. Merge branch 'maint-1.6.5' into maint-1.6.6

    gitster committed Jul 26, 2010
    * 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
  4. request-pull.txt: Document -p option

    bebarino committed with gitster Jul 23, 2010
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Merge branch 'maint-1.6.4' into maint-1.6.5

    gitster committed Jul 26, 2010
    * maint-1.6.4:
      Check size of path buffer before writing into it
      rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
Commits on Jul 25, 2010
  1. Check size of path buffer before writing into it

    Greg Brockman committed with gitster Jul 20, 2010
    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>
Commits on Jul 20, 2010
  1. t/README: clarify test_must_fail description

    drafnel committed with gitster Jul 20, 2010
    Some have found the wording of the description to be somewhat ambiguous
    with respect to when it is desirable to use test_must_fail instead of
    "! <git-command>".  Tweak the wording somewhat to hopefully clarify that
    it is _because_ test_must_fail can detect segmentation fault that it is
    desirable to use it instead of "! <git-command>".
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Check size of path buffer before writing into it

    Greg Brockman committed with gitster Jul 20, 2010
    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>
Commits on Jul 19, 2010
  1. update-server-info: Shorten read_pack_info_file()

    ralfth committed with gitster Jul 19, 2010
    The correct responses to a D and a T line in .git/objects/info/packs
    are the same, so combine their case arms.  In both cases we already
    ‘goto’ out of the switch so while at it, remove a redundant ‘break’
    to avoid yet another line of code.
    
    Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
    Reviewed-by: Jonathan Nieder <jrnieder <at> gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Documentation: Explain git-mergetool's use of temporary files

    davvid committed with gitster Jul 18, 2010
    'git mergetool' creates '*.orig' backup files in its
    default configuration.  Mention this in its documentation.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 15, 2010
  1. Documentation: add submodule.* to the big configuration variable list

    jrn committed with gitster Jul 15, 2010
    The url, path, and the update items in [submodule "foo"] stanzas
    are nicely explained in the .gitmodules and ‘git submodule’
    documentation.  Point there from the config documentation.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Johan Herland <johan@herland.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. gitmodules.5: url can be a relative path

    jrn committed with gitster Jul 15, 2010
    There is already excellent documentation for this facility in
    git-submodule.1, but it is not so discoverable.
    
    Relative paths in .gitmodules can be useful for serving the
    same repository over multiple protocols, for example.
    Thanks to Peter for pointing this out.
    
    Cc: Peter Krefting <peter@softwolves.pp.se>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Johan Herland <johan@herland.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. gitweb: fix esc_url

    pksunkara committed with gitster Jul 15, 2010
    Earlier, 452e225 (gitweb: fix esc_param, 2009-10-13) fixed CGI escaping
    rules used in esc_url.  A very similar logic exists in esc_param and needs
    to be fixed the same way.
    
    Signed-off-by: Pavan Kumar Sunkara <pavan.sss1991@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 13, 2010
  1. git fetch documentation: describe short '-p' synonym to '--prune' option

    orenhe committed with gitster Jul 13, 2010
    It's already implemented, just undocumented.
    
    Signed-off-by: Oren Held <orenhe@il.ibm.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. format-patch: document the format.to configuration setting

    Miklos Vajna committed with gitster Jul 12, 2010
    [jc: with simplification from Jonathan Nieder]
    
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 10, 2010
  1. Documentation: Spelling fix in protocol-capabilities.txt

    frsk committed with gitster Jul 10, 2010
    Signed-off-by: Fredrik Skolmli <fredrik@frsk.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 9, 2010
  1. checkout: accord documentation to what git does

    Nicolas Sebrecht committed with gitster Jul 9, 2010
    Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. t0005: work around strange $? in ksh when program terminated by a signal

    j6t committed with gitster Jul 9, 2010
    ksh93 is known to report $? of programs that terminated by a signal as
    256 + signal number instead of 128 + signal number like other POSIX
    compliant shells (ksh's behavior is still POSIX compliant in this regard).
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 7, 2010
  1. backmerge a few more fixes to 1.7.1.X series

    gitster committed Jul 7, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'maint-1.6.4' into maint

    gitster committed Jul 7, 2010
    * maint-1.6.4:
      rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
  3. rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option

    Uwe Kleine-König committed with gitster Jul 6, 2010
    The ?: operator has a lower priority than |, so the implicit associativity
    made the 6th argument of parse_options be PARSE_OPT_KEEP_DASHDASH if
    keep_dashdash was true discarding PARSE_OPT_STOP_AT_NON_OPTION and
    PARSE_OPT_SHELL_EVAL.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge branch 'mg/doc-rev-parse-treepath-syntax' into maint

    gitster committed Jul 7, 2010
    * mg/doc-rev-parse-treepath-syntax:
      git-rev-parse.txt: Add more examples for caret and colon
      git-rev-parse.txt: Document ":path" specifier
  5. Merge branch 'tr/receive-pack-aliased-update-fix' into maint

    gitster committed Jul 7, 2010
    * tr/receive-pack-aliased-update-fix:
      check_aliased_update: strcpy() instead of strcat() to copy
      receive-pack: detect aliased updates which can occur with symrefs
      receive-pack: switch global variable 'commands' to a parameter
    
    Conflicts:
    	t/t5516-fetch-push.sh
  6. fix git branch -m in presence of cross devices

    MadCoder committed with gitster Jul 7, 2010
    When you have for example a bare repository stored on NFS, and that you
    create new workdirs locally (using contrib's git-new-workdir), logs/refs
    is a symlink to a different device. Hence when the reflogs are renamed,
    all must happen below logs/refs or one gets cross device rename errors
    like:
    
      git branch -m foo
      error: unable to move logfile logs/refs/heads/master to tmp-renamed-log: Invalid cross-device link
      fatal: Branch rename failed
    
    The fix is hence to use logs/refs/.tmp-renamed-log as a temporary log
    name, instead of just tmp-renamed-log.
    
    Signed-off-by: Pierre Habouzit <madcoder@debian.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. add missing && to submodule-merge testcase

    hvoigt committed with gitster Jul 6, 2010
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 6, 2010
  1. test-date: fix sscanf type conversion

    peff committed with gitster Jul 6, 2010
    Reading into a time_t isn't portable, since we don't know
    the exact type. Instead, use an unsigned long, which is what
    show_date wants, anyway.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. xdiff: optimise for no whitespace difference when ignoring whitespace.

    dgreid committed with gitster Jul 6, 2010
    In xdl_recmatch, do the memcmp to check if the two lines are equal before
    checking if whitespace flags are set.  If the lines are identical, then
    there is no need to check if they differ only in whitespace.
    This makes the common case (there is no whitespace difference) faster.
    It costs the case where lines are the same length and contain
    whitespace differences, but the common case is more than 20% faster.
    
    Signed-off-by: Dylan Reid <dgreid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 5, 2010
  1. t0006: test timezone parsing

    peff committed with gitster Jul 4, 2010
    Previously, test-date simply ignored the parsed timezone and
    told show_date() to use UTC. Instead, let's print out what
    we actually parsed.
    
    While we're at it, let's make it easy for tests to work in a specific
    timezone.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. rerere.txt: Document forget subcommand

    mjg committed with gitster Jul 5, 2010
    dea4562 (rerere forget path: forget recorded resolution, 2009-12-25)
    introduced the forget subcommand for rerere.
    
    Document it.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 2, 2010
  1. Documentation/git-gc.txt: add reference to githooks

    cpackham committed with gitster Jun 30, 2010
    This advertises the existence of the 'pre-auto-gc' hook and adds a cross
    reference to where the hook is documented.
    
    Signed-off-by: Chris Packham <judge.packham@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 29, 2010
  1. Git 1.7.1.1

    gitster committed Jun 29, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>