Permalink
Commits on Feb 14, 2007
  1. GIT 1.5.0

    Junio C Hamano
    Junio C Hamano committed Feb 14, 2007
Commits on Feb 13, 2007
  1. Add release notes to the distribution.

    Junio C Hamano
    Junio C Hamano committed Feb 13, 2007
    This also adds a hook in the Makefile I can use to automatically
    include pointers to documentation for older releases when updating
    the pages at http://kernel.org/pub/software/scm/git/docs/.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Merge branch 'master' of git://repo.or.cz/git-gui

    Junio C Hamano
    Junio C Hamano committed Feb 13, 2007
    * 'master' of git://repo.or.cz/git-gui:
      git-gui: fix typo in GIT-VERSION-GEN, "/dev/null" not "/devnull"
  3. Documentation: Moving out of detached HEAD does not warn anymore.

    Junio C Hamano
    Junio C Hamano committed Feb 13, 2007
    The documentation still talked about the unnecessary 'safety'
    in git-checkout.
    
    Pointed out by Matthias Lederhofer.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Mark places that need blob munging later for CRLF conversion.

    torvalds authored and Junio C Hamano committed Feb 13, 2007
    Here's a patch that I think we can merge right now. There may be
    other places that need this, but this at least points out the
    three places that read/write working tree files for git
    update-index, checkout and diff respectively. That should cover
    a lot of it [jc: git-apply uses an entirely different codepath
    both for reading and writing].
    
    Some day we can actually implement it. In the meantime, this
    points out a place for people to start. We *can* even start with
    a really simple "we do CRLF conversion automatically, regardless
    of filename" kind of approach, that just look at the data (all
    three cases have the _full_ file data already in memory) and
    says "ok, this is text, so let's convert to/from DOS format
    directly".
    
    THAT somebody can write in ten minutes, and it would already
    make git much nicer on a DOS/Windows platform, I suspect.
    
    And it would be totally zero-cost if you just make it a config
    option (but please make it dynamic with the _default_ just being
    0/1 depending on whether it's UNIX/Windows, just so that UNIX
    people can _test_ it easily).
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Update RPM core package description

    Nicolas Pitre Junio C Hamano
    Nicolas Pitre authored and Junio C Hamano committed Feb 13, 2007
    Git isn't as stupid as it used to be
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Fix potential command line overflow in hooks--update

    andyparkins authored and Junio C Hamano committed Feb 13, 2007
    In a repository with a large number of refs, the following command line
    could easily overflow the command line size limitations
    
     git-rev-list $newref $(git-rev-parse --not --all)
    
    Fortunately, git-rev-list already has the means to cope with this
    situation with the --stdin switch
    
     git-rev-parse --not --all | git-rev-list --stdin $newref
    
    Which is exactly what this patch does.
    
    Signed-off-by: Andy Parkins <andyparkins@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. git-gc: run pack-refs by default unless the repo is bare

    dscho authored and Junio C Hamano committed Feb 13, 2007
    The config variable gc.packrefs is tristate now: "true", "false"
    and "notbare", where "notbare" is the default.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. git-gui: fix typo in GIT-VERSION-GEN, "/dev/null" not "/devnull"

    andyparkins authored and spearce committed Feb 13, 2007
    Signed-off-by: Andy Parkins <andyparkins@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  9. "git-fetch --tags $URL" should not overwrite existing tags

    Junio C Hamano
    Junio C Hamano committed Feb 11, 2007
    Use the same --exclude-existing filter as we use for automatic
    tag following to avoid overwriting existing tags with replacement
    ones the other side created.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. for-each-reflog: not having $GIT_DIR/logs directory is not an error.

    Junio C Hamano
    Junio C Hamano committed Feb 13, 2007
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. Do not forget to pack objects reachable from HEAD reflog.

    Junio C Hamano
    Junio C Hamano committed Feb 13, 2007
    Similar to commit eb8381c, we need to use for_each_reflog() to make
    sure we do not miss objects reachable from HEAD reflog.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. Work around Subversion race in git-svn tests.

    Michael Spang Junio C Hamano
    Michael Spang authored and Junio C Hamano committed Feb 13, 2007
    Some of the git-svn tests can fail on fast machines due to a race in
    Subversion: if a file is modified in the same second it was checked out
    (or in for that matter), Subversion will not consider it modified. This
    works around the problem by increasing the timestamp by one second
    before each commit.
    
    [jc: with "touch -r -d" replacement from Eric]
    
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Michael Spang <mspang@uwaterloo.ca>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  13. Clarify that git-update-server-info should be run for every git-push

    proski authored and Junio C Hamano committed Feb 13, 2007
    The old text suggested that git-update-server-info only needs to be run
    if new tags or branches are created, but not for new commits.
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  14. blameview: Move the commit info to a pane below the blame window.

    kvaneesh authored and Junio C Hamano committed Feb 12, 2007
    Also spawn the the new blameview in the background
    
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  15. git merge documentation: -m is optional

    matled authored and Junio C Hamano committed Feb 5, 2007
    Changed -m=<msg> to -m <msg> too.
    
    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  16. Make gitk save and restore window pane position on Linux and Cygwin.

    mark987 authored and Junio C Hamano committed Feb 13, 2007
    Subtle bugs remained on both Cygwin and Linux that caused the various
    window panes to be restored in positions different than where the user
    last placed them. Sergey Vlasov posed a pair of suggested fixes to this,
    what is done here is slightly different. The basic fix here involves
    a) explicitly remembering and restoring the sash positions for the upper
    window, and b) using paneconfigure to redundantly set height and width of
    other elements. This redundancy is needed as Cygwin Tcl has a nasty habit
    of setting pane sizes to zero if their slaves are not configured with a
    specific size, but Linux Tcl does not honor the specific size given.
    
    Signed-off-by: Mark Levedahl <mdl123@verizon.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  17. Add RPM target for git-gui

    Junio C Hamano
    Junio C Hamano committed Feb 13, 2007
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  18. Link git-gui into the master Makefile.

    spearce authored and Junio C Hamano committed Feb 12, 2007
    I'm exporting gitexecdir because git-gui wants to know where
    it should install git-gui and git-citool.  These belong under
    gitexecdir, just like git-diff, as the git wrapper is able to
    invoke these commands for the end-user.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  19. Merge branch 'master' of git://repo.or.cz/git-gui

    Junio C Hamano
    Junio C Hamano committed Feb 13, 2007
    * 'master' of git://repo.or.cz/git-gui:
      git-gui: Change base version to 0.6.
      git-gui: Guess our version accurately as a subproject.
      git-gui: Handle gitgui tags in version gen.
      git-gui: Generate a version file on demand.
      git-gui: Rename GIT_VERSION to GITGUI_VERSION.
      git-gui: Allow gitexecdir, INSTALL to be set by the caller.
