Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Feb 11, 2009

  1. Junio C Hamano

    Revert "Merge branch 'js/notes'"

    This reverts commit 7b75b33, reversing
    changes made to 5d680a6.
    authored February 10, 2009

Feb 06, 2009

  1. Junio C Hamano

    Merge branch 'js/notes'

    * js/notes:
      git-notes: fix printing of multi-line notes
      notes: fix core.notesRef documentation
      Add an expensive test for git-notes
      Speed up git notes lookup
      Add a script to edit/inspect notes
      Introduce commit notes
    
    Conflicts:
    	pretty.c
    authored February 05, 2009

Feb 01, 2009

  1. Junio C Hamano

    Merge branch 'jk/signal-cleanup'

    * jk/signal-cleanup:
      t0005: use SIGTERM for sigchain test
      pager: do wait_for_pager on signal death
      refactor signal handling for cleanup functions
      chain kill signals for cleanup functions
      diff: refactor tempfile cleanup handling
      Windows: Fix signal numbers
    authored January 31, 2009

Jan 25, 2009

  1. Benjamin Kramer

    Ignore test-ctype

    Signed-off-by: Benjamin Kramer <benny.kra@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored January 24, 2009 gitster committed January 25, 2009

Jan 22, 2009

  1. Jeff King

    chain kill signals for cleanup functions

    If a piece of code wanted to do some cleanup before exiting
    (e.g., cleaning up a lockfile or a tempfile), our usual
    strategy was to install a signal handler that did something
    like this:
    
      do_cleanup(); /* actual work */
      signal(signo, SIG_DFL); /* restore previous behavior */
      raise(signo); /* deliver signal, killing ourselves */
    
    For a single handler, this works fine. However, if we want
    to clean up two _different_ things, we run into a problem.
    The most recently installed handler will run, but when it
    removes itself as a handler, it doesn't put back the first
    handler.
    
    This patch introduces sigchain, a tiny library for handling
    a stack of signal handlers. You sigchain_push each handler,
    and use sigchain_pop to restore whoever was before you in
    the stack.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored January 22, 2009 gitster committed January 21, 2009

Dec 21, 2008

  1. dscho

    Add a script to edit/inspect notes

    The script 'git notes' allows you to edit and show commit notes, by
    calling either
    
    	git notes show <commit>
    
    or
    
    	git notes edit <commit>
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored December 20, 2008 gitster committed December 21, 2008

Dec 04, 2008

  1. Jeff King

    add stage to gitignore

    This is a generated builtin since 24b1f65 (Install git-stage in
    exec-path).
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored December 03, 2008 gitster committed December 03, 2008

Aug 14, 2008

  1. Update .gitignore to ignore git-help

    Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 13, 2008 gitster committed August 13, 2008

Jul 07, 2008

  1. Junio C Hamano

    Merge branch 'dr/ceiling'

    * dr/ceiling:
      Eliminate an unnecessary chdir("..")
      Add support for GIT_CEILING_DIRECTORIES
      Fold test-absolute-path into test-path-utils
      Implement normalize_absolute_path
    
    Conflicts:
    
    	cache.h
    	setup.c
    authored July 07, 2008

Jul 05, 2008

  1. Miklos Vajna

    Retire 'stupid' merge strategy

    As pointed out by Linus, this strategy tries to take the best merge
    base, but 'recursive' just does it better. If one needs something more
    than 'resolve' then he/she should really use 'recursive' and not
    'stupid'.
    
    Cf. Message-ID: <alpine.LFD.1.10.0807030947360.18105@woody.linux-foundation.org>
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 05, 2008 gitster committed July 05, 2008

May 23, 2008

  1. Fold test-absolute-path into test-path-utils

    Signed-off-by: David Reiss <dreiss@facebook.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored May 19, 2008 gitster committed May 23, 2008
  2. Implement normalize_absolute_path

    normalize_absolute_path removes several oddities form absolute paths,
    giving nice clean paths like "/dir/sub1/sub2".  Also add a test case
    for this utility, based on a new test program (in the style of test-sha1).
    
    Signed-off-by: David Reiss <dreiss@facebook.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored May 19, 2008 gitster committed May 23, 2008

