Skip to content
Commits on Dec 26, 2006
  1. GIT v1.5.0 preview

    This is not yet -rc1 where all new topics closes, but I think it
    is getting pretty closer.  I'd still want to merge updates to
    fsck/prune to honor reflog entries before -rc1.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 25, 2006
  2. Merge branch 'jc/bm'

    * jc/bm:
      Allow branch.*.merge to talk about remote tracking branches.
    Junio C Hamano committed Dec 25, 2006
  3. Merge branch 'rf/web'

    * rf/web:
      gitweb: Use rev-list --skip option.
      gitweb: Change history action to use parse_commits.
      gitweb: Change atom, rss actions to use parse_commits.
      gitweb: Change header search action to use parse_commits.
      gitweb: Change log action to use parse_commits.
      gitweb: Change summary, shortlog actions to use parse_commits.
      gitweb: We do longer need the --parents flag in rev-list.
      gitweb: Add parse_commits, used to bulk load commit objects.
    Junio C Hamano committed Dec 25, 2006
  4. git-add -f: allow adding otherwise ignored files.

    Instead of just warning, refuse to add otherwise ignored files
    by default, and allow it with an -f option.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 25, 2006
Commits on Dec 25, 2006
  1. @robfitz273k

    gitweb: Use rev-list --skip option.

    Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    robfitz273k committed with Junio C Hamano Dec 24, 2006
  2. @robfitz273k

    gitweb: Change history action to use parse_commits.

    Also added missing accesskey.
    
    Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    robfitz273k committed with Junio C Hamano Dec 24, 2006
  3. @robfitz273k

    gitweb: Change atom, rss actions to use parse_commits.

    Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    robfitz273k committed with Junio C Hamano Dec 24, 2006
  4. @robfitz273k

    gitweb: Change header search action to use parse_commits.

    Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    robfitz273k committed with Junio C Hamano Dec 24, 2006
  5. @robfitz273k

    gitweb: Change log action to use parse_commits.

    Also add missing next link to bottom of page.
    
    Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    robfitz273k committed with Junio C Hamano Dec 24, 2006
  6. @robfitz273k

    gitweb: Change summary, shortlog actions to use parse_commits.

    Also added missing accesskey.
    
    Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    robfitz273k committed with Junio C Hamano Dec 24, 2006
  7. @robfitz273k

    gitweb: We do longer need the --parents flag in rev-list.

    We only want to know the direct parents of a given commit object,
    these parents are available in the --header output of rev-list.  If
    --parents is supplied with --full-history the output includes merge
    commits that aren't relevant.
    
    Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    robfitz273k committed with Junio C Hamano Dec 24, 2006
  8. @robfitz273k

    gitweb: Add parse_commits, used to bulk load commit objects.

    Add a new method parse_commits which is able to parse multiple commit
    objects at once.  Reworked parse_commit to share the commit object
    parsing logic.
    
    Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    robfitz273k committed with Junio C Hamano Dec 24, 2006
  9. git-add: warn when adding an ignored file with an explicit request.

    We allow otherwise ignored paths to be added to the index by
    spelling its path out on the command line, but we would warn the
    user about them when we do so.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 25, 2006
  10. git-add: add ignored files when asked explicitly.

    One thing many people found confusing about git-add was that a
    file whose name matches an ignored pattern could not be added to
    the index.  With this, such a file can be added by explicitly
    spelling its name to git-add.
    
    Fileglobs and recursive behaviour do not add ignored files to
    the index.  That is, if a pattern '*.o' is in .gitignore, and
    two files foo.o, bar/baz.o are in the working tree:
    
        $ git add foo.o
        $ git add '*.o'
        $ git add bar
    
    Only the first form adds foo.o to the index.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 25, 2006
  11. read_directory: show_both option.

    This teaches the internal read_directory() routine to return
    both interesting and ignored pathnames.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 25, 2006
  12. git-rm: Documentation

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 25, 2006
  13. t3600: update the test for updated git rm

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 25, 2006
  14. git-rm: update to saner semantics

    This updates the "git rm" command with saner semantics suggested
    on the list earlier with:
    
    	Message-ID: <Pine.LNX.4.64.0612020919400.3476@woody.osdl.org>
    	Message-ID: <Pine.LNX.4.64.0612040737120.3476@woody.osdl.org>
    
    The command still validates that the given paths all talk about
    sensible paths to avoid mistakes (e.g. "git rm fiel" when file
    "fiel" does not exist would error out -- user meant to remove
    "file"), and it has further safety checks described next.  The
    biggest difference is that the paths are removed from both index
    and from the working tree (if you have an exotic need to remove
    paths only from the index, you can use the --cached option).
    
    The command refuses to remove if the copy on the working tree
    does not match the index, or if the index and the HEAD does not
    match.  You can defeat this check with -f option.
    
    This safety check has two exceptions: if the working tree file
    does not exist to begin with, that technically does not match
    the index but it is allowed.  This is to allow this CVS style
    command sequence:
    
    	rm <path> && git rm <path>
    
    Also if the index is unmerged at the <path>, you can use "git rm
    <path>" to declare that the result of the merge loses that path,
    and the above safety check does not trigger; requiring the file
    to match the index in this case forces the user to do "git
    update-index file && git rm file", which is just crazy.
    
    To recursively remove all contents from a directory, you need to
    pass -r option, not just the directory name as the <path>.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 25, 2006
  15. match_pathspec() -- return how well the spec matched

    This updates the return value from match_pathspec() so that the
    caller can tell cases between exact match, leading pathname
    match (i.e. file "foo/bar" matches a pathspec "foo"), or
    filename glob match.  This can be used to prevent "rm dir" from
    removing "dir/file" without explicitly asking for recursive
    behaviour with -r flag, for example.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 25, 2006
  16. Merge branch 'jc/skip-count'

    * jc/skip-count:
      revision: --skip=<n>
    Junio C Hamano committed Dec 25, 2006
  17. Merge branch 'jc/git-add--interactive'

    * jc/git-add--interactive:
      git-add --interactive: add documentation
      git-add --interactive: hunk splitting
      git-add --interactive
    Junio C Hamano committed Dec 25, 2006
  18. git-add --interactive: add documentation

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 25, 2006
Commits on Dec 24, 2006
  1. Allow branch.*.merge to talk about remote tracking branches.

    People often get confused if the value of branch.*.merge should
    be the remote branch name they are fetching from, or the
    tracking branch they locally have.  So this allows either.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 24, 2006
  2. Merge branch 'sb/merge-friendly'

    * sb/merge-friendly:
      Display 'theirs' branch name when possible in merge.
      Use extended SHA1 syntax in merge-recursive conflicts.
    Junio C Hamano committed Dec 24, 2006
  3. Merge branch 'js/rerere'

    * js/rerere:
      Make git-rerere a builtin
      Add a test for git-rerere
      move read_mmfile() into xdiff-interface
    Junio C Hamano committed Dec 24, 2006
  4. @dscho

    commit-tree: encourage UTF-8 commit messages.

    Introduce is_utf() to check if a text looks like it is encoded
    in UTF-8, utf8_width() to count display width, and implements
    print_wrapped_text() using them.
    
    git-commit-tree warns if the commit message does not minimally
    conform to the UTF-8 encoding when i18n.commitencoding is either
    unset, or set to "utf-8".
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho committed with Junio C Hamano Dec 22, 2006
  5. @spearce

    Switch git_mmap to use pread.

    Now that Git depends on pread in index-pack its safe to say we can
    also depend on it within the git_mmap emulation we activate when
    NO_MMAP is set.  On most systems pread should be slightly faster
    than an lseek/read/lseek sequence as its one system call vs. three
    system calls.
    
    We also now honor EAGAIN and EINTR error codes from pread and
    restart the prior read.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Dec 24, 2006
  6. @spearce

    Rename gitfakemmap to git_mmap.

    This minor cleanup was suggested by Johannes Schindelin.
    
    The mmap is still fake in the sense that we don't support PROT_WRITE
    or MAP_SHARED with external modification at all, but that hasn't
    stopped us from using mmap() thoughout the Git code.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Dec 24, 2006
