Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Aug 17, 2008
  1. @gitster

    GIT 1.6.0

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

    Merge git-gui 0.11.0

    gitster authored
  3. @gitster

    Merge branch 'ak/p4'

    gitster authored
    * ak/p4:
      Utilise our new p4_read_pipe and p4_write_pipe wrappers
      Add p4 read_pipe and write_pipe wrappers
      Put in the two other configuration elements found in the source
      Put some documentation in about the parameters that have been added
      Move git-p4.syncFromOrigin into a configuration parameters section
      Consistently use 'git-p4' for the configuration entries
      If the user has configured various parameters, use them.
      Switch to using 'p4_build_cmd'
      If we are in verbose mode, output what we are about to run (or return)
      Add a single command that will be used to construct the 'p4' command
      Utilise the new 'p4_system' function.
      Have a command that specifically invokes 'p4' (via system)
      Utilise the new 'p4_read_pipe_lines' command
      Create a specific version of the read_pipe_lines command for p4 invocations
    
    Conflicts:
    	contrib/fast-import/git-p4
  4. @gitster

    git-p4: chdir now properly sets PWD environment variable in msysGit

    Robert Blum authored gitster committed
    P4 on Windows expects the PWD environment variable to be set to the
    current working dir, but os.chdir in python doesn't do so.
    
    Signed-off-by: Robert Blum <rob.blum@gmail.com>
    Acked-by: Simon Hausmann <simon@lst.de>
    Acked-by: Han-Wen Nienhuys <hanwen@xs4all.nl>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @sbeyer @gitster

    Improve error output of git-rebase

    sbeyer authored gitster committed
    "git rebase" without arguments on initial startup showed:
    
    	fatal: Needed a single revision
    	invalid upstream
    
    This patch makes it show the ordinary usage string.
    
    If .git/rebase-merge or .git/rebase-apply/rebasing exists, git-rebase
    will die with a message saying that a rebase is in progress and the user
    should try --skip/--abort/--continue.
    
    If .git/rebase-apply/applying exists, git-rebase will die with a message
    saying that git-am is in progress, regardless how many arguments are
    given.
    
    If no arguments are given and .git/rebase-apply/ exists, but neither a
    rebasing nor applying file is in that directory, git-rebase dies with a
    message saying that rebase-apply exists and no arguments were given.
    
    Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @gitster

    t9300: replace '!' with test_must_fail

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

    Merge git://git.kernel.org/pub/scm/gitk/gitk

    gitster authored
    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Allow safely calling nukefile from a run queue handler
