Permalink
Commits on Jan 8, 2006
  1. GIT 1.1.0

    Junio C Hamano committed Jan 8, 2006
  2. Add a test for rebase when a change was picked upstream

    This test exercises the standard feature that makes rebase useful.
    
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ydirson committed with Junio C Hamano Jan 8, 2006
  3. Add a minimal test for git-cherry

    This test checks that git-cherry finds the expected number of patches
    in two simple cases, and then tests the new limit arguments.
    
    [jc: collapsed two patches into one and added sleep to make sure
     the two commits would get different timestamps]
    
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ydirson committed with Junio C Hamano Jan 8, 2006
  4. Add an optional limit to git-cherry

    This allows to use another commit than the merge base as a limit for
    scanning patches.
    
    [jc: part about t3500 test omitted.]
    
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ydirson committed with Junio C Hamano Jan 8, 2006
  5. git-daemon --base-path

    Tommi Virtanen expressed a wish on #git to be able to use short and elegant
    git URLs by making git-daemon 'root' in a given directory. This patch
    implements this, causing git-daemon to interpret all paths relative to
    the given base path if any is given.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Petr Baudis committed with Junio C Hamano Dec 23, 2005
  6. describe: allow more than one revs to be named.

    The main loop was prepared to take more than one revs, but the actual
    naming logic wad not (it used pop_most_recent_commit while forgetting
    that the commit marks stay after it's done).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 8, 2006
  7. ls-files --others --directory: test

    Add a test to run with --directory option.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
  8. git-status: use ls-files --others --directory for untracked list.

    This shortens "Untracked files" list by using --directory option
    when running ls-files --others.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
  9. ls-files --others --directory: give trailing slash

    This adds a trailing slash to directory names in the output
    when "--others --directory" option shows only untracked
    directories and not their contents, to make them stand out.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
  10. ls-files --others --directory: fix a bug with index entry ordering

    When both howto-index.sh and howto/make-dist.txt exist under
    Documentation/ directory, dir_exists() mistakenly checked it
    without the trailing slash to see if there was something under
    Documentation/howto directory, and did not realize there was,
    because '-' sorts earlier than '/' and cache_name_pos() finds
    howto-index.sh, which is not under howto/ directory.  This
    caused --others --directory to show it which was incorrect.
    
    Check the directory name with the trailing slash, because having
    an entry that has such as a prefix is what we are looking for.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
  11. ls-files -o: optionally skip showing the contents in "untracked" dire…

    …ctories
    
    Darrin Thompson notes that git-ls-files -o reports all the unknown
    files it finds in a work area.  Subversion and probably other systems
    "simply ignore all the files and directories inside an unknown
    directory and just note the directory as unknown."
    
    With --directory option, ls-files --others shows untracked directories
    without descending into them.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Jan 4, 2006
  12. git-fetch: auto-following tags.

    I added things to ls-remote so that Cogito can auto-follow tags
    easily and correctly a while ago, but git-fetch did not use the
    facility.  Recently added git-describe command relies on
    repository keeping up-to-date set of tags, which made it much
    more attractive to automatically follow tags, so we do that as
    well.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
  13. GIT 1.0.8

    Junio C Hamano committed Jan 8, 2006
  14. mailsplit: allow empty input from stdin

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 8, 2006
  15. revert/cherry-pick: handle single quote in author name.

    The same fix as aa66c7e is
    needed here.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 8, 2006
  16. Fix git-format-patch usage string wrt output modes.

    --stdout was not mentionned, and the description for the case where -o
    was not given was thus incomplete.
    
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ydirson committed with Junio C Hamano Jan 8, 2006
  17. Fix typo in debug stanza of t2001

    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ydirson committed with Junio C Hamano Jan 8, 2006
Commits on Jan 7, 2006
  1. tar-tree: finish honoring extractor's umask in git-tar-tree.

    Earlier commit 38ec15a forgot
    to apply the same principle of not forcing go-w to the base
    directory when specified.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
  2. [PATCH] Compilation: zero-length array declaration.

    ISO C99 (and GCC 3.x or later) lets you write a flexible array
    at the end of a structure, like this:
    
    	struct frotz {
    		int xyzzy;
    		char nitfol[]; /* more */
    	};
    
    GCC 2.95 and 2.96 let you to do this with "char nitfol[0]";
    unfortunately this is not allowed by ISO C90.
    
    This declares such construct like this:
    
    	struct frotz {
    		int xyzzy;
    		char nitfol[FLEX_ARRAY]; /* more */
    	};
    
    and git-compat-util.h defines FLEX_ARRAY to 0 for gcc 2.95 and
    empty for others.
    
    If you are using a C90 C compiler, you should be able
    to override this with CFLAGS=-DFLEX_ARRAY=1 from the
    command line of "make".
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
  3. prune: do not show error from pack-redundant when no packs are found.

    When there is no pack yet, git-prune leaked an error message
    from "git-pack-redundant --all" which complained that there is
    no pack.  Squelch the annoying message.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
  4. Retire debian/ directory.

    The official maintainer is keeping up-to-date quite well, and now
    the older Debian is supported with backports.org, there is no reason
    for me to keep debian/ directory around here.
    
    I have not been building and publishing debs since 1.0.4 anyway.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
  5. unpack-objects: default to quiet if stderr is not a tty.

    This would help cron/at jobs that run send-pack to mirror
    repositories.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
Commits on Jan 6, 2006
  1. Substitute "/" with $opt_s in tag names as well as branch names

    In 'git cvsimport' changes "/" to "-" (or $opt_s) in branch names,
    but not in tag names, which is inconsistent.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jenglish committed with Junio C Hamano Jan 6, 2006
  2. Teach cvsexportcommit to add new files

    "cvs add" support was already there, but the "unknown" status
    returned when querying a file not yet known to cvs caused the
    script to abort prematurely.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ydirson committed with Junio C Hamano Jan 6, 2006
  3. Make GIT-VERSION-GEN tolerate missing git describe command

    I think it is probably a bug that "git non_existent_command"
    returns its error message to stdout without an error, where
    "git-non_existent_command" behaves differently and does return an
    error.
    
    Older versions of git did not implement "git describe"  and
    GIT-VERSION-GEN produces an empty version string if run on
    a system with such a git installed.  The consequence
    is that "make rpm" fails.
    
    This patch fixes GIT-VERSION-GEN so that it works in the
    absence of a working "git describe"
    
    Signed-off-by: John Ellson <ellson@research.att.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ellson committed with Junio C Hamano Dec 30, 2005
  4. Merge fixes up to GIT 1.0.7

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 6, 2006
  5. GIT 1.0.7

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 6, 2006
  6. Fix git-symbolic-ref typo in git.txt.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Jon Loeliger committed with Junio C Hamano Jan 3, 2006
  7. git: grok 'help' to mean '--help'.

    Most other scm's understand it, most users expect it and it's an easy fix.
    
    Signed-off-by: Andreas Ericsson <ae@op5.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Andreas Ericsson committed with Junio C Hamano Jan 3, 2006
  8. Documentation/git-svnimport: document -T and -t switches correctly

    The -T and -t switches are swapped in the documentation and actual
    code.  I've made the documentation match the code.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Eric Wong committed with Junio C Hamano Jan 1, 2006
  9. svnimport: support repositories requiring SSL authentication

    I looked at svn-mirror to see how it did this, seems about right.
    "It works for me" when using it against https://svn.musicpd.org
    
    tested command-line: git-svnimport -C mpc -i -m -v  \
    	-T mpc/trunk -b mpc/branches -t mpc/tags https://svn.musicpd.org
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Eric Wong committed with Junio C Hamano Jan 1, 2006
  10. t3300: skip when filesystem does not like TAB in filenames.

    Instead of checking Cygwin explicitly, see if the filesystem lets us
    create funny filenames.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 6, 2006
  11. format-patch/commit: Quote single quote in the author name properly.

    Noticed by Kyle McMartin.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 6, 2006
  12. git-fetch --tags: reject malformed tags.

    When the other end was prepared with older git and has tags that
    do not follow the naming convention (see check-ref-format), do not
    barf but simply reject to copy them.
    
    Initial fix by Simon Richter, but done differently.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 6, 2006
  13. Wrap synopsis lines and use [verse] to keep formatting

    In addition, also fixes a few synopses to be more consistent and a gitlink.
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jonas committed with Junio C Hamano Dec 31, 2005