Permalink
Commits on Jul 13, 2008
  1. GIT 1.5.6.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 13, 2008
  2. git-am: Do not exit silently if committer is unset

    Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    sbeyer committed with gitster Jul 12, 2008
Commits on Jul 12, 2008
  1. t0004: fix timing bug

    The test created an initial commit, made .git/objects unwritable and then
    exercised various codepaths to create loose commit, tree and blob objects
    to make sure the commands notice failures from these attempts.
    
    However, the initial commit was not preceded with test_tick, which made
    its object name depend on the timestamp.  The names of all the later tree
    and blob objects the test tried to create were static.  If the initial
    commit's object name happened to begin with the same two hexdigits as the
    tree or blob objects the test later attempted to create, the fan-out
    directory in which these tree or blob would be created is already created
    when the initial commit was made, and the object creation succeeds, and
    commands being tested should not notice any failure --- in short, the test
    was bogus.
    
    This makes the fan-out directories also unwritable, and adds test_tick
    before the commit object creation to make the test repeatable.
    
    The contents of the file to create a blob from "a" to "60" is to force the
    name of the blob object to begin with "1b", which shares the fan-out
    directory with the initial commit that is created with the test.  This was
    useful when diagnosing the breakage of this test.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 12, 2008
  2. git-mailinfo: document the -n option

    Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Lukas Sandström committed with gitster Jul 10, 2008
  3. Fix backwards-incompatible handling of core.sharedRepository

    06cbe85 (Make core.sharedRepository more generic, 2008-04-16) broke the
    traditional setting of core.sharedRepository to true, which was to make
    the repository group writable: with umask 022, it would clear the
    permission bits for 'other'. (umask 002 did not exhibit this behaviour
    since pre-chmod() check in adjust_shared_perm() fails in that case.)
    
    The call to adjust_shared_perm() should only loosen the permission.
    If the user has umask like 022 or 002 that allow others to read, the
    resulting files should be made readable and writable by group, without
    restricting the readability by others.
    
    This patch fixes the adjust_shared_perm() mode tweak based on Junio's
    suggestion and adds the appropriate tests to t/t1301-shared-repo.sh.
    
    Cc: Heikki Orsila <heikki.orsila@iki.fi>
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Petr Baudis committed with gitster Jul 12, 2008
Commits on Jul 9, 2008
  1. Start preparing release notes for 1.5.6.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 9, 2008
Commits on Jul 8, 2008
  1. git-submodule - Fix bugs in adding an existing repo as a module

    git-submodule add would trip if path to the submodule included a space,
    or if its .git was a gitdir: link to a GIT_DIR kept elsewhere. Fix both.
    
    Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mark987 committed with gitster Jul 8, 2008
  2. bash: offer only paths after '--'

    Many git commands use '--' to separate subcommands, options, and refs
    from paths.  However, the programmable completion for several of these
    commands does not respect the '--', and offer subcommands, options, or
    refs after a '--', although only paths are permitted.  e.g. 'git bisect
    -- <TAB>' offers subcommands, 'git log -- --<TAB>' offers options and
    'git log -- git<TAB>' offers all gitgui tags.
    
    The completion for the following commands share this wrong behaviour:
      am add bisect commit diff log reset shortlog submodule gitk.
    
    To avoid this, we check the presence of a '--' on the command line first
    and let the shell do filename completion, if one is found.
    
    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>
    szeder committed with gitster Jul 8, 2008
  3. Remove unnecessary pack-*.keep file after successful git-clone

    Once a clone is successful we no longer need to hold onto the
    .keep file created by the transport.  Delete the file so we
    can later repack the complete repository.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    spearce committed with gitster Jul 8, 2008
  4. make deleting a missing ref more quiet

    If git attempts to delete a ref, but the unlink of the ref
    file fails, we print a message to stderr. This is usually a
    good thing, but if the error is ENOENT, then it indicates
    that the ref has _already_ been deleted. And since that's
    our goal, it doesn't make sense to complain to the user.
    
    This harmonizes the error reporting behavior for the
    unpacked and packed cases; the packed case already printed
    nothing on ENOENT, but the unpacked printed unconditionally.
    
    Additionally, send-pack would, when deleting the tracking
    ref corresponding to a remote delete, print "Failed to
    delete" on any failure. This can be a misleading
    message, since we actually _did_ delete at the remote side,
    but we failed to delete locally. Rather than make the
    message more precise, let's just eliminate it entirely; the
    delete_ref routine already takes care of printing out a much
    more specific message about what went wrong.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Jul 8, 2008
  5. Merge branch 'qq/maint' into maint

    * qq/maint:
      run_command(): respect GIT_TRACE
    gitster committed Jul 8, 2008
  6. Merge branch 'lt/racy-empty' into maint

    * lt/racy-empty:
      racy-git: an empty blob has a fixed object name
    gitster committed Jul 8, 2008
