Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Feb 25, 2009
  1. @gitster

    GIT 1.6.2-rc2

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

    Merge branch 'jc/maint-1.6.0-pack-directory'

    gitster authored
    * jc/maint-1.6.0-pack-directory:
      Make sure objects/pack exists before creating a new pack
  3. @gitster

    Make sure objects/pack exists before creating a new pack

    gitster authored
    In a repository created with git older than f49fb35 (git-init-db: create
    "pack" subdirectory under objects, 2005-06-27), objects/pack/ directory is
    not created upon initialization.  It was Ok because subdirectories are
    created as needed inside directories init-db creates, and back then,
    packfiles were recent invention.
    
    After the said commit, new codepaths started relying on the presense of
    objects/pack/ directory in the repository.  This was exacerbated with
    8b4eb6b (Do not perform cross-directory renames when creating packs,
    2008-09-22) that moved the location temporary pack files are created from
    objects/ directory to objects/pack/ directory, because moving temporary to
    the final location was done carefully with lazy leading directory creation.
    
    Many packfile related operations in such an old repository can fail
    mysteriously because of this.
    
    This commit introduces two helper functions to make things work better.
    
     - odb_mkstemp() is a specialized version of mkstemp() to refactor the
       code and teach it to create leading directories as needed;
    
     - odb_pack_keep() refactors the code to create a ".keep" file while
       create leading directories as needed.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @jaysoffian @gitster

    Allow HTTP tests to run on Darwin

    jaysoffian authored gitster committed
    This patch allows the HTTP tests to run on OS X 10.5. It is not
    sufficient to be able to pass in LIB_HTTPD_PATH and
    LIB_HTTPD_MODULE_PATH alone, as the apache.conf also needs a couple
    tweaks.
    
    These changes are put into an <IfDefine> to keep them Darwin specific,
    but this means lib-httpd.sh needs to be modified to pass -DDarwin to
    apache when running on Darwin. As long as we're making this change to
    lib-httpd.sh, we may as well set LIB_HTTPD_PATH and
    LIB_HTTPD_MODULE_PATH to appropriate default values for the platform.
    
    Note that we now pass HTTPD_PARA to apache at shutdown as well.
    Otherwise apache will emit a harmless, but noisy warning that LogFormat
    is an unknown directive.
    
    Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @mjg @gitster

    Fix typo in contrib/examples/git-svnimport.txt

    mjg authored gitster committed
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @gitster

    gitattributes.txt: Path matching rules are explained in gitignore.txt

    Johannes Sixt authored gitster committed
    The rules how the patterns are matched against path names are the same
    for .gitattribute and .gitignore files.
    
    This also replace the notion "glob pattern" by "pattern" because
    gitignore.txt talks about "glob" only in some contexts where the pattern
    is mentioned.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @felipec @gitster

    sha1_file.c: fix typo

    felipec authored gitster committed
    it's != its
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @felipec @gitster

    git add: trivial codestyle cleanup

    felipec authored gitster committed
    Global static variables don't need to be initialized to 0/NULL.
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. @chriscool @gitster

    README: fix path to "gitcvs-migration.txt" and be more consistent

    chriscool authored gitster committed
    README suggested to look at "Documentation/gittutorial.txt" for the
    tutorial and to use "man git-commandname" for documentation of each
    command.
    
    This was not consistent because the tutorial can also be available with
    "man gittutorial" once git is installed, and the documentation for each
    command can be available at "Documentation/git-commandname.txt" before
    installing git.
    
    This patch tries to make the description more consistent.  It also fixes
    the path to the cvs-migration documentation that changed from
    "Documentation/cvs-migration.txt" to "Documentation/gitcvs-migration.txt".
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. @allancaffee @gitster

    trace: Fixed a minor typo in an error message.

    allancaffee authored gitster committed
    Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. @gitster

    Docs: Expand explanation of the use of + in git push refspecs.

    Marc Branchaud authored gitster committed
    Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. @gitster

    git-quiltimport: preserve standard input to be able to read user input

    Gerrit Pape authored gitster committed
    When run without --author and it fails to determine an author, git
    quiltimport tries `read patch_author` to get user input, but standard
    input has been redirected to the patch series file.  This commit lets
    quiltimport read the series file through file descriptor 3 so that the
    standard input is preserved.
    
    Reported by Uwe Kleine-König through http://bugs.debian.org/515910
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. @gitster

    Install builtins with the user and group of the installing personality

    Gerrit Pape authored gitster committed
    If 'make install' was run with sufficient privileges, then the installed
    builtins in gitexecdir, which are either hardlinked, symlinked, or copied,
    would receive the user and group of whoever built git.  With this commit
    the initial hardlink or copy is done from the installation tree and not
    the build tree to fix this.
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. @gitster

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

    gitster authored
    * git://git.bogomips.org/git-svn:
      git-svn fix to avoid using strftime %z
  15. @amenonsen @gitster

    Convert git-* invocations to "git *" in the svnimport example.

    amenonsen authored gitster committed
    After these changes, git-svnimport worked fine for me.
    
    Signed-off-by: Abhijit Menon-Sen <ams@toroid.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 24, 2009
  1. git-svn fix to avoid using strftime %z

    Ben Walton authored Eric Wong committed
    %z isn't available on all platforms in the date formatting
    routines.  Provide a workalike capability that should be
    more portable.
    
    Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
    Acked-by: Eric Wong <normalperson@yhbt.net>
  2. @gitster

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

    gitster authored
    * git://git.bogomips.org/git-svn:
      git-svn: read the dcommit url from the config file on a per remote basis
      git-svn: fix delete+add branch tracking with empty files
      git-svn: Create leading directories in create-ignore
