Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Feb 23, 2008
  1. @gitster

    GIT 1.5.4.3

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

    Merge branch 'maint' of git://repo.or.cz/git-gui into maint

    gitster authored
    * 'maint' of git://repo.or.cz/git-gui:
      git-gui: Focus insertion point at end of strings in repository chooser
      git-gui: Avoid hardcoded Windows paths in Cygwin package files
      git-gui: Default TCL_PATH to same location as TCLTK_PATH
      git-gui: Paper bag fix error dialogs opening over the main window
      git-gui: Ensure error dialogs always appear over all other windows
      git-gui: relax "dirty" version detection
      git-gui: support Git Gui.app under OS X 10.5
Commits on Feb 22, 2008
  1. @peff @gitster

    hash: fix lookup_hash semantics

    peff authored gitster committed
    We were returning the _address of_ the stored item (or NULL)
    instead of the item itself. While this sort of indirection
    is useful for insertion (since you can lookup and then
    modify), it is unnecessary for read-only lookup. Since the
    hash code splits these functions between the internal
    lookup_hash_entry function and the public lookup_hash
    function, it makes sense for the latter to provide what
    users of the library expect.
    
    The result of this was that the index caching returned bogus
    results on lookup. We unfortunately didn't catch this
    because we were returning a "struct cache_entry **" as a
    "void *", and accidentally assigning it to a "struct
    cache_entry *".
    
    As it happens, this actually _worked_ most of the time,
    because the entries were defined as:
    
      struct cache_entry {
    	  struct cache_entry *next;
    	  ...
      };
    
    meaning that interpreting a "struct cache_entry **" as a
    "struct cache_entry *" would yield an entry where all fields
    were totally bogus _except_ for the next pointer, which
    pointed to the actual cache entry. When walking the list, we
    would look at the bogus "name" field, which was unlikely to
    match our lookup, and then proceed to the "real" entry.
    
    The reading of bogus data was silently ignored most of the
    time, but could cause a segfault for some data (which seems
    to be more common on OS X).
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @spearce

    git-gui: Focus insertion point at end of strings in repository chooser

    spearce authored
    When selecting a local working directory for a new repository or a
    location to clone an existing repository into we now set the insert
    point at the end of the selected path, allowing the user to type in
    any additional parts of the path if they so desire.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  3. @spearce

    git-gui: Avoid hardcoded Windows paths in Cygwin package files

    spearce authored
    When we are being built by the Cygwin package maintainers we need to
    embed the POSIX path to our library files and not the Windows path.
    Embedding the Windows path means all end-users who install our Cygwin
    package would be required to install Cygwin at the same Windows path
    as the package maintainer had Cygwin installed to.  This requirement
    is simply not user-friendly and may be infeasible for a large number
    of our users.
    
    We now try to auto-detect if the Tcl/Tk binary we will use at runtime
    is capable of translating POSIX paths into Windows paths the same way
    that cygpath does the translations.  If the Tcl/Tk binary gives us the
    same results then it understands the Cygwin path translation process
    and should be able to read our library files from a POSIX path name.
    
    If it does not give us the same answer as cygpath then the Tcl/Tk
    binary might actually be a native Win32 build (one that is not
    linked against Cygwin) and thus requires the native Windows path
    to our library files.  We can assume this is not a Cygwin package
    as the Cygwin maintainers do not currently ship a pure Win32 build
    of Tcl/Tk.
    
    Reported on the git mailing list by Jurko Gospodnetić.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  4. @spearce

    git-gui: Default TCL_PATH to same location as TCLTK_PATH

    spearce authored
    Most users set TCLTK_PATH to tell git-gui where to find wish, but they
    fail to set TCL_PATH to the same Tcl installation.  We use the non-GUI
    tclsh during builds so headless systems are still able to create an
    index file and create message files without GNU msgfmt.  So it matters
    to us that we find a working TCL_PATH at build time.
    
    If TCL_PATH hasn't been set yet we can take a better guess about what
    tclsh executable to use by replacing 'wish' in the executable path with
    'tclsh'.  We only do this replacement on the filename part of the path,
    just in case the string "wish" appears in the directory paths.  Most of
    the time the tclsh will be installed alongside wish so this replacement
    is a sensible and safe default.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  5. @spearce

    git-gui: Paper bag fix error dialogs opening over the main window

    spearce authored
    If the main window is the only toplevel we have open then we
    don't have a valid grab right now, so we need to assume the
    best toplevel to use for the parent is ".".
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Feb 21, 2008
  1. @spearce

    git-gui: Ensure error dialogs always appear over all other windows

    spearce authored
    If we are opening an error dialog we want it to appear above all of
    the other windows, even those that we may have opened with a grab
    to make the window modal.  Failure to do so may allow an error
    dialog to open up (and grab focus!) under an existing toplevel,
    making the user think git-gui has frozen up and is unresponsive,
    as they cannot get to the dialog.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  2. @gitster

    Clarified the meaning of git-add -u in the documentation

    Pekka Kaitaniemi authored gitster committed
    The git-add documentation did not state clearly that the -u switch
    updates only the tracked files that are in the current directory and
    its subdirectories.
    
    Signed-off-by: Pekka Kaitaniemi <kaitanie@cc.helsinki.fi>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 20, 2008
  1. @gitster

    git-clone.sh: properly configure remote even if remote's head is dang…

    Gerrit Pape authored gitster committed
    …ling
    
    When cloning a remote repository which's HEAD refers to a nonexistent
    ref, git-clone cloned all existing refs, but failed to write the
    configuration for 'remote'.  Now it detects the dangling remote HEAD,
    refuses to checkout any local branch since HEAD refers to nowhere, but
    properly writes the configuration for 'remote', so that subsequent
    'git fetch's don't fail.
    
    The problem was reported by Daniel Jacobowitz through
     http://bugs.debian.org/466581
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Documentation/git-stash: document options for git stash list

    Miklos Vajna authored gitster committed
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @jaysoffian @gitster

    send-email: squelch warning due to comparing undefined $_ to ""

    jaysoffian authored gitster committed
    The check to see if initial_reply_to is defined was also comparing $_ to
    "" for a reason I cannot ascertain (looking at the commit which made the
    change didn't provide enlightenment), but if $_ is undefined, perl
    generates a warning.
    
    Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Rename git-core rpm to just git and rename the meta-pacakge to git-all.

    Kristian Høgsberg authored gitster committed
    This fixes my favorite annoyance with the git rpm packaging: don't pull
    in tla when I say yum install git!  You wouldn't expect yum install gcc
    to pull in gcc-gfortran, right?
    
    With this change, and blanket 'yum update' will automatically pull in the
    new 'git' package and push out the old 'git-core', and if the old 'git'
    package was installed 'git-all' will be pulled in instead.  A couple of
    things do break though: 'yum update git-core', because yum behaves
    differently when given a specific package name - it doesn't follow obsoletes.
    
    Instead, 'yum install git' will pull in the new git rpm, which will then
    push out the old 'git-core'.  Similarly, to get the newest version of
    the meta package, 'yum install git-all' will install git-all, which then
    pushes out the old 'git' meta package.
    
    Signed-off-by: Kristian Høgsberg <krh@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @peff @gitster

    push: document the status output

    peff authored gitster committed
    The output was meant to be a balance of self-explanatory and
    terse. In case we have erred too far on the terse side, it
    doesn't hurt to explain in more detail what each line means.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @peff @gitster

    Documentation/push: clarify matching refspec behavior

    peff authored gitster committed
    The previous text was correct, but it was easy to miss the
    fact that we are talking about "matching" refs. That is, the
    text can be parsed as "we push the union of the sets
    of remote and local heads" and not "we push the intersection
    of the sets of remote and local heads". (The former actually
    doesn't make sense if you think about it, since we don't
    even _have_ some of those heads). A careful reading would
    reveal the correct meaning, but it makes sense to be as
    explicit as possible in documentation.
    
    We also explicitly use and introduce the term "matching";
    this is a term discussed on the list, and it seems useful
    to for users to be able to refer to this behavior by name.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @peff @gitster

    push: indicate partialness of error message

    peff authored gitster committed
    The existing message indicates that an error occured during
    push, but it is unclear whether _any_ refs were actually
    pushed (even though the status table above shows which were
    pushed successfully and which were not, the message "failed
    to push" implies a total failure). By indicating that "some
    refs" failed, we hopefully indicate to the user that the
    table above contains the details.
    
    We could also put in an explicit "see above for details"
    message, but it seemed to clutter the output quite a bit
    (both on a line of its own, or at the end of the error line,
    which inevitably wraps).
    
    This could also be made more fancy if the transport
    mechanism passed back more details on how many refs
    succeeded and failed:
    
      error: failed to push %d out of %d refs to '%s'
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @wincent @spearce

    git-gui: relax "dirty" version detection

    wincent authored spearce committed
    "git gui" would complain at launch if the local version of Git was
    "1.5.4.2.dirty". Loosen the regular expression to look for either
    "-dirty" or ".dirty", thus eliminating spurious warnings.
    
    Signed-off-by: Wincent Colaiuta <win@wincent.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Feb 17, 2008
  1. @gitster

    GIT 1.5.4.2

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 16, 2008
  1. @pieter @gitster

    Documentation/git-reset: Add an example of resetting selected paths

    pieter authored gitster committed
    Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @pieter @gitster

    Documentation/git-reset: don't mention --mixed for selected-paths reset

    pieter authored gitster committed
    The option is accepted, but that is the only form selected-paths
    variant of the reset command takes, so there is no point mentioning it.
    And while we're at it, use the dashless git call.
    
    Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Documentation/git-reset:

    gitster authored
    Since 3368d11 (Remove unnecessary git-rm --cached reference from
    status output), the status output marks the "Added but not yet
    committed" section as "Changes to be committed".
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @peff @gitster

    commit: discard index after setting up partial commit

    peff authored gitster committed
    There may still be some entries from the original index that
    should be discarded before we show the status. In
    particular, if a file was added in the index but not
    included in the partial commit, it would still show up in
    the status listing as staged for commit.
    
    Ultimately the correct fix is to keep the two states in
    separate index_state variables. Then we can avoid having
    to reload the cache from the temporary file altogether, and
    just point wt_status_print at the correct index.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    filter-branch: handle filenames that need quoting

    gitster authored
    The command used a very old fashioned construct to extract
    filenames out of diff-index and ended up corrupting the output.
    We can simply use --name-only and pipe into --stdin mode of
    update-index.  It's been like that for the past 2 years or so
    since a94d994 (update-index: work with c-quoted name).
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @gitster

    diff: Fix miscounting of --check output

    gitster authored
    c1795bb (Unify whitespace checking) incorrectly made the
    checking function return without incrementing the line numbers
    when there is no whitespace problem is found on a '+' line.
    
    This resurrects the earlier behaviour.
    
    Noticed and reported by Jay Soffian.  The test script was stolen
    from Jay's independent fix.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @stelian42 @gitster

    hg-to-git: fix parent analysis

    stelian42 authored gitster committed
    Fix a bug in the hg-to-git convertor introduced by commit
    1bc7c13: when searching the changeset
    parents, 'hg log' returns an extra space at the end of the line, which
    confuses the .split(' ') based tokenizer:
    
        Traceback (most recent call last):
          File "hg-to-git.py", line 123, in <module>
              hgchildren[mparent] += ( str(cset), )
          KeyError: ''
    
    Signed-off-by: Stelian Pop <stelian@popies.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @jaysoffian @gitster

    mailinfo: feed only one line to handle_filter() for QP input

    jaysoffian authored gitster committed
    The function is intended to be fed one logical line at a time to
    inspect, but a QP encoded raw input line can have more than one
    lines, just like BASE64 encoded one.
    
    Quoting LF as =0A may be unusual but RFC2045 allows it.
    
    The issue was noticed and fixed by Jay Soffian.  JC added a test
    to protect the fix from regressing later.
    
    Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. @chriscool @gitster

    diff.c: add "const" qualifier to "char *cmd" member of "struct ll_dif…

    chriscool authored gitster committed
    …f_driver"
    
    Also use "git_config_string" to simplify code where "cmd" is set.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. @chriscool @gitster

    Add "const" qualifier to "char *excludes_file".

    chriscool authored gitster committed
    Also use "git_config_string" to simplify "config.c" code
    where "excludes_file" is set.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. @chriscool @gitster

    Add "const" qualifier to "char *editor_program".

    chriscool authored gitster committed
    Also use "git_config_string" to simplify "config.c" code
    where "editor_program" is set.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. @chriscool @gitster

    Add "const" qualifier to "char *pager_program".

    chriscool authored gitster committed
    Also use "git_config_string" to simplify "config.c" code
    where "pager_program" is set.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. @chriscool @gitster

    config: add 'git_config_string' to refactor string config variables.

    chriscool authored gitster committed
    In many places we just check if a value from the config file is not
    NULL, then we duplicate it and return 0. This patch introduces the new
    'git_config_string' function to do that.
    
    This function is also used to refactor some code in 'config.c'.
    Refactoring other files is left for other patches.
    
    Also not all the code in "config.c" is refactored, because the function
    takes a "const char **" as its first parameter, but in many places a
    "char *" is used instead of a "const char *". (And C does not allow
    using a "char **" instead of a "const char **" without a warning.)
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. @chriscool @gitster

    diff.c: remove useless check for value != NULL

    chriscool authored gitster committed
    It is not necessary to check if value != NULL before calling
    'parse_lldiff_command' as there is already a check inside this
    function.
    
    By the way this patch also improves the existing check inside
    'parse_lldiff_command' by using:
    	return config_error_nonbool(var);
    instead of:
    	return error("%s: lacks value", var);
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  15. @spearce @gitster

    fast-import: check return value from unpack_entry()

    spearce authored gitster committed
    If the tree object we have asked for is deltafied in the packfile and
    the delta did not apply correctly or was not able to be decompressed
    from the packfile then we can get back NULL instead of the tree data.
    This is (part of) the reason why read_sha1_file() can return NULL, so
    we need to also handle it the same way.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 15, 2008
  1. @gitster

    Validate nicknames of remote branches to prohibit confusing ones

    Daniel Barkalow authored gitster committed
    The original problem was that the parsers for configuration files were
    getting confused by seeing as nicknames remotes that involved
    directory-changing characters. In particular, the branches config file
    for ".." was particularly mystifying on platforms that can open
    directories and read odd data from them.
    
    The validation function was written by Junio Hamano (with a typo
    corrected).
    
    Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @chriscool @gitster

    diff.c: replace a 'strdup' with 'xstrdup'.

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