Skip to content
Commits on Oct 8, 2009
  1. @bebarino @gitster

    completion: add dirstat and friends to diff options

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

    completion: update am, commit, and log

    bebarino committed with gitster
    git am learned --scissors, git commit learned --dry-run and git log
    learned --decorate=long|short recently.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @drafnel @gitster

    Makefile: enable THREADED_DELTA_SEARCH on SunOS

    drafnel committed with gitster
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Merge branch 'maint'

    gitster committed
    * maint:
      fast-import.c::validate_raw_date(): really validate the value
Commits on Oct 7, 2009
  1. @gitster

    fast-import.c::validate_raw_date(): really validate the value

    gitster committed
    When reading the "raw format" timestamp from the input stream, make sure
    that the timezone offset is a reasonable value by imitating 7122f82
    (date.c: improve guess between timezone offset and year., 2006-06-08).
    
    We _might_ want to also check if the timestamp itself is reasonable, but
    that is left for a separate commit.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @snaewe @gitster

    README: git lives at http://git-scm.com these days

    snaewe committed with gitster
    Signed-off-by: Stefan Naewe <stefan.naewe+git@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 5, 2009
  1. @gitster

    git-pull: dead code removal

    gitster committed
    Back when a74b170 (git-pull: disallow implicit merging to detached HEAD,
    2007-01-15) added this check, $? referred to the error status of reading
    HEAD as a symbolic-ref; but cd67e4d (Teach 'git pull' about --rebase,
    2007-11-28) moved the command away from where the check is, and nobody
    noticed the breakage.  Ever since, $? has always been 0 (tr at the end of
    the pipe to find merge_head never fails) and other case arms were never
    reached.
    
    These days, error_on_no_merge_candidates function is prepared to handle a
    detached HEAD case, which was what the code this patch removes used to
    handle.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 4, 2009
  1. @gitster

    Merge branch 'maint'

    gitster committed
    * maint:
      show-branch: fix segfault when showbranch.default exists
  2. @gitster

    Merge branch 'jc/maint-1.6.4-show-branch-default' into maint

    gitster committed
    * jc/maint-1.6.4-show-branch-default:
      show-branch: fix segfault when showbranch.default exists
  3. @gitster

    show-branch: fix segfault when showbranch.default exists

    gitster committed
    When running "git show-branch" without any parameter in a repository that
    has showbranch.default defined, we used to rely on the fact that our
    handcrafted option parsing loop never looked at av[0].
    
    The array of default strings had the first real command line argument in
    default_arg[0], but the option parser wanted to look at the array starting
    at av[1], so we assigned the address of -1th element to av to force the
    loop start working from default_arg[0].
    
    This no longer worked since 5734365 (show-branch: migrate to parse-options
    API, 2009-05-21), as parse_options_start() saved the incoming &av[0] in
    its ctx->out and later in parse_options_end() it did memmove to ctx->out
    (with ctx->cpidx == 0), overwriting the memory before default_arg[] array.
    
    I am not sure if this is a bug in parse_options(), or a bug in the caller,
    and tonight I do not have enough concentration to figure out which.  In
    any case, this patch works the issue around.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 3, 2009
  1. @peff

    Fix '--relative-date'

    Johan Sageryd committed with peff
    This fixes '--relative-date' so that it does not give '0
    year, 12 months', for the interval 360 <= diff < 365.
    
    Signed-off-by: Johan Sageryd <j416@1616.se>
    Signed-off-by: Jeff King <peff@peff.net>
