Permalink
Commits on Jul 25, 2007
  1. GIT 1.5.3-rc3

    gitster committed Jul 25, 2007
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. git.el: Pass an explicit argument to enable smerge-mode.

    julliard committed with gitster Jul 24, 2007
    Without argument the mode is toggled, which would do the wrong thing
    if the file was already open.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. pretty-options.txt: tiny doc fix

    meyering committed with gitster Jul 24, 2007
    Signed-off-by: Jim Meyering <jim@meyering.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. t9200: Be careful when checking CVS/Entries

    gitster committed Jul 25, 2007
    CVS/Entries file can contain a line with single D to say "this
    directory does not have any subdirectories".  Do not get
    confused with such an entry.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. git am: skip pine's internal folder data

    dscho committed with gitster Jul 24, 2007
    Test if the From: line contains "Mail System Internal Data" and if
    it is, skip this mail.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Teach git-commit about commit message templates.

    Steven Grimm committed with gitster Jul 23, 2007
    These are useful in organizations that enforce particular formats
    for commit messages, e.g., to specify bug IDs or test plans.
    Use of the template is not enforced; it is simply used as the
    initial content when the editor is invoked.
    
    Signed-off-by: Steven Grimm <koreth@midwinter.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Teach approxidate() to understand "never"

    dscho committed with gitster Jul 24, 2007
    If you want to keep the reflogs around for a really long time, you should be
    able to say so:
    
    	$ git config gc.reflogExpire never
    
    Now it works, too.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. git log -g: Complain, but do not fail, when no reflogs are there

    dscho committed with gitster Jul 23, 2007
    When asking "git log -g --all", clearly you want to see only those refs
    that do have reflogs, but you do not want it to fail, either.
    
    So instead of die()ing, complain about it, but move on to the other refs.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. send-email: Update regex parsing for pine aliases

    kumargala committed with gitster Jul 24, 2007
    The pine address book format is tab seperated and the first field
    is the nickname/alias and the third field is the email address as
    per:
    
    http://www.washington.edu/pine/tech-notes/low-level.html
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. cvsexportcommit: avoid racy CVS problem.

    Robin Rosenberg committed with gitster Jul 24, 2007
    If git cvsexportcommit is executed fast enough in sequence, the CVS
    timestamps could end up being the same. CVS tries to fix this
    by sleeping until the CPU clock changes seconds. Unfortunately,
    the CPU clock and the file system clock are not necessarily the same, so
    the timestamps could be the same anyway. When that happens CVS may not
    recognize changed files and cvs will forget to commit some files.
    
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. cleanup unpack-trees.c: shrink struct tree_entry_list

    René Scharfe committed with gitster Jul 24, 2007
    Remove the two write-only fields executable and symlink from struct
    tree_entry_list.  Also replace usage of the field directory with
    S_ISDIR checks on the mode field, and then remove this now obsolete
    field, too.  Noticed by David Kastrup.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. filter-branch: fix dash complaining about "Missing '))'"

    René Scharfe committed with gitster Jul 24, 2007
    On e.g. Ubuntu, dash is used as /bin/sh.  Unlike bash it parses
    commands like
    
      a=$((echo stuff) | wc)
    
    as an arithmetic expression while what we want is a subshell inside
    a command substitution.  Resolve the ambiguity by placing a space
    between the two opening parentheses.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. gitweb: More detailed error messages for snapshot format

    jnareb committed with gitster Jul 24, 2007
    Improve error messages for snapshot format in git_snapshot:
    distinguish between situation where snapshots are turned off, where
    snapshot format ('sf') parameter is invalid, where given snapshot
    format does not exist in %known_snapshot_formats hash, and where
    gitweb was given unsupported snapshot format.
    
    While at it, use first from all supported snapshots format as default,
    if no snapshot format was provided.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 24, 2007
  1. git.el: Support for incremental status updates.

    julliard committed with gitster Jul 24, 2007
    When we know which files have been modified, we can now run diff-index
    or ls-files with a file list to refresh only the specified files
    instead of the whole project.
    
    This also allows proper refreshing of files upon add/delete/resolve,
    instead of making assumptions about the new file state.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. user-manual: fix typolets.

    gitster committed Jul 24, 2007
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Mark user-manual as UTF-8

    gitster committed Jul 24, 2007
    There have been several complaints against k.org's user-manual
    page.  The document is generated in ISO-8859-1 by the xsltproc
    toolchain (I suspect this is because released docbook.xsl we use
    has xsl:output element that says the output is ISO-8859-1) but
    server delivers it with "charset=UTF-8", and all h*ll breaks
    loose.
    
    This attempts to force UTF-8 on the generating end.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Teach revision machinery about --no-walk

    dscho committed with gitster Jul 23, 2007
    The flag "no_walk" is present in struct rev_info since a long time, but
    so far has been in use exclusively by "git show".
    
    With this flag, you can see all your refs, ordered by date of the last
    commit:
    
    $ git log --abbrev-commit --pretty=oneline --decorate --all --no-walk
    
    which is extremely helpful if you have to juggle with a lot topic
    branches, and do not remember in which one you introduced that uber
    debug option, or simply want to get an overview what is cooking.
    
    (Note that the "git log" invocation above does not output the same as
    
     $ git show --abbrev-commit --pretty=oneline --decorate --all --quiet
    
     since "git show" keeps the alphabetic order that "--all" returns the
     refs in, even if the option "--date-order" was passed.)
    
    For good measure, this also adds the "--do-walk" option which overrides
    "--no-walk".
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. filter-branch: Big syntax change; support rewriting multiple refs

    dscho committed with gitster Jul 23, 2007
    We used to take the first non-option argument as the name for the new
    branch.  This syntax is not extensible to support rewriting more than just
    HEAD.
    
    Instead, we now have the following syntax:
    
    	git filter-branch [<filter options>...] [<rev-list options>]
    
    All positive refs given in <rev-list options> are rewritten.  Yes,
    in-place.  If a ref was changed, the original head is stored in
    refs/original/$ref now, for your inspecting pleasure, in addition to the
    reflogs (since it is easier to inspect "git show-ref | grep original" than
    to inspect all the reflogs).
    
    This commit also adds the --force option to remove .git-rewrite/ and all
    refs from refs/original/ before filtering.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. rebase -i: exchange all "if [ .. ]" by "if test .."

    dscho committed with gitster Jul 24, 2007
    This patch is literally
    
    :%s/if \[ *\(.*[^ ]\) *\]/if test \1/
    
    in vi, after making sure that the other instances of "[..]" are not
    actually invocations of "test".
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Shut "git rebase -i" up when no --verbose was given

    dscho committed with gitster Jul 23, 2007
    Up to now, git rebase -i was quite chatty, showing through all the
    nice core programs it called.
    
    Now it only shows a progress meter by default.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. mailinfo: fix 'fatal: cannot convert from utf-8 to utf-8'

    dscho committed with gitster Jul 24, 2007
    For some reason, I got this error message.  Maybe it does not make sense,
    but then we should not really try to convert the text when it is not
    necessary.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 22, 2007
  1. gitweb: Fix support for legacy gitweb config for snapshots

    jnareb committed with gitster Jul 22, 2007
    Earlier commit which cleaned up snapshot support and introduced
    support for multiple snapshot formats changed the format of
    $feature{'snapshot'}{'default'} (gitweb configuration) and
    gitweb.snapshot configuration variable (repository configuration).
    It supported old gitweb.snapshot values of 'gzip', 'bzip2' and 'zip'
    and tried to support, but failed to do that, old values of
    $feature{'snapshot'}{'default'}; at least those corresponding to
    old gitweb.snapshot values of 'gzip', 'bzip2' and 'zip', i.e.
      ['x-gzip', 'gz', 'gzip']
      ['x-bzip2', 'bz2', 'bzip2']
      ['x-zip', 'zip', '']
    
    This commit moves legacy configuration support out of feature_snapshot
    subroutine to separate filter_snapshot_fmts subroutine. The
    filter_snapshot_fmts is used on result on result of
    gitweb_check_feature('snapshot').  This way feature_snapshot deals
    _only_ with repository config.
    
    As a byproduct you can now use 'gzip' and 'bzip2' as aliases to 'tgz'
    and 'tbz2' also in $feature{'snapshot'}{'default'}, not only in
    gitweb.snapshot.
    
    While at it do some whitespace cleanup: use tabs for indent, but
    spaces for align.
    
    Noticed-by: Matt McCutchen <hashproduct@gmail.com>
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Tested-by: Matt McCutchen <hashproduct@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. fsck --lost-found: write blob's contents, not their SHA-1

    dscho committed with gitster Jul 22, 2007
    When looking for a lost blob, it is much nicer to be able to grep
    through .git/lost-found/other/* than to write an inefficient loop
    over the file names.  So write the contents of the dangling blobs,
    not their object names.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Avoid to duplicate commit message when is not encoded

    mcostalba committed with gitster Jul 22, 2007
    When a commit message doesn't have encoding information
    and encoding output is utf-8 (default) then an useless
    xstrdup() of commit message is done.
    
    If we assume most of users live in an utf-8 world, this
    useless copy is the common case.
    
    Performance issue found with KCachegrind.
    
    Signed-off-by: Marco Costalba <mcostalba@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Synonyms: -i == --regexp-ignore-case, -E == --extended-regexp

    gitster committed Jul 22, 2007
    These options to log family were too long to type.  Give them
    shorter synonyms.
    
    Fix the parsing of the long options while at it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Documentation/gitignore.txt: Fix the seriously misleading priority ex…

    David Kastrup committed with gitster Jul 21, 2007
    …planation
    
    Signed-off-by: David Kastrup <dak@gnu.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Fix VISUAL/EDITOR preference order in Documentation/config.txt.

    gitster committed Jul 22, 2007
    I screwed up when amending ef0c2ab.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. gitweb: snapshot cleanups & support for offering multiple formats

    Matt McCutchen committed with gitster Jul 21, 2007
    - Centralize knowledge about snapshot formats (mime types, extensions,
      commands) in %known_snapshot_formats and improve how some of that
      information is specified.  In particular, zip files are no longer a
      special case.
    
    - Add support for offering multiple snapshot formats to the user so
      that he/she can download a snapshot in the format he/she prefers.
      The site-wide or project configuration now gives a list of formats
      to offer, and if more than one format is offered, the "_snapshot_"
      link becomes something like "snapshot (_tar.bz2_ _zip_)".
    
    - If only one format is offered, a tooltip on the "_snapshot_" link
      tells the user what it is.
    
    - Fix out-of-date "tarball" -> "archive" in comment.
    
    Alert for gitweb site administrators: This patch changes the format of
    $feature{'snapshot'}{'default'} in gitweb_config.perl from a list of
    three pieces of information about a single format to a list of one or
    more formats you wish to offer from the set ('tgz', 'tbz2', 'zip').
    Update your gitweb_config.perl appropriately.  There was taken care
    for old-style gitweb configuration to work as it used to, but this
    backward compatibility works only for the values which correspond to
    gitweb.snapshot values of 'gzip', 'bzip2' and 'zip', i.e.
      ['x-gzip', 'gz', 'gzip']
      ['x-bzip2', 'bz2', 'bzip2']
      ['x-zip', 'zip', '']
    
    The preferred names for gitweb.snapshot in repository configuration
    have also changed from 'gzip' and 'bzip2' to 'tgz' and 'tbz2', but
    the old names are still recognized for compatibility.
    
    Signed-off-by: Matt McCutchen <hashproduct@gmail.com>
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 21, 2007
  1. rebase -i: call editor just once for a multi-squash

    dscho committed with gitster Jul 21, 2007
    Sometimes you want to squash more than two commits.  Before this patch,
    the editor was fired up for each squash command.  Now the editor is
    started only with the last squash command.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Fix up duplicate parents removal

    torvalds committed with gitster Jul 21, 2007
    This removes duplicate parents properly, making gitk happy again.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 20, 2007
  1. gitweb cleanup: Move @diff_opts declaration earlier

    jnareb committed with gitster Jul 20, 2007
    Move @diff_opts declaration earlier, so that all gitweb options are
    together (and not separated by %feature hash and some subroutines),
    with the exception of $GITWEB_CONFIG which must be after all option
    variables including %feature hash.
    
    While at it, in the moved comment, note that diff option '-C' implies
    '-M', instead of suggesting that '-M', '-C' is required.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Add GIT_EDITOR environment and core.editor configuration variables

    aroben committed with gitster Jul 20, 2007
    These variables let you specify an editor that will be launched in
    preference to the EDITOR and VISUAL environment variables. The order
    of preference is GIT_EDITOR, core.editor, EDITOR, VISUAL.
    
    [jc: added a test and config variable documentation]
    
    Signed-off-by: Adam Roben <aroben@apple.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Document how to tell git to not launch a pager

    Steven Grimm committed with gitster Jul 19, 2007
    Signed-off-by: Steven Grimm <koreth@midwinter.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 19, 2007
  1. Rename read_pipe() with read_fd() and make its buffer nul-terminated.

    jasampler committed with gitster Jul 18, 2007
    The new name is closer to the purpose of the function.
    
    A NUL-terminated buffer makes things easier when callers need that.
    Since the function returns only the memory written with data,
    almost always allocating more space than needed because final
    size is unknown, an extra NUL terminating the buffer is harmless.
    It is not included in the returned size, so the function
    remains working as before.
    
    Also, now the function allows the buffer passed to be NULL at first,
    and alloc_nr is now used for growing the buffer, instead size=*2.
    
    Signed-off-by: Carlos Rica <jasampler@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'master' of git://people.freedesktop.org/~hausmann/git-p4

    gitster committed Jul 19, 2007
    * 'master' of git://people.freedesktop.org/~hausmann/git-p4:
      git-p4: Cleanup, used common function for listing imported p4 branches
      git-p4: Fix upstream branch detection for submit/rebase with multiple branches.
      git-p4: Cleanup, make listExistingP4Branches a global function for later use.
      git-p4: input to "p4 files" by stdin instead of arguments
      git-p4: use subprocess in p4CmdList