Commits on Feb 12, 2007
  1. git-gui: Change base version to 0.6.

    spearce committed Feb 12, 2007
    This is the start of the 0.6 series of git-gui.  I'm calling it 0.6
    (rather than any other value) as I already had a private tag on
    one system based on 0.5, and that tag is quite a bit behind this
    version.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  2. git-gui: Guess our version accurately as a subproject.

    spearce committed Feb 12, 2007
    When we are included as a subproject, such as how git.git carries
    us, we want to retain our own version number and not the version
    number assigned by git.git's own tags.  Consequently we need to
    locate the correct tag which applies to our tree content and
    its commit lineage.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  3. git-gui: Handle gitgui tags in version gen.

    spearce committed Feb 12, 2007
    I've decided to use gitgui-0.5 as the format for tags in the
    git-gui repository.  The prefix of gitgui was chosen here to
    make its namespace different from the namespace used by git
    itself, allowing developers to pull both tag namespaces into
    the same repository.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  4. git-gui: Generate a version file on demand.

    spearce committed Feb 12, 2007
    Because git-gui is being shipped as a subproject of the main
    Git project and will often have a different lifecycle than
    the main Git project, we should ship our own version number
    in the release tarball rather than relying on the main Git
    version file.
    
    Git's master Makefile will invoke our own with the target
    dist-version, asking us to save off our GITGUI_VERSION value
    into our own version file, so that our GIT-VERSION-GEN script
    can recover it at build time.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  5. git-gui: Rename GIT_VERSION to GITGUI_VERSION.

    spearce committed Feb 12, 2007
    Now that the decision has been made to treat git-gui as a
    subproject, rather than merging it directly into git, we
    should use a different substitution for our version value
    to avoid any possible confusion.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  6. git-gui: Allow gitexecdir, INSTALL to be set by the caller.

    spearce committed Feb 12, 2007
    When used as a subproject within git.git our Makefile must honor
    the gitexecdir which git.git's Makefile is passing down to us,
    ensuring that we install our executables into the libexec chosen
    by the end-user or packager.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  7. import-tars: brown paper bag fix for file mode.

    zvpunry authored and spearce committed Feb 12, 2007
    There is a bug with this $git_mode variable which should be 0644
    or 0755, but nothing else I think.
    
    Signed-off-by: Michael Loeffler <zvpunry@zvpunry.de>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  8. fast-import: Support reusing 'from' and brown paper bag fix reset.

    spearce committed Feb 12, 2007
    It was suggested on the mailing list that being able to use `from`
    in any commit to reset the current branch is useful in some types of
    importers, such as a darcs importer.
    
    We originally did not permit resetting an existing branch with a
    new `from` command during a `commit` command, but this restriction
    was only to help debug the hacked up cvs2svn that Jon Smirl was
    developing in parallel with git-fast-import.  It is probably more
    of a problem to disallow it than to allow it.  So now we permit a
    `from` during any `commit`.
    
    While making the changes required to permit multiple `from`
    commands on the same branch, I discovered we no longer needed the
    last_commit field to be set to 0 during a reset, so that was removed.
    (Reset was originally setting the field to 0 to signal cmd_from()
    that it was OK to execute on the branch.)
    
    While poking around in this section of fast-import I also realized
    the `reset` command was not working as intended if the corresponding
    `from` command was omitted (as allowed by the BNF grammar and the
    code).  If `from` was omitted we cleared out the tree but we left
    the tree SHA-1 and parent commit SHA-1 intact.  This is not what
    the user intended in this case.  Instead they would be trying to
    reset the branch to have no parent and to have no tree, making the
    branch look new-born during the next commit.  We now clear these
    SHA-1 values during `reset`, ensuring the branch looks new-born if
    `from` does not get supplied.
    
    New test cases for these were also added.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  9. Merge git-gui

    Junio C Hamano
    Junio C Hamano committed Feb 12, 2007
    This merges git-gui project of Shawn as a subproject of git.git
    at git-gui/ subdirectory.
    
    This merge only melds two histories together.  The toplevel Makefile
    does not even know about git-gui yet.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. Add discussion section to git-tag documentation.

    Junio C Hamano
    Junio C Hamano committed Feb 12, 2007
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. Teach git-am to pass -p option down to git-apply

    Junio C Hamano
    Junio C Hamano committed Feb 12, 2007
    This is originally from Andy Parkins whose patch used --patchdepth; let's
    use -p which is more in line with the underlying git-apply.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. Documentation: git-rebase -C<n>

    Junio C Hamano
    Junio C Hamano committed Feb 12, 2007
    Replace -CNUM in Synopsis section with -C<n> to make it consistent with
    the description text.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  13. Merge branch 'master' of git://repo.or.cz/git/fastimport

    Junio C Hamano
    Junio C Hamano committed Feb 12, 2007
    * 'master' of git://repo.or.cz/git/fastimport:
      bash: Hide git-fast-import.
      fast-import: Add tip about importing renames.
      fast-import: Hide the pack boundary commits by default.
  14. bash: Hide git-fast-import.

    spearce committed Feb 12, 2007
    The new git-fast-import command is not intended to be invoked
    directly by an end user.  So offering it as a possible completion
    for a subcommand is not very useful.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  15. fast-import: Add tip about importing renames.

    spearce committed Feb 12, 2007
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>