Commits on Oct 2, 2009
  1. @ferrous26 @peff

    tests: make all test files executable

    ferrous26 committed with peff
    For consistency with the rest of the test files.
    
    Signed-off-by: Mark Rada <marada@uwaterloo.ca>
    Signed-off-by: Jeff King <peff@peff.net>
  2. @adambrewster @peff

    filter-branch: add --prune-empty to option summary

    adambrewster committed with peff
    Signed-off-by: Adam Brewster <adambrewster@gmail.com>
    Signed-off-by: Jeff King <peff@peff.net>
  3. @peff

    Fix some printf format warnings

    Ramsay Jones committed with peff
    commit 51ea551 ("make sure byte swapping is optimal for git"
    2009-08-18) introduced a "sane definition for ntohl()/htonl()"
    for use on some GNU C platforms. Unfortunately, for some of
    these platforms, this results in the introduction of a problem
    which is essentially the reverse of a problem that commit 6e1c234
    ("Fix some warnings (on cygwin) to allow -Werror" 2008-07-3) was
    intended to fix.
    
    In particular, on platforms where the uint32_t type is defined
    to be unsigned long, the return type of the new ntohl()/htonl()
    is causing gcc to issue printf format warnings, such as:
    
        warning: long unsigned int format, unsigned int arg (arg 3)
    
    (nine such warnings, covering six different files). The earlier
    commit (6e1c234) needed to suppress these same warnings, except
    that the types were in the opposite direction; namely the format
    specifier ("%u") was 'unsigned int' and the argument type (ie the
    return type of ntohl()) was 'long unsigned int' (aka uint32_t).
    
    In order to suppress these warnings, the earlier commit used the
    (C99) PRIu32 format specifier, since the definition of this macro
    is suitable for use with the uint32_t type on that platform.
    This worked because the return type of the (original) platform
    ntohl()/htonl() functions was uint32_t.
    
    In order to suppress these warnings, we change the return type of
    the new byte swapping functions in the compat/bswap.h header file
    from 'unsigned int' to uint32_t.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Acked-by: Nicolas Pitre <nico@fluxnic.net>
    Signed-off-by: Jeff King <peff@peff.net>
