Skip to content
Commits on Apr 25, 2006
  1. socksetup: don't return on set_reuse_addr() error

    The set_reuse_addr() error case was the only error case in
    socklist() where we returned rather than continued.  Not sure
    why.  Either we must free the socklist, or continue.  This patch
    continues on error.
    
    Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    (cherry picked from 0032d54 commit)
    Serge E. Hallyn committed with Junio C Hamano Apr 18, 2006
  2. Document the configuration file

    This patch adds a Documentation/config.txt file included by git-repo-config
    and currently aggregating hopefully all the available git plumbing / core
    porcelain configuration variables, as well as briefly describing the format.
    
    It also updates an outdated bit of the example in git-repo-config(1).
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Petr Baudis committed with Junio C Hamano Apr 25, 2006
  3. Document git-var -l listing also configuration variables

    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Petr Baudis committed with Junio C Hamano Apr 25, 2006
  4. @paulusmack

    rev-parse: better error message for ambiguous arguments

    Currently, if git-rev-parse encounters an argument that is neither a
    recognizable revision name nor the name of an existing file or
    directory, and it hasn't encountered a "--" argument, it prints an
    error message saying "No such file or directory".  This can be
    confusing for users, including users of programs such as gitk that
    use git-rev-parse, who may then think that they can't ask about the
    history of files that no longer exist.
    
    This makes it print a better error message, one that points out the
    ambiguity and tells the user what to do to fix it.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    paulusmack committed with Junio C Hamano Apr 25, 2006
Commits on Apr 21, 2006
  1. git-log produces no output

    When $PAGER is set to 'less -i', we used to fail because we
    assumed the $PAGER is a command and simply exec'ed it.
    
    Try exec first, and then run it through shell if it fails.  This
    allows even funkier PAGERs like these ;-):
    
    	PAGER='sed -e "s/^/`date`: /" | more'
    	PAGER='contrib/colordiff.perl | less -RS'
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Apr 21, 2006
  2. fix pack-object buffer size

    The input line has 40 _chars_ of sha1 and no 20 _bytes_. It should also
    account for the space before the pathname, and the terminating \n and \0.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Nicolas Pitre committed with Junio C Hamano Apr 20, 2006
  3. mailinfo: decode underscore used in "Q" encoding properly.

    Quoted-Printable (RFC 2045) and the "Q" encoding (RFC 2047) are
    subtly different; the latter is used on the mail header and an
    underscore needs to be decoded to 0x20.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Apr 21, 2006
  4. Reintroduce svn pools to solve the memory leak.

    Introduced in 4802426.
    
    Signed-off-by: Santi Béjar <sbejar@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Santi_Béjar committed with Junio C Hamano Mar 27, 2006
  5. pack-objects: do not stop at object that is "too small"

    Because we sort the delta window by name-hash and then size,
    hitting an object that is too small to consider as a delta base
    for the current object does not mean we do not have better
    candidate in the window beyond it.
    
    Noticed by Shawn Pearce, analyzed by Nico, Linus and me.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Apr 20, 2006
Commits on Apr 20, 2006
  1. git-commit --amend: two fixes.

    When running "git commit --amend" only to fix the commit log
    message without any content change, we mistakenly showed the
    git-status output that says "nothing to commit" without
    commenting it out.
    
    If you have already run update-index but you want to amend the
    top commit, "git commit --amend --only" without any paths should
    have worked, because --only means "starting from the base
    commit, update-index these paths only to prepare the index to
    commit, and perform the commit".  However, we refused -o without
    paths.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Apr 20, 2006
Commits on Apr 19, 2006
  1. pre-commit hook: complain about conflict markers.

    Several <<< or === or >>> characters at the beginning of a line
    is very likely to be leftover conflict markers from a failed
    automerge the user resolved incorrectly, so detect them.
    
    As usual, this can be defeated with "git commit --no-verify" if
    you really do want to have those files, just like changes that
    introduce trailing whitespaces.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Apr 19, 2006
  2. git-merge: a bit more readable user guidance.

    We said "fix up by hand" after failed automerge, which was a big
    "Huh?  Now what?".  Be a bit more explicit without being too
    verbose. Suggested by Carl Worth.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Apr 19, 2006
  3. @spearce

    Document git-clone --reference

    The new --reference flag introduced to git-clone in
    GIT 1.3.0 was not documented but is rather handy.
    So document it.
    
    Also corrected a minor issue with the documentation for the
    -s flag; the info/alternates file name was spelled wrong.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Apr 18, 2006