Feb 29, 2008

  1. Jeff King

    use build-time SHELL_PATH in test scripts

    The top-level Makefile now creates a GIT-BUILD-OPTIONS file
    which stores any options selected by the make process that
    may be of use to further parts of the build process.
    Specifically, we store the SHELL_PATH so that it can be used
    by tests to construct shell scripts on the fly.
    
    The format of the GIT-BUILD-OPTIONS file is Bourne shell,
    and it is sourced by test-lib.sh; all tests can rely on just
    having $SHELL_PATH correctly set in the environment.
    
    The GIT-BUILD-OPTIONS file is written every time the
    toplevel 'make' is invoked. Since the only users right now
    are the test scripts, there's no drawback to updating its
    timestamp. If something build-related depends on this, we
    can do a trick similar to the one used by GIT-CFLAGS.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored February 24, 2008 gitster committed February 29, 2008

Feb 10, 2008

  1. dscho

    Adjust .gitignore for 5884f1(Rename 'git-help--browse.sh'...)

    Since git-help--browse was renamed, we should ignore git-web--browse
    instead.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored February 08, 2008 gitster committed February 09, 2008

Dec 21, 2007

  1. Charles Bailey

    Remove old generated files from .gitignore.

    Some entries in .gitignore are obselete.  These should be cleaned up
    just for the sake of general tidiness and so that any developers who
    have a working tree that was moved forward without a clean know that
    they have old stuff in their work tree.
    
    Signed-off-by: Charles Bailey <charles@hashpling.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored December 20, 2007 gitster committed December 20, 2007

Dec 16, 2007

  1. Jeff King

    rename git-browse--help to git-help--browse

    The convention for helper scripts has been
    git-$TOOL--$HELPER. Since this is a "browse" helper for the
    "help" tool, git-help--browse is a more sensible name.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored December 16, 2007 gitster committed December 16, 2007

Dec 15, 2007

  1. Junio C Hamano

    Rename git-browse-help helper to git-browse--help

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored December 14, 2007

Dec 10, 2007

  1. Jeff King

    Add git-browse-help to .gitignore

    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored December 10, 2007 gitster committed December 10, 2007

Dec 05, 2007

  1. Junio C Hamano

    Merge branch 'kh/commit'

    * kh/commit: (33 commits)
      git-commit --allow-empty
      git-commit: Allow to amend a merge commit that does not change the tree
      quote_path: fix collapsing of relative paths
      Make git status usage say git status instead of git commit
      Fix --signoff in builtin-commit differently.
      git-commit: clean up die messages
      Do not generate full commit log message if it is not going to be used
      Remove git-status from list of scripts as it is builtin
      Fix off-by-one error when truncating the diff out of the commit message.
      builtin-commit.c: export GIT_INDEX_FILE for launch_editor as well.
      Add a few more tests for git-commit
      builtin-commit: Include the diff in the commit message when verbose.
      builtin-commit: fix partial-commit support
      Fix add_files_to_cache() to take pathspec, not user specified list of files
      Export three helper functions from ls-files
      builtin-commit: run commit-msg hook with correct message file
      builtin-commit: do not color status output shown in the message template
      file_exists(): dangling symlinks do exist
      Replace "runstatus" with "status" in the tests
      t7501-commit: Add test for git commit <file> with dirty index.
      ...
    authored December 04, 2007

Dec 03, 2007

  1. dscho

    Add 'git fast-export', the sister of 'git fast-import'

    This program dumps (parts of) a git repository in the format that
    fast-import understands.
    
    For clarity's sake, it does not use the 'inline' method of specifying
    blobs in the commits, but builds the blobs before building the commits.
    
    Since signed tags' signatures will not necessarily be valid (think
    transformations after the export, or excluding revisions, changing
    the history), there are 4 modes to handle them: abort (default),
    ignore, warn and strip.  The latter just turns the tags into
    unsigned ones.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored December 02, 2007 gitster committed December 02, 2007

Nov 23, 2007

  1. Port git commit to C.

    This makes git commit a builtin and moves git-commit.sh to
    contrib/examples.  This also removes the git-runstatus
    helper, which was mostly just a git-status.sh implementation detail.
    
    Signed-off-by: Kristian Høgsberg <krh@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 08, 2007 gitster committed November 22, 2007

Nov 02, 2007

  1. Junio C Hamano

    Merge branch 'ph/parseopt'

    * ph/parseopt: (24 commits)
      gc: use parse_options
      Fixed a command line option type for builtin-fsck.c
      Make builtin-pack-refs.c use parse_options.
      Make builtin-name-rev.c use parse_options.
      Make builtin-count-objects.c use parse_options.
      Make builtin-fsck.c use parse_options.
      Update manpages to reflect new short and long option aliases
      Make builtin-for-each-ref.c use parse-opts.
      Make builtin-symbolic-ref.c use parse_options.
      Make builtin-update-ref.c use parse_options
      Make builtin-revert.c use parse_options.
      Make builtin-describe.c use parse_options
      Make builtin-branch.c use parse_options.
      Make builtin-mv.c use parse-options
      Make builtin-rm.c use parse_options.
      Port builtin-add.c to use the new option parser.
      parse-options: allow callbacks to take no arguments at all.
      parse-options: Allow abbreviated options when unambiguous
      Add shortcuts for very often used options.
      parse-options: make some arguments optional, add callbacks.
      ...
    
    Conflicts:
    
    	Makefile
    	builtin-add.c
    authored November 02, 2007