Commits on Sep 29, 2009
  1. @gitster @spearce

    builtin-mailinfo.c: check error status from rewind and ftruncate

    gitster committed with spearce
    A recent "cut at scissors" implementation rewinds and truncates
    the output file to store the message when it sees a scissors mark,
    but it did not check if these library calls succeeded.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    [sp: Use fseek as rewind returns void]
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  2. @sschuberth @spearce

    Make just opening the generated MSVC solution file not modify it

    sschuberth committed with spearce
    The format of the generated MSVC solution file is fixed in a way that
    just opening it in Visual Studio and immediately closing it again
    without performing any modifications does not trigger a prompt to save
    the solution file. This behavior was caused by several minor
    incompatibilities between the generated file and what Visual Studio
    2008 expected, so Visual Studio transparently fixed the file format,
    marking it internally as modified.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    Acked-by: Marius Storm-Olsen <mstormo@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  3. @sschuberth @spearce

    Make generated MSVC solution file open from Windows Explorer

    sschuberth committed with spearce
    In order to be able to open the generated solution file by double-
    clicking it in Windows Explorer, all project files need to use DOS
    line-endings and a comment about the Visual Studio version needs to
    be added to the header of the solution file. This also fixes the icon
    that is displayed for the solution file in Windows Explorer.
    Note that opening the solution file from a running instance of Visual
    Studio already worked before.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    Acked-by: Marius Storm-Olsen <mstormo@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  4. @michaelwookey @spearce

    generators/vcproj.pm: remove UNICODE from build

    michaelwookey committed with spearce
    Defining UNICODE for MSVC IDE builds results in certain Win32 WIDE
    API's receiving ANSI strings. The result of which is an invalid use
    of the API and will end in either data corruption or an application
    crash.
    
    Prevent the use of WIDE API's when building with the MSVC IDE for
    compatibility with msysGit.
    
    Signed-off-by: Michael Wookey <michaelwookey@gmail.com>
    Acked-by: Marius Storm-Olsen <mstormo@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  5. @spearce

    typo fix: Directory `...' exist, ...: s/exist/exists/

    Jim Meyering committed with spearce
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  6. @drafnel @spearce

    Documentation/git-gc.txt: default --aggressive window is 250, not 10

    drafnel committed with spearce
    The default --aggressive window has been 250 since 1c192f3 "gc
    --aggressive: make it really aggressive", released in git v1.6.3.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  7. @spearce

    Correct minor typo in post-receive hook template

    Frederik Schwarzer committed with spearce
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  8. @spearce

    git branch -D: give a better error message when lockfile creation fails

    Miklos Vajna committed with spearce
    Previously the old error message just told the user that it was not
    possible to delete the ref from the packed-refs file. Give instructions
    on how to resolve the problem.
    
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  9. @andreas-schwab @spearce

    parse-opt: ignore negation of OPT_NONEG for ambiguity checks

    andreas-schwab committed with spearce
    parse_long_opt always matches both --opt and --no-opt for any option
    "opt", and only get_value checks whether --no-opt is actually valid.
    Since the options for git branch contains both "no-merged" and "merged"
    there are two matches for --no-merge, but no exact match.  With this
    patch the negation of a NONEG option is rejected earlier, but it changes
    the error message from "option `no-opt' isn't available" to "unknown
    option `no-opt'".
    
    [jk: added test]
    
    Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Sep 26, 2009
  1. @npitre @spearce

    make 'git clone' ask the remote only for objects it cares about

    npitre committed with spearce
    Current behavior of 'git clone' when not using --mirror is to fetch
    everything from the peer, and then filter out unwanted refs just before
    writing them out to the cloned repository.  This may become highly
    inefficient if the peer has an unusual ref namespace, or if it simply
    has "remotes" refs of its own, and those locally unwanted refs are
    connecting to a large set of objects which becomes unreferenced as soon
    as they are fetched.
    
    Let's filter out those unwanted refs from the peer _before_ asking it
    what refs we want to fetch instead, which is the most logical thing to
    do anyway.
    
    Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Sep 25, 2009
  1. @spearce

    send-email: fix obscure error when encryption=tls and smtp cannot con…

    Yakov Lerner committed with spearce
    …nect
    
    When encryption=tls and we cannot connect to the SMTP server,
    git-send-email was printing an obtuse perl error:
    
      Can't call method "command" on an undefined value
      at git-send-email line 927.
    
    This can occur when smtp host or port is misspelled, or the network
    is down, and encryption has been set to tls.
    
    Instead we expect some familiar "Cannot connect to SERVER:PORT"
    message.  Fix it to print normal "smtp can't connect" diagnostics.
    
    Signed-off-by: Yakov Lerner <iler.ml@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  2. @szeder @spearce

    bash: teach 'git checkout' options

    szeder committed with spearce
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  3. @drafnel @spearce

    perl/Makefile.PL: detect MakeMaker versions incompatible with DESTDIR

    drafnel committed with spearce
    It appears that ExtUtils::MakeMaker versions older than 6.11 do not
    implement the DESTDIR mechanism.  So add a test to the generated perl.mak
    to detect when DESTDIR is used along with a too old ExtUtils::MakeMaker and
    abort with a message suggesting the use of NO_PERL_MAKEMAKER.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Sep 23, 2009
  1. @gitster

    pull: Clarify "helpful" message for another corner case

    gitster committed
    When the remote branch we asked for merging did not exist in the set of
    fetched refs, we unconditionally hinted that it was because of lack of
    configuration.  It is not necessarily so, and risks sending users for a
    wild goose chase.
    
    Make sure to check if that is indeed the case before telling a wild guess
    to the user.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Update "describe" documentation to match reality

    Thiago Farina committed with gitster
    A sample "git describe -h" did not match what the program actually says.
    
    Signed-off-by: Thiago Farina <tfransosi@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 22, 2009
  1. @szeder @gitster

    bash: teach 'git reset --patch'

    szeder committed with gitster
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @szeder @gitster

    bash: update 'git stash' completion

    szeder committed with gitster
    This update adds 'git stash (apply|pop) --quiet' and all options known
    to 'git stash save', and handles the DWIMery from 3c2eb80 (stash:
    simplify defaulting to "save" and reject unknown options, 2009-08-18).
    Care is taken to avoid offering subcommands in the DWIM case.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @szeder @gitster

    bash: rename __git_find_subcommand() to __git_find_on_cmdline()

    szeder committed with gitster
    __git_find_subcommand() was originally meant to check whether
    subcommands are already present on the command line.  But the code is
    general enough to be used for checking the presence of command line
    options as well, and the next commit will use it for that purpose, so
    let's give it a more general name.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    pay attention to DESTDIR when building with NO_PERL_MAKEMAKER

    gitster committed
    Building with prefix=/some/where and temporarily installing it to
    elsewhere for tar'ing up is done with:
    
        make prefix=/some/where
        make prefix=/some/where DESTDIR=/else/where install
    
    Make handcrafted perl/perl.mak without NO_PERL_MAKEMAKER honour DESTDIR.
    
    Ancient ExtUtils::MakeMaker (pre 6.11?) has the same issue, but recent
    versions of Perl ships with at leat 6.17; this patch does not address that
    issue.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    pre-commit.sample: add comment re tr portability; fix grammar

    Jim Meyering committed with gitster
    Add a comment explaining why square brackets around a tr range
    are not only ok, but actually required in this case.
    Correct spelling and grammar.
    
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @gitster

    Update Release Notes to 1.6.5

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