Commits on Apr 18, 2006
  1. @jonas

    Fix filename scaling for binary files

    Set maximum filename length for binary files so that scaling won't be
    triggered and result in invalid string access.
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jonas committed with Junio C Hamano Apr 18, 2006
  2. GIT 1.3.0

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Apr 18, 2006
  3. @jonas

    Add git-annotate(1) and git-blame(1)

    [jc: with entries in git.txt]
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jonas committed with Junio C Hamano Mar 6, 2006
  4. diff --stat: make sure to set recursive.

    Just like "patch" format always needs recursive, "diffstat"
    format does not make sense without setting recursive.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Apr 18, 2006
  5. @hvr

    git-svnimport symlink support

    added svn:special symlink support for access methods other than
    direct-http
    
    Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
    Acked-by: Matthias Urlichs <smurf@smurf.noris.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    hvr committed with Junio C Hamano Apr 17, 2006
  6. packed_object_info_detail(): check for corrupt packfile.

    Serge E. Hallyn noticed that we compute how many input bytes are
    still left, but did not use it for sanity checking.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Apr 17, 2006
Commits on Apr 17, 2006
  1. cleanups: remove unused variable from exec_cmd.c

    Not sure whether it should be removed, or whether
    execv_git_cmd() should return it rather than -1 at bottom.
    
    Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Serge E. Hallyn committed with Junio C Hamano Apr 17, 2006
  2. cleanups: prevent leak of two strduped strings in config.c

    Config_filename and lockfile are strduped and then leaked in
    git_config_set_multivar.
    
    Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Serge E. Hallyn committed with Junio C Hamano Apr 17, 2006
  3. cleanups: Remove impossible case in quote.c

    The switch is inside an if statement which is false if
    the character is ' '.  Either the if should be <=' '
    instead of <' ', or the case should be removed as it could
    be misleading.
    
    Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Serge E. Hallyn committed with Junio C Hamano Apr 17, 2006
  4. cleanups: Remove unused vars from combine-diff.c

    Mod_type in particular sure looks like it wants to be used, but isn't.
    
    Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Serge E. Hallyn committed with Junio C Hamano Apr 17, 2006
  5. cleanups: Fix potential bugs in connect.c

    The strncmp for ACK was ACK does not include the final space.
    Presumably either we should either remove the trailing space,
    or compare 4 chars (as this patch does).
    
    'path' is sometimes strdup'ed, but never freed.
    
    Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Serge E. Hallyn committed with Junio C Hamano Apr 17, 2006
  6. Merge branch 'jc/boundary'

    * jc/boundary:
      rev-list --boundary: show boundary commits even when limited otherwise.
    Junio C Hamano committed Apr 17, 2006
  7. Merge branch 'jc/bottomless'

    * jc/bottomless:
      rev-list --bisect: limit list before bisecting.
    Junio C Hamano committed Apr 17, 2006
  8. @ydirson

    Allow empty lines in info/grafts

    In addition to the existing comment support, that just allows the user
    to use a convention that works pretty much everywhere else.
    
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ydirson committed with Junio C Hamano Apr 17, 2006
  9. rev-list --boundary: show boundary commits even when limited otherwise.

    The boundary commits are shown for UI like gitk to draw them as
    soon as topo-order sorting allows, and should not be omitted by
    get_revision() filtering logic.  As long as their immediate
    child commits are shown, we should not filter them out.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Apr 16, 2006
  10. @gitzilla

    Makefile fixups.

    Signed-off-by: A Large Angry SCM <gitzilla@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    gitzilla committed with Junio C Hamano Apr 16, 2006
  11. Merge git://git.kernel.org/pub/scm/gitk/gitk

    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Fix bug caused by missing commitlisted elements
    Junio C Hamano committed Apr 16, 2006
  12. @paulusmack

    gitk: Fix bug caused by missing commitlisted elements

    This bug was reported by Yann Dirson, and results in an 'Error:
    expected boolean value but got ""' dialog when scrolling to the bottom
    of the graph under some circumstances.  The issue is that git-rev-list
    isn't outputting all the boundary commits when it is asked for commits
    affecting only certain files.  We already cope with that by adding the
    missing boundary commits in addextraid, but there we weren't adding a
    0 to the end of the commitlisted list when we added the extra id to
    the end of the displayorder list.
    
    This fixes it by appending 0 to commitlisted in addextraid, thus keeping
    commitlisted and displayorder in sync.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    paulusmack committed Apr 17, 2006
Commits on Apr 16, 2006
  1. reading $GIT_DIR/info/graft - skip comments correctly.

    Noticed by Yann Dirson.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Apr 16, 2006
  2. @dscho

    pager: do not fork a pager if PAGER is set to empty.

    This skips an extra pipe, and helps debugging tremendously.
    
    [jc: PAGER=cat is a questionable hack and should be done as a separate
    patch. ]
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho committed with Junio C Hamano Apr 16, 2006
  3. @dscho

    diff-options: add --patch-with-stat

    With this option, git prepends a diffstat in front of the patch.
    
    Since I really, really do not know what a diffstat of a combined diff
    ("merge diff") should look like, the diffstat is not generated for these.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho committed with Junio C Hamano Apr 15, 2006
  4. diff-files --stat: do not dump core with unmerged index.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Apr 15, 2006
Something went wrong with that request. Please try again.