Commits on Jul 7, 2008
  1. Merge branch 'qq/maint' (early part) into maint

    * 'qq/maint' (early part):
      git-svn.perl: workaround assertions in svn library 1.5.0
      mailinfo: feed the correct line length to decode_transfer_encoding()
      git-clone: remove leftover debugging fprintf().
      Fix "config_error_nonbool" used with value instead of key
      clone -q: honor "quiet" option over native transports.
      attribute documentation: keep EXAMPLE at end
      builtin-commit.c: Use 'git_config_string' to get 'commit.template'
      http.c: Use 'git_config_string' to clean up SSL config.
      diff.c: Use 'git_config_string' to get 'diff.external'
      convert.c: Use 'git_config_string' to get 'smudge' and 'clean'
      builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and 'format.suffix'
      Documentation cvs: Clarify when a bare repository is needed
      Documentation: be precise about which date --pretty uses
    gitster committed Jul 7, 2008
  2. run_command(): respect GIT_TRACE

    When GIT_TRACE is set, the user is most likely wanting to see an external
    command that is about to be executed.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Jul 7, 2008
  3. git-svn.perl: workaround assertions in svn library 1.5.0

    With subversion 1.5.0 (C and perl libraries) the git-svn selftest
    t9101-git-svn-props.sh fails at test 25 and 26.  The following commands
    cause assertions in the svn library
    
     $ cd deeply
     $ git-svn propget svn:ignore .
     perl: /build/buildd/subversion-1.5.0dfsg1/subversion/libsvn_ra/ra_loader.c:674: svn_ra_get_dir: Assertion `*path != '/'' failed.
     Aborted
    
     $ git-svn propget svn:ignore ..
     perl: /build/buildd/subversion-1.5.0dfsg1/subversion/libsvn_subr/path.c:120: svn_path_join: Assertion `is_canonical(component, clen)' failed.
    
    With this commit, git-svn makes sure the path doesn't start with a
    slash, and is not a dot, working around these assertions.
    
    The breakage was reported by Lucas Nussbaum through
     http://bugs.debian.org/489108
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Gerrit Pape committed with gitster Jul 6, 2008
  4. mailinfo: feed the correct line length to decode_transfer_encoding()

    When handling a MIME multipart message, multi-part boundary lines are eaten
    by a call to handle_boundary() function from the main loop of handle_body(),
    and after that happens, we should update the line length correctly, because
    handle_boundary() udpates line[] with new data.
    
    This was caused by a thinko in 9aa2309 (mailinfo: apply the same fix not
    to lose NULs in BASE64 and QP codepaths, 2008-05-25).
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 7, 2008
  5. git-clone: remove leftover debugging fprintf().

    Acked-by: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    raalkml committed with gitster Jul 6, 2008
  6. Fix grammar in git-rev-parse(1).

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Mikachu committed with gitster Jul 6, 2008
Commits on Jul 6, 2008
  1. Fix "config_error_nonbool" used with value instead of key

    The function "config_error_nonbool", that is defined in "config.c",
    is used to report an error when a config key in the config file
    should have a corresponding value but it hasn't.
    
    So the parameter to this function should be the key and not the
    value, because the value is undefined. And it could crash if the
    value is used.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    chriscool committed with gitster Jul 6, 2008
  2. clone -q: honor "quiet" option over native transports.

    The earlier built-in conversion seems to have broken "git-clone"; this
    teaches the command to honor the "-q" option again when talking to the
    remote end over native transports (file://, git:// and ssh://).
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 6, 2008
  3. attribute documentation: keep EXAMPLE at end

    The document gives overall definition of states in DESCRIPTION, describes
    various aspects of git operations that can be influenced in EFFECTS, and
    finally gives examples in the EXAMPLE section.  Archive creation however
    was somehow documented after the EXAMPLE section, not insode EFFECTS.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 6, 2008
  4. builtin-commit.c: Use 'git_config_string' to get 'commit.template'

    Signed-off-by: Brian Hetro <whee@smaertness.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    whee committed with gitster Jul 5, 2008
  5. http.c: Use 'git_config_string' to clean up SSL config.

    Signed-off-by: Brian Hetro <whee@smaertness.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    whee committed with gitster Jul 5, 2008
  6. diff.c: Use 'git_config_string' to get 'diff.external'

    Signed-off-by: Brian Hetro <whee@smaertness.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    whee committed with gitster Jul 5, 2008
  7. convert.c: Use 'git_config_string' to get 'smudge' and 'clean'

    Signed-off-by: Brian Hetro <whee@smaertness.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    whee committed with gitster Jul 5, 2008
  8. builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' …

    …and 'format.suffix'
    
    Signed-off-by: Brian Hetro <whee@smaertness.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    whee committed with gitster Jul 5, 2008
  9. Documentation cvs: Clarify when a bare repository is needed

    New users sometimes import a project and then immediately
    try to use the imported repository as a central shared repository.
    This provides pointers about setting up a bare repository for that
    in the parts of the documentation dealing with CVS migration.
    
    Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Matthew Ogilvie committed with gitster Jul 5, 2008
Commits on Jul 5, 2008
  1. Documentation: be precise about which date --pretty uses

    This makes it explicit that the --pretty formats 'medium' and 'email' use the
    author date (and ignore the committer date).
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Nikolaus Schulz committed with gitster Jul 5, 2008
Commits on Jul 4, 2008
  1. GIT 1.5.6.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 4, 2008
  2. Fix executable bits in t/ scripts

    Pointed out by Ramsay Jones.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 4, 2008
  3. Work around gcc warnings from curl headers

    After master.k.org upgrade, I started seeing these warning messages:
    
        transport.c: In function 'get_refs_via_curl':
        transport.c:458: error: call to '_curl_easy_setopt_err_write_callback' declared with attribute warning: curl_easy_setopt expects a curl_write_callback argument for this option
    
    It appears that the curl header wants to enforce the function signature
    for callback function given to curl_easy_setopt() to be compatible with
    that of (*curl_write_callback) or fwrite.  This patch seems to work the
    issue around.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 4, 2008
Commits on Jul 3, 2008
  1. Merge branch 'js/maint-clone-insteadof' into maint

    * js/maint-clone-insteadof:
      clone: respect the settings in $HOME/.gitconfig and /etc/gitconfig
      clone: respect url.insteadOf setting in global configs
    gitster committed Jul 3, 2008
  2. Merge branch 'jk/maint-fetch-ref-hier' into maint

    * jk/maint-fetch-ref-hier:
      fetch: give a hint to the user when local refs fail to update
      fetch: report local storage errors in status table
    gitster committed Jul 3, 2008
  3. Merge branch 'jc/maint-reset' into maint

    * jc/maint-reset:
      Allow "git-reset path" when unambiguous
    gitster committed Jul 3, 2008
  4. Fix describe --tags --long so it does not segfault

    If we match a lightweight (non-annotated tag) as the name to
    output and --long was requested we do not have a tag, nor do
    we have a tagged object to display.  Instead we must use the
    object we were passed as input for the long format display.
    
    Reported-by: Mark Burton <markb@ordern.com>
    Backtraced-by: Mikael Magnusson <mikachu@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    spearce committed with gitster Jul 3, 2008