Permalink
Commits on Apr 21, 2007
  1. GIT 1.5.1.2

    Junio C Hamano committed Apr 21, 2007
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. perl: install private Error.pm if the site version is older than our own

    Eric Wong committed with Junio C Hamano Apr 21, 2007
    bdash (on IRC) had a problem with Git.pm (via git-svn) when his
    site installation of Error.pm was older than the version we
    package.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. git-clone: fix dumb protocol transport to clone from pack-pruned ref

    Junio C Hamano committed Apr 21, 2007
    This forward-ports a fix from 2986c02 to git-clone.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 19, 2007
  1. Update git-config documentation

    aeruder committed with Junio C Hamano Apr 19, 2007
    Documentation/git-config.txt: Added documentation for --system
    Documentation/builtin-config.c: Added --system to the short usage
    
    Signed-off-by: Andrew Ruder <andy@aeruder.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Fix unmatched emphasis tag in git-tutorial

    aeruder committed with Junio C Hamano Apr 19, 2007
    In asciidoc 7.1.2 and prior there is no obvious way to get:
    
    'add'ing
    
    to emphasize only the "add", instead it treats the first apostrophe as the
    beginning of an emphasis, and the second apostrophe as a regular
    apostrophe and makes the rest of the line an emphasis since there is no
    closing apostrophe.  In the newer asciidoc you can do it pretty easily
    with __add__ing but I'm not sure it would be best to make that a prereq
    for something as silly as this.
    
    Signed-off-by: Andrew Ruder <andy@aeruder.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Update git-cherry-pick documentation

    aeruder committed with Junio C Hamano Apr 19, 2007
    Documentation/git-cherry-pick.txt: Remove --replay as it is not
    handled by the code (-r is however).
    
    Signed-off-by: Andrew Ruder <andy@aeruder.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Update git-archive documentation

    aeruder committed with Junio C Hamano Apr 19, 2007
    Documentation/git-archive.txt: Document -v/--verbose option.
    Add -l as short form of --list.
    
    Signed-off-by: Andrew Ruder <andy@aeruder.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. fix up strtoul_ui error handling

    awhitcroft committed with Junio C Hamano Apr 19, 2007
    Two scanf() calls were converted to strtoul_ui() but the return
    values were not updated to match.  scanf() returns the number of
    matched "values" which for this usage is 1 on success.  strtoul_ui()
    return 0 on success.  Update these call sites to match.
    
    Signed-off-by: Andy Whitcroft <apw@shadowen.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. git-tar-tree: complete deprecation conversion message

    Sam Vilain committed with Junio C Hamano Apr 18, 2007
    The syntax for git-archive is different; warn about it in the
    deprecation message on the manual page.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 18, 2007
  1. git-shortlog: Fix two formatting errors in asciidoc documentation

    flichtenheld committed with Junio C Hamano Apr 18, 2007
    First use [verse] in the SYNOPSIS so that the line break actually
    shows.
    
    Secondly drop the quotes around '.mailmap' since this exposes
    a bug in our toolchain (didn't bother enough yet to find out wether
    it is asciidoc's fault or that of the XSL templates) that leads to
    the dot not getting escaped correctly in the roff output and thereby
    swallowing the line.
    
    Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Fix overwriting of files when applying contextually independent diffs

    raalkml committed with Junio C Hamano Apr 18, 2007
    Noticed by applying two diffs of different contexts to the same file.
    
    The check for existence of a file was wrong: the test assumed it was
    a directory and reset the errno (twice: directly and by calling
    lstat). So if an entry existed and was _not_ a directory no attempt
    was made to rename into it, because the errno (expected by renaming
    code) was already reset to 0. This resulted in error:
    
        fatal: unable to write file file mode 100644
    
    For Linux, removing "errno = 0" is enough, as lstat wont modify errno
    if it was successful. The behavior should not be depended upon,
    though, so modify the "if" as well.
    
    The test simulates this situation.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. git-svn: don't allow globs to match regular files

    Eric Wong committed with Junio C Hamano Apr 18, 2007
    git only tracks the histories of full directories, not
    that of individual files.  Sometimes, SVN users will
    place[1] a regular file in the directory designated
    for subdirectories of branches or tags.
    
    Thanks to jrockway on #git for pointing this out.
    
    [1] mistakenly or otherwise, such as a README
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Use const qualifier for 'sha1' parameter in delete_ref function

    jasampler committed with Junio C Hamano Apr 18, 2007
    delete_ref function does not change the 'sha1' parameter. Non-const pointer
    causes a compiler warning if you call to the function using a const argument.
    
    Signed-off-by: Carlos Rica <jasampler@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Start preparing for 1.5.1.2

    Junio C Hamano committed Apr 18, 2007
  6. Merge branch 'maint' of git://repo.or.cz/git-gui into maint

    Junio C Hamano committed Apr 18, 2007
    * 'maint' of git://repo.or.cz/git-gui:
      git-gui: Brown paper bag fix division by 0 in blame
Commits on Apr 17, 2007
  1. git-svn: quiet some warnings when run only with --version/--help

    Eric Wong committed with Junio C Hamano Apr 17, 2007
    These are harmless but annoying.  They were introduced in
    512b620
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-svn: respect lower bound of -r/--revision when following parent

    Eric Wong committed with Junio C Hamano Apr 15, 2007
    When an explicit --revision argument is specified, do not fetch
    past the specified range into the beginning of history.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 16, 2007
  1. Have sample update hook not refuse deleting a branch through push.

    Gerrit Pape committed with Junio C Hamano Apr 16, 2007
    source ref might be 0000...0000 to delete a branch through git-push,
    'git <remote> push :<branch>'.  The update hook should not decline this.
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. variable $projectdesc needs to be set before checking against unchang…

    Gerrit Pape committed with Junio C Hamano Apr 16, 2007
    …ed default.
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Update git-annotate/git-blame documentation

    aeruder committed with Junio C Hamano Apr 16, 2007
    Moved options that pertained to both git-blame and git-annotate to a
    common file blame-options.txt.
    
    builtin-blame.c: Removed --compatibility, --long, --time from the
    short usage as they are not handled in the code.
    
    Documentation/git-blame.txt: Removed common options to git-annotate.
    Added documentation for --score-debug.  Removed --compatibility.
    Adjusted usage at top to not wrap on 80 columns.
    
    Documentation/git-annotate.txt: Using common options blame-options.txt.
    
    Documentation/blame-options.txt: Added -b note about associated config
    option, added --root note about associated config option, added
    documentation for --show-stats.  Removed --long, --time, --rev-file as
    those options do not really exist.  Added documentation for -M/-C taking
    an optional score argument for detection of moved lines.
    
    Signed-off-by: Andrew Ruder <andy@aeruder.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Update git-apply documentation

    aeruder committed with Junio C Hamano Apr 16, 2007
    Document -v (short form of --verbose).  Redo usage
    to not wrap on 80 column terminal with typical
    settings.
    
    Signed-off-by: Andrew Ruder <andy@aeruder.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Update git-applymbox documentation

    aeruder committed with Junio C Hamano Apr 16, 2007
    Documentation/git-applymbox.txt: updating -u documentation to include
    fact that it encodes to the i18n.commitencoding setting, not just utf-8.
    Added documentation of -n option to pass -n to git-mailinfo.
    
    Signed-off-by: Andrew Ruder <andy@aeruder.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Update git-am documentation

    aeruder committed with Junio C Hamano Apr 16, 2007
    Documentation/git-am.txt missing several short versions
    of options.  Added documentation for --resolvemsg=<msg>
    command-line option.
    
    Signed-off-by: Andrew Ruder <andy@aeruder.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. user-manual: use detached head when rewriting history

    J. Bruce Fields committed with Junio C Hamano Apr 16, 2007
    This is slightly simpler if we use a detached head.  And it's probably
    good to have another example that uses this feature.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. user-manual: start revising "internals" chapter

    J. Bruce Fields committed with Junio C Hamano Apr 16, 2007
    Minor revisions, cross-references.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. user-manual: detached HEAD

    J. Bruce Fields committed with Junio C Hamano Apr 16, 2007
    Add a brief mention of detached HEADs and .git/HEAD.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. user-manual: fix discussion of default clone

    J. Bruce Fields committed with Junio C Hamano Apr 16, 2007
    The name "master" isn't actually quite so special.  Also, fix some bad
    grammar.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. Documentation: clarify track/no-track option.

    J. Bruce Fields committed with Junio C Hamano Apr 16, 2007
    Fix the description of the --no-track option so it no longer says the
    opposite of what was intended.  Also mention branch.autosetupmerge
    explicitly.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. Documentation: clarify git-checkout -f, minor editing

    J. Bruce Fields committed with Junio C Hamano Apr 16, 2007
    "Force a re-read of everything" doesn't mean much to me.
    
    Also some minor grammar fixes.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  13. Documentation: minor edits of git-lost-found manpage

    J. Bruce Fields committed with Junio C Hamano Apr 16, 2007
    Minor improvements to grammar and clarity of lost-found manpage.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 15, 2007
  1. Document -g (--walk-reflogs) option of git-log

    raalkml committed with Junio C Hamano Apr 15, 2007
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. sscanf/strtoul: parse integers robustly

    meyering committed with Junio C Hamano Apr 9, 2007
    * builtin-grep.c (strtoul_ui): Move function definition from here, to...
    * git-compat-util.h (strtoul_ui): ...here, with an added "base" parameter.
    * builtin-grep.c (cmd_grep): Update use of strtoul_ui to include base, "10".
    * builtin-update-index.c (read_index_info): Diagnose an invalid mode integer
    that is out of range or merely larger than INT_MAX.
    (cmd_update_index): Use strtoul_ui, not sscanf.
    * convert-objects.c (write_subdirectory): Likewise.
    
    Signed-off-by: Jim Meyering <jim@meyering.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Merge git://git2.kernel.org/pub/scm/gitk/gitk into maint

    Junio C Hamano committed Apr 15, 2007
    * git://git2.kernel.org/pub/scm/gitk/gitk:
      [PATCH] Improve look-and-feel of the gitk tool.
      [PATCH] Teach gitk to use the user-defined UI font everywhere.
  4. git-blame: Fix overrun in fake_working_tree_commit()

    Michael Spang committed with Junio C Hamano Apr 14, 2007
    git-blame would overflow commit->buffer when annotating files with long paths.
    
    Signed-off-by: Michael Spang <mspang@uwaterloo.ca>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 14, 2007
  1. git-quiltimport complaining yet still working

    torvalds committed with Junio C Hamano Apr 13, 2007
    There were two bugs: "stop_here" doesn't exist, but the bug that causes
    this code to trigger in the *first* place is the wrong use of "$dotest".
    It should be ".dotest"
    
    This is essentially the same bug introduced by 87ab799, one was
    fixed with 0d38ab2 but this was somehow left behind.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>