Commits on Dec 23, 2006
  1. @robfitz273k

    gitweb: Paginate commit/author/committer search output

    Paginate commit/author/committer search output to only show 100 commits
    at a time, added appropriate nav links.
    
    Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    robfitz273k committed with Junio C Hamano Dec 23, 2006
  2. Makefile: add quick-install-doc for installing pre-built manpages

    This adds and uses the install-doc-quick.sh file to
    Documentation/, which is usable for people who track either the
    'html' or 'man' heads in Junio's repository (prefixed with
    'origin/' if cloned locally).  You may override this by
    specifying DOC_REF in the make environment or in config.mak.
    
    GZ may also be set in the environment (or config.mak) if you
    wish to gzip the documentation after installing it.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Eric Wong committed with Junio C Hamano Dec 23, 2006
  3. @spearce

    Display 'theirs' branch name when possible in merge.

    Displaying the SHA1 of 'their' branch (the branch being merged into
    the current branch) is not nearly as friendly as just displaying
    the name of that branch, especially if that branch is already local
    to this repository.
    
    git-merge now sets the environment variable 'GITHEAD_%(sha1)=%(name)'
    for each argument it gets passed, making the actual input name that
    resolved to the commit '%(sha1)' easily available to the invoked
    merge strategy.
    
    git-merge-recursive makes use of these environment variables when
    they are available by using '%(name)' whenever it outputs the commit
    identification rather than '%(sha1)'.  This is most obvious in the
    conflict hunks created by xdl_merge:
    
      $ git mege sideb~1
      <<<<<<< HEAD:INSTALL
         Good!
      =======
         Oops.
      >>>>>>> sideb~1:INSTALL
    
    [jc: adjusted a test script and a minor constness glitch.]
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Dec 23, 2006
  4. @spearce

    Use extended SHA1 syntax in merge-recursive conflicts.

    When we get a line-level conflict in merge-recursive and print out
    the two sides in the conflict hunk header and footer we should use
    the standard extended SHA1 syntax to specify the specific blob,
    as this allows the user to copy and paste the line right into
    'git show' to view the complete version.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Dec 23, 2006
  5. @robfitz273k

    gitweb: Allow search to be disabled from the config file.

    Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    robfitz273k committed with Junio C Hamano Dec 23, 2006
  6. @robfitz273k

    gitweb: Require a minimum of two character for the search text.

    Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    robfitz273k committed with Junio C Hamano Dec 23, 2006
  7. @robfitz273k

    gitweb: Use rev-list pattern search options.

    Use rev-list pattern search options instead of hand coded perl.
    
    Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    robfitz273k committed with Junio C Hamano Dec 23, 2006
Something went wrong with that request. Please try again.