Commits on Feb 23, 2009
  1. @gitster

    git-p4: avoid syncing duplicate changes

    Pete Wyckoff authored gitster committed
    When a particular changeset affects multiple depot paths, it
    will appear multiple times in the output of "p4 changes".
    Filter out the duplicates to avoid the extra empty commits that
    this otherwise would create.
    
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Acked-by: Simon Hausmann <simon@lst.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @kumbayo

    git-svn: read the dcommit url from the config file on a per remote basis

    kumbayo authored Eric Wong committed
    The commit url for dcommit is determined in the following order:
    commandline option --commit-url
    svn.commiturl
    svn-remote.<name>.commiturl
    svn-remote.<name>.url
    
    Signed-off-by: Peter Oberndorfer <kumbayo84@arcor.de>
    Acked-by: Eric Wong <normalperson@yhbt.net>
  3. git-svn: fix delete+add branch tracking with empty files

    Eric Wong authored
    Original bug report and test case by Björn Steinbrink.
    
    Björn Steinbrink <B.Steinbrink@gmx.de> wrote:
    > Hi Eric,
    >
    > seems that the empty symlink stuff gets confused about which revision to
    > use when looking for the parent's file.
    >
    > r3 = f1a6fcf6b0a1c4a373d0b2b65a3d70700084f361 (tags/1.0.1)
    > Found possible branch point: file:///home/doener/h/svn/tags/1.0 => file:///home/doener/h/svn/branches/1.0, 4
    > Found branch parent: (1.0) 63ae640ba01014ecbb3df590999ed1fa5914545b
    > Following parent with do_switch
    > Successfully followed parent
    > r5 = 26fcfef5bcced97ab74faf1af7341a2ae0d272aa (1.0)
    > Found possible branch point: file:///home/doener/h/svn/branches/1.0 => file:///home/doener/h/svn/tags/1.0.1, 5
    > Found branch parent: (tags/1.0.1) 26fcfef5bcced97ab74faf1af7341a2ae0d272aa
    > Following parent with do_switch
    > Scanning for empty symlinks, this may take a while if you have many empty files
    > You may disable this with `git config svn.brokenSymlinkWorkaround false'.
    > This may be done in a different terminal without restarting git svn
    > Filesystem has no item: File not found: revision 3, path '/branches/1.0/file' at /usr/local/libexec/git-core/git-svn line 3318
    >
    > Note how it tries to look at revision 3 instead of revision 5 (which it
    > correctly detected as the parent). The import succeeds when
    > svn.brokenSymlinkWorkaround is set to false. Testcase below.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
  4. @Benabik

    git-svn: Create leading directories in create-ignore

    Benabik authored Eric Wong committed
    Since SVN tracks empty directories and git does not, we can not assume
    that the directory exists when creating .gitignore files.
    
    Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
    Acked-by: Eric Wong <normalperson@yhbt.net>
Commits on Feb 21, 2009
  1. @gitster

    Merge branch 'for-junio' of git://source.winehq.org/~julliard/git/git

    gitster authored
    * 'for-junio' of git://source.winehq.org/~julliard/git/git:
      Add a README in the contrib/emacs directory.
      git.el: Improve the confirmation message on remove and revert.
      git.el: Make sure that file lists are sorted as they are created.
  2. @julliard

    Add a README in the contrib/emacs directory.

    julliard authored
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
  3. @julliard

    git.el: Improve the confirmation message on remove and revert.

    julliard authored
    If there's only one file, print its name instead of just "1 file".
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
  4. @julliard

    git.el: Make sure that file lists are sorted as they are created.

    julliard authored
    This avoids a possibly redundant sort in git-update-status-files and
    git-status-filenames-map, and allows callers to continue using the
    list without having to copy it.
    
    It also fixes the confusing success messages reported by Brent
    Goodrick.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
  5. @torvalds @gitster

    Support 'raw' date format

    torvalds authored gitster committed
    Talking about --date, one thing I wanted for the 1234567890 date was to
    get things in the raw format. Sure, you get them with --pretty=raw, but it
    felt a bit sad that you couldn't just ask for the date in raw format.
    
    So here's a throw-away patch (meaning: I won't be re-sending it, because I
    really don't think it's a big deal) to add "--date=raw". It just prints
    out the internal raw git format - seconds since epoch plus timezone (put
    another way: 'date +"%s %z"' format)
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 20, 2009
  1. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      More friendly message when locking the index fails.
      Document git blame --reverse.
      Documentation: Note file formats send-email accepts
  2. @moy @gitster

    More friendly message when locking the index fails.

    moy authored gitster committed
    Just saying that index.lock exists doesn't tell the user _what_ to do
    to fix the problem. We should give an indication that it's normally
    safe to delete index.lock after making sure git isn't running here.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @moy @gitster

    Document git blame --reverse.

    moy authored gitster committed
    This was introduced in 85af792 but
    not documented outside the commit message.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    gitweb: Hyperlink multiple git hashes on the same commit message line

    Marcel M. Cary authored gitster committed
    The current implementation only hyperlinks the first hash on
    a given line of the commit message.  It seems sensible to
    highlight all of them if there are multiple, and it seems
    plausible that there would be multiple even with a tidy line
    length limit, because they can be abbreviated as short as 8
    characters.
    
    Benchmark:
    
    I wanted to make sure that using the 'e' switch to the Perl regex
    wasn't going to kill performance, since this is called once per commit
    message line displayed.
    
    In all three A/B scenarios I tried, the A and B yielded the same
    results within 2%, where A is the version of code before this patch
    and B is the version after.
    
    1: View a commit message containing the last 1000 commit hashes
    2: View a commit message containing 1000 lines of 40 dots to avoid
       hyperlinking at the same message length
    3: View a short merge commit message with a few lines of text and
       no hashes
    
    All were run in CGI mode on my sub-production hardware on a recent
    clone of git.git.  Numbers are the average of 10 reqests per second
    with the first request discarded, since I expect this change to affect
    primarily CPU usage.  Measured with ApacheBench.
    
    Note that the web page rendered was the same; while the new code
    supports multiple hashes per line, there was at most one per line.
    
    The primary purpose of scenarios 2 and 3 were to verify that the
    addition of 1000 commit messages had an impact on how much of the time
    was spent rendering commit messages.  They were all within 2% of 0.80
    requests per second (much faster).
    
    So I think the patch has no noticeable effect on performance.
    
    Signed-off-by: Marcel M. Cary <marcel@oak.homeunix.org>
    Acked-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @dscho @gitster

    system_path(): simplify using strip_path_suffix(), and add suffix "git"

    dscho authored gitster committed
    At least for the author of this patch, the logic in system_path() was
    too hard to understand.  Using the function strip_path_suffix() documents
    the idea of the code better.
    
    The real change is to add the suffix "git", so that a runtime prefix will
    be computed correctly even when the executable was called in /git/ as is
    the case in msysGit (Windows insists to search the current directory
    before the PATH when looking for an executable).
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @dscho @gitster

    Introduce the function strip_path_suffix()

    dscho authored gitster committed
    The function strip_path_suffix() will try to strip a given suffix from
    a given path.  The suffix must start at a directory boundary (i.e. "core"
    is not a path suffix of "libexec/git-core", but "git-core" is).
    
    Arbitrary runs of directory separators ("slashes") are assumed identical.
    
    Example:
    
    	strip_path_suffix("C:\\msysgit/\\libexec\\git-core",
    		"libexec///git-core", &prefix)
    
    will set prefix to "C:\\msysgit" and return 0.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 19, 2009
  1. @tmzullinger @gitster

    Documentation: Note file formats send-email accepts

    tmzullinger authored gitster committed
    Signed-off-by: Todd Zullinger <tmz@pobox.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 18, 2009
  1. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      tests: fix "export var=val"
      Skip timestamp differences for diff --no-index
      Documentation/git-push: --all, --mirror, --tags can not be combined
  2. @gitster

    tests: fix "export var=val"

    gitster authored
    Some shells do not like "export var=val"; the right way to write
    it is to do an assignment and then export just the variable name.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.