Oct 31, 2007

  1. No longer install git-svnimport, move to contrib/examples

    This has been proposed for a few times without much reaction
    from the list.  Actually remove it to see who screams.
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored October 30, 2007 gitster committed October 30, 2007

Oct 30, 2007

  1. dscho

    Add tests for parse-options.c

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    authored October 13, 2007 gitster committed October 29, 2007

Oct 16, 2007

  1. makefile: Add a cscope target

    The current makefile supports ctags but not cscope. Some people prefer
    cscope (I do), so this patch adds a cscope target.
    
    I've also added cscope* to the .gitignore file. For some reason tags
    and TAGS weren't in there either so I've added them too.
    
    Signed-off-by: Kristof Provost <Kristof@provost-engineering.be>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    authored October 06, 2007 spearce committed October 15, 2007

Sep 26, 2007

  1. kraai

    Move convert-objects to contrib.

    convert-objects was needed to convert from an old-style repository,
    which hashed the compressed contents and used a different date format.
    Such repositories are presumably no longer common and, if such
    conversions are necessary, should be done by writing a frontend for
    git-fast-import.
    
    Linus, the original author, is OK with moving it to contrib.
    
    Signed-off-by: Matt Kraai <kraai@ftbfs.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored September 25, 2007 gitster committed September 25, 2007

Aug 04, 2007

  1. Randal L. Schwartz

    add "test-absolute-path" to .gitignore

    New file requires new ignore.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 04, 2007 gitster committed August 04, 2007

Jul 02, 2007

  1. Junio C Hamano

    Merge branch 'ns/stash'

    * ns/stash:
      Documentation: quote {non-attributes} for asciidoc
      git-stash: don't complain when listing in a repo with no stash
      git-stash: fix "can't shift that many" with no arguments
      git-stash: fix "no arguments" case in documentation
      git-stash: require "save" to be explicit and update documentation
      Document git-stash
      Add git-stash script
    authored July 02, 2007

Jul 01, 2007

  1. Add git-stash script

    When my boss has something to show me and I have to update, for some
    reason I am always in the middle of doing something else, and git pull
    command refuses to work in such a case.
    
    I wrote this little script to save the changes I made, perform the
    update, and then come back to where I was, but on top of the updated
    commit.
    
    This is how you would use the script:
    
      $ git stash
      $ git pull
      $ git stash apply
    
    [jc: with a few fixlets from the list]
    
    Signed-off-by: Nanako Shiraishi <nanako3@bluebottle.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored June 30, 2007 gitster committed June 30, 2007

Jun 27, 2007

  1. Matthias Lederhofer

    ignore git-rebase--interactive

    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored June 26, 2007 gitster committed June 26, 2007

Jun 16, 2007

  1. Junio C Hamano

    Merge branch 'maint' to sync with GIT 1.5.2.2

    authored June 16, 2007
  2. Jakub Narębski

    Generated spec file to be ignored is named git.spec and not git-core.…

    …spec
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored June 14, 2007 gitster committed June 15, 2007

Jun 10, 2007

  1. Linus Torvalds

    Makefile: add an explicit rule for building assembly output

    In the kernel we have a rule for *.c -> *.s files exactly because
    it's nice to be able to easily say "ok, what does that generate".
    
    Here's a patch to add such a rule to git too, in case anybody is
    interested. It makes it much simpler to just do
    
    	make sha1_file.s
    
    and look at the compiler-generated output that way, rather than having to
    fire up gdb on the resulting binary.
    
    (Add -fverbose-asm or something if you want to, it can make the result
    even more readable)
    
    [jc: add *.s to .gitignore]
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored May 30, 2007 gitster committed June 10, 2007

Jun 06, 2007

  1. Matthias Lederhofer

    add git-filter-branch to .gitignore

    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored June 05, 2007 gitster committed June 06, 2007

Jun 03, 2007

  1. Randal L. Schwartz

    Add test-sha1 to .gitignore.

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored June 03, 2007 gitster committed June 03, 2007
Something went wrong with that request. Please try again.