Commits on Aug 16, 2008
  1. @neoeinstein @gitster

    Git.pm: Make File::Spec and File::Temp requirement lazy

    neoeinstein authored gitster committed
    This will ensure that the API at large is accessible to nearly
    all Perl versions, while only the temp file caching API is tied to
    the File::Temp and File::Spec modules being available.
    
    Signed-off-by: Marcus Griep <marcus@griep.us>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Documentation: document the pager.* configuration setting

    Miklos Vajna authored gitster committed
    It was already documented in RelNotes-1.6.0, but not in the git-config
    manual page.
    
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @sbeyer @gitster

    git-stash: improve synopsis in help and manual page

    sbeyer authored gitster committed
    "git stash -h" showed some incomplete and ugly usage information.
    For example, the useful "--keep-index" option for "save" or the "--index"
    option for  "apply" were not shown. Also in the documentation synopsis they
    were not shown, so that there is no incentive to scroll down and even see
    that such options exist.
    
    This patch improves the git-stash synopsis in the documentation by
    mentioning that further options to the stash commands and then copies
    this synopsis to the usage information string of git-stash.sh.
    
    For the latter, the dashless git command string has to be inserted on the
    second and the following usage lines. The code of this is taken from
    git-sh-setup so that all lines will show the command string.
    
    Note that the "create" command is not advertised at all now, because
    it was not mentioned in git-stash.txt.
    
    Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Makefile: building git in cygwin 1.7.0

    Eric Blake authored gitster committed
    On platforms with $X, make removes any leftover scripts 'a' from
    earlier builds if a new binary 'a.exe' is now built.  However, on
    cygwin 1.7.0, 'git' and 'git.exe' now consistently name the same file.
    Test for file equality before attempting a remove, in order to avoid
    nuking just-built binaries.
    
    Signed-off-by: Eric Blake <ebb9@byu.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @sbeyer @gitster

    git-am: ignore --binary option

    sbeyer authored gitster committed
    The git-apply documentation says that --binary is a historical option.
    This patch lets git-am ignore --binary and removes advertisements of this
    option.
    
    Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @neoeinstein @gitster

    bash-completion: Add non-command git help files to bash-completion

    neoeinstein authored gitster committed
    Git allows access to the gitattributes man page via `git help attributes`,
    but this is not discoverable via the bash-completion mechanism.  This
    patch adds all current non-command man pages to the completion candidate
    list.
    
    Signed-off-by: Marcus Griep <marcus@griep.us>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 15, 2008
  1. @raalkml @gitster

    Fix t3700 on filesystems which do not support question marks in names

    raalkml authored gitster committed
    Use square brackets instead.
    
    And the prominent example of the deficiency are, as usual, the filesystems
    of Microsoft house.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Utilise our new p4_read_pipe and p4_write_pipe wrappers

    Anand Kumria authored gitster committed
    Signed-off-by: Anand Kumria <wildfire@progsoc.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Add p4 read_pipe and write_pipe wrappers

    Anand Kumria authored gitster committed
    Two additional wrappers to cover 3 places where we utilise p4 in piped
    form.  Found by Tor Arvid Lund.
    
    Signed-off-by: Anand Kumria <wildfire@progsoc.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @lmarlow @gitster

    bash completion: Add '--merge' long option for 'git log'

    lmarlow authored gitster committed
    Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @lmarlow @gitster

    bash completion: Add completion for 'git mergetool'

    lmarlow authored gitster committed
    The --tool= long option to "git mergetool" can be completed with:
    
    	kdiff3 tkdiff meld xxdiff emerge
    	vimdiff gvimdiff ecmerge opendiff
    
    Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @mattmccutchen @gitster

    git format-patch documentation: clarify what --cover-letter does

    mattmccutchen authored gitster committed
    Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @gitster

    bash completion: 'git apply' should use 'fix' not 'strip'

    Eric Raible authored gitster committed
    Bring completion up to date with the man page.
    
    Signed-off-by: Eric Raible <raible@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 14, 2008
  1. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      t5304-prune: adjust file mtime based on system time rather than file mtime
      Fix escaping of glob special characters in pathspecs
  2. @gitster

    t5304-prune: adjust file mtime based on system time rather than file …

    Brandon Casey authored gitster committed
    …mtime
    
    test-chmtime can adjust the mtime of a file based on the file's mtime, or
    based on the system time. For files accessed over NFS, the file's mtime is
    set by the NFS server, and as such may vary a great deal from the NFS
    client's system time if the clocks of the client and server are out of
    sync. Since these tests are testing the expire feature of git-prune, an
    incorrect mtime could cause a file to be expired or not expired incorrectly
    and produce a test failure.
    
    Avoid this NFS pitfall by modifying the calls to test-chmtime so that the
    mtime is adjusted based on the system time, rather than the file's mtime.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    test-parse-options: use appropriate cast in length_callback

    Brandon Casey authored gitster committed
    OPT_CALLBACK() is passed &integer which is now an "int" rather than
    "unsigned long". Update the length_callback function.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @kballard @gitster

    Fix escaping of glob special characters in pathspecs

    kballard authored gitster committed
    match_one implements an optimized pathspec match where it only uses
    fnmatch if it detects glob special characters in the pattern. Unfortunately
    it didn't treat \ as a special character, so attempts to escape a glob
    special character would fail even though fnmatch() supports it.
    
    Signed-off-by: Kevin Ballard <kevin@sb.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 13, 2008
  1. @trast @gitster

    rebase -i -p: fix parent rewriting

    trast authored gitster committed
    The existing parent rewriting did not handle the case where a previous
    commit was amended (via edit or squash).  Fix by always putting the
    new sha1 of the last commit into the $REWRITTEN map.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
  2. @trast @gitster

    rebase -i -p: handle index and workdir correctly

    trast authored gitster committed
    'git rebase -i -p' forgot to update the index and working directory
    during fast forwards.  Fix this.  Makes 'GIT_EDITOR=true rebase -i -p
    <ancestor>' a no-op again.
    
    Also, it attempted to do a fast forward even if it was instructed not
    to commit (via -n).  Fall back to the cherry-pick code path and let
    that handle the issue for us.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
  3. @gitster

    GIT 1.6.0-rc3

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

    Merge branch 'maint'

    gitster authored
    * maint:
      Do not talk about "diff" in rev-list documentation.
  5. @gitster

    Do not talk about "diff" in rev-list documentation.

    gitster authored
    Since 8c02eee (git-rev-list(1): group options; reformat; document more
    options, 2006-09-01), git-rev-list documentation talks as if it supports
    any kind of diff output.  It doesn't.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @gitster

    Merge git://git.bogomips.org/git-svn

    gitster authored
    * git://git.bogomips.org/git-svn:
      git-svn: Reduce temp file usage when dealing with non-links
      git-svn: Make it incrementally faster by minimizing temp files
      Git.pm: Add faculties to allow temp files to be cached
  7. @neoeinstein

    git-svn: Reduce temp file usage when dealing with non-links

    neoeinstein authored Eric Wong committed
    Currently, in sub 'close_file', git-svn creates a temporary file and
    copies the contents of the blob to be written into it. This is useful
    for symlinks because svn stores symlinks in the form:
    
    link $FILE_PATH
    
    Git creates a blob only out of '$FILE_PATH' and uses file mode to
    indicate that the blob should be interpreted as a symlink.
    
    As git-hash-object is invoked with --stdin-paths, a duplicate of the
    link from svn must be created that leaves off the first five bytes,
    i.e. 'link '. However, this is wholly unnecessary for normal blobs,
    though, as we already have a temp file with their contents. Copying
    the entire file gains nothing, and effectively requires a file to be
    written twice before making it into the object db.
    
    This patch corrects that issue, holding onto the substr-like
    duplication for symlinks, but skipping it altogether for normal blobs
    by reusing the existing temp file.
    
    Signed-off-by: Marcus Griep <marcus@griep.us>
    Acked-by: Eric Wong <normalperson@yhbt.net>
  8. @neoeinstein

    git-svn: Make it incrementally faster by minimizing temp files

    neoeinstein authored Eric Wong committed
    Currently, git-svn would create a temp file on four occasions:
    1. Reading a blob out of the object db
    2. Creating a delta from svn
    3. Hashing and writing a blob into the object db
    4. Reading a blob out of the object db (in another place in code)
    
    Any time git-svn did the above, it would dutifully create and then
    delete said temp file.  Unfortunately, this means that between 2-4
    temporary files are created/deleted per file 'add/modify'-ed in
    svn (O(n)).  This causes significant overhead and helps the inode
    counter to spin beautifully.
    
    By its nature, git-svn is a serial beast.  Thus, reusing a temp file
    does not pose significant problems.  "truncate and seek" takes much
    less time than "unlink and create".  This patch centralizes the
    tempfile creation and holds onto the tempfile until they are deleted
    on exit.  This significantly reduces file overhead, now requiring
    at most three (3) temp files per run (O(1)).
    
    Signed-off-by: Marcus Griep <marcus@griep.us>
    Acked-by: Eric Wong <normalperson@yhbt.net>
  9. @neoeinstein

    Git.pm: Add faculties to allow temp files to be cached

    neoeinstein authored Eric Wong committed
    This patch offers a generic interface to allow temp files to be
    cached while using an instance of the 'Git' package. If many
    temp files are created and destroyed during the execution of a
    program, this caching mechanism can help reduce the amount of
    files created and destroyed by the filesystem.
    
    The temp_acquire method provides a weak guarantee that a temp
    file will not be stolen by subsequent requests. If a file is
    locked when another acquire request is made, a simple error is
    thrown.
    
    Signed-off-by: Marcus Griep <marcus@griep.us>
    Acked-by: Eric Wong <normalperson@yhbt.net>
  10. @trast @gitster

    Documentation: rev-list-options: Rewrite simplification descriptions …

    trast authored gitster committed
    …for clarity
    
    This completely rewrites the documentation of --full-history with lots
    of examples.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 12, 2008
  1. @hendeby @gitster

    Teach git diff about BibTeX head hunk patterns

    hendeby authored gitster committed
    All BibTeX entries starts with an @ followed by an entry type.  Since
    there are many entry types and own can be defined, the pattern matches
    legal entry type names instead of just the default types (which would
    be a long list).  The pattern also matches strings and comments since
    they will also be useful to position oneself in a bib-file.
    
    Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.