Permalink
Commits on Sep 3, 2007
  1. GIT 1.5.3.1: obsolete git-p4 in RPM spec file.

    gitster committed Sep 2, 2007
    HPA noticed that yum does not like the newer git RPM set; it turns out
    that we do not ship git-p4 anymore but existing installations do not
    realize the package is gone if we do not tell anything about it.
    
    David Kastrup suggests using Obsoletes in the spec file of the new
    RPM to replace the old package, so here is a try.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 2, 2007
  1. Typofix: 1.5.3 release notes

    gitster committed Sep 2, 2007
  2. GIT 1.5.3

    gitster committed Sep 2, 2007
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 1, 2007
  1. Merge branch 'jp/send-email-cc'

    gitster committed Sep 1, 2007
    * jp/send-email-cc:
      git-send-email --cc-cmd
  2. Mention -m as an abbreviation for --merge

    Robin Rosenberg authored and gitster committed Sep 1, 2007
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Documentation: minor AsciiDoc mark-up fixes.

    gitster committed Sep 1, 2007
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. URL: allow port specification in ssh:// URLs

    ltuikov authored and gitster committed Sep 1, 2007
    Allow port specification in ssh:// URLs in the
    usual notation:
    
    	ssh://[user@]host.domain[:<port>]/<path>
    
    This allows git to be used over ssh-tunneling
    networks.
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Avoid one-or-more (\+) non BRE in sed scripts.

    gitster committed Sep 1, 2007
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. rebase -m: Fix incorrect short-logs of already applied commits.

    Johannes Sixt authored and gitster committed Sep 1, 2007
    When a topic branch is rebased, some of whose commits are already
    cherry-picked upstream:
    
        o--X--A--B--Y    <- master
         \
          A--B--Z        <- topic
    
    then 'git rebase -m master' would report:
    
        Already applied: 0001 Y
        Already applied: 0002 Y
    
    With this fix it reports the expected:
    
        Already applied: 0001 A
        Already applied: 0002 B
    
    As an added bonus, this change also avoids 'echo' of a commit message,
    which might contain escapements.
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. git-diff: resurrect the traditional empty "diff --git" behaviour

    gitster committed Aug 31, 2007
    The warning message to suggest "Consider running git-status" from
    "git-diff" that we experimented with during the 1.5.3 cycle turns
    out to be a bad idea.  It robbed cache-dirty information from people
    who valued it, while still asking users to run "update-index --refresh".
    It was hoped that the new behaviour would at least have some educational
    value, but not showing the cache-dirty paths like before meant that the
    user would not even know easily which paths were cache-dirty, and it
    made the need to refresh the index look like even more unnecessary chore.
    
    This commit reinstates the traditional behaviour, but with a twist.
    
    By default, the empty "diff --git" output is totally squelched out
    from "git diff" output.  At the end of the command, it automatically
    runs "update-index --refresh" as needed, without even bothering the
    user.  In other words, people who do not care about the cache-dirtyness
    do not even have to see the warning.
    
    The traditional behaviour to see the stat-dirty output and to bypassing
    the overhead of content comparison can be specified by setting the
    configuration variable diff.autorefreshindex to false.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. git-tag: Fix -l option to use better shell style globs.

    jasampler authored and gitster committed Sep 1, 2007
    This patch removes certain behaviour of "git tag -l foo", currently
    listing every tag name having "foo" as a substring.  The same
    thing now could be achieved doing "git tag -l '*foo*'".
    
    This feature was added recently when git-tag.sh got the -n option
    for showing tag annotations, because that commit also replaced the
    old "grep pattern" behaviour with a more preferable "shell pattern"
    behaviour (although slightly modified as you can see).
    Thus, the following builtin-tag.c implemented it in order to
    ensure that tests were passing unchanged with both programs.
    
    Since common "shell patterns" match names with a given substring
    _only_ when * is inserted before and after (as in "*substring*"), and
    the "plain" behaviour cannot be achieved easily with the current
    implementation, this is mostly the right thing to do, in order to
    make it more flexible and consistent.
    
    Tests for "git tag" were also changed to reflect this.
    
    Signed-off-by: Carlos Rica <jasampler@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. git-svn: fix dcommit clobbering upstream when committing multiple cha…

    Eric Wong authored and gitster committed Sep 1, 2007
    …nges
    
    Although dcommit could detect if the first commit in the series
    would conflict with the HEAD revision in SVN, it could not
    detect conflicts in further commits it made.
    
    Now we rebase each uncommitted change after each revision is
    committed to SVN to ensure that we are up-to-date.  git-rebase
    will bail out on conflict errors if our next change cannot be
    applied and committed to SVN cleanly, preventing accidental
    clobbering of changes on the SVN-side.
    
    --no-rebase users will have trouble with this, and are thus
    warned if they are committing more than one commit.  Fixing this
    for (hopefully uncommon) --no-rebase users would be more complex
    and will probably happen at a later date.
    
    Thanks to David Watson for finding this and the original test.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. git-svn: Protect against "diff.color = true".

    gitster committed Aug 31, 2007
    If the configuration of the user has "diff.color = true", the
    output from "log" we invoke internally added color codes, which
    broke the parser.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Tested-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Acked-by: Eric Wong <normalperson@yhbt.net>
  11. filter-branch: introduce convenience function "skip_commit"

    dscho authored and gitster committed Aug 31, 2007
    With this function, a commit filter can leave out unwanted commits
    (such as temporary commits).  It does _not_ undo the changeset
    corresponding to that commit, but it _skips_ the revision.  IOW
    no tree object is changed by this.
    
    If you like to commit early and often, but want to filter out all
    intermediate commits, marked by "@@@" in the commit message, you can
    now do this with
    
    	git filter-branch --commit-filter '
    		if git cat-file commit $GIT_COMMIT | grep '@@@' > /dev/null;
    		then
    			skip_commit "$@";
    		else
    			git commit-tree "$@";
    		fi' newbranch
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. filter-branch: provide the convenience functions also for commit filters

    dscho authored and gitster committed Aug 31, 2007
    Move the convenience functions to the top of git-filter-branch.sh, and
    return from the script when the environment variable SOURCE_FUNCTIONS is
    set.
    
    By sourcing git-filter-branch with that variable set automatically, all
    commit filters may access the convenience functions like "map".
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. rebase -i: mention the option to split commits in the man page

    dscho authored and gitster committed Aug 31, 2007
    The interactive mode of rebase can be used to split commits.  Tell the
    interested parties about it, with a dedicated section in the man page.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. filter-branch: fix remnants of old syntax in documentation

    dscho authored and gitster committed Aug 31, 2007
    Some time ago, filter-branch's syntax changed so that more than one
    ref can be rewritten at the same time.  This involved the removal of
    the ref name for the result; instead, the refs are rewritten in-place.
    
    This updates the last leftovers in the documentation to reflect the
    new behavior.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  15. Teach bash about completing arguments for git-tag

    spearce committed Sep 1, 2007
    Lately I have been doing a lot of calls to `git tag -d` and also to
    `git tag -v`.  In both such cases being able to complete the names
    of existing tags saves the fingers some typing effort.  We now look
    for the -d or -v option to git-tag in the bash completion support
    and offer up existing tag names as possible choices for these.
    
    When creating a new tag we now also offer bash completion support
    for the second argument to git-tag (the object to be tagged) as this
    can often be a specific existing branch name and is not necessarily
    the current HEAD.
    
    If the -f option is being used to recreate an existing tag we now
    also offer completion support on the existing tag names for the
    first argument of git-tag, helping to the user to reselect the
    prior tag name that they are trying to replace.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Aug 31, 2007
  1. Hopefully the final update to draft release notes for 1.5.3.

    gitster committed Aug 31, 2007
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Make "git-log --" without paths behave the same as "git-log" without --

    gitster committed Aug 31, 2007
    "git log" family of commands, even when run from a subdirectory,
    do not limit the revision range with the current directory as
    the path limiter, but with double-dash without any paths after
    it, i.e. "git log --" do so.  It was a mistake to have a
    difference between "git log --" and "git log" introduced in
    commit ae56354 (First cut at
    libifying revlist generation).
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. git-init: autodetect core.symlinks

    gitster committed Aug 31, 2007
    We already autodetect if filemode is reliable on the filesystem
    to deal with VFAT and friends.  Do the same for symbolic link
    support.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Make git-archimport log entries more consistent

    snogglethorpe authored and gitster committed Aug 30, 2007
    When appending the "git-archimport-id:" line to the end of log entries,
    git-archimport would use two blank lines as a separator when there was no
    body in the arch log (only a Summary: line), and zero blank lines when there
    was a body (making it hard to see the break between the actual log message
    and the git-archimport-id: line).
    
    This patch makes git-archimport generate one blank line as a separator in all
    cases.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. fix same sized delta logic

    Nicolas Pitre authored and gitster committed Aug 30, 2007
    The code favoring shallower deltas when size is equal was triggered
    only when previous delta was also cached.  There should be no relation
    between cached deltas and same sized deltas.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. filter-branch: make sure orig_namespace ends with a single slash.

    gitster committed Aug 31, 2007
    Later in a loop any existing ref whose path begins with it is
    removed.  It would be a disaster if you allowed it to say refs/head
    for example.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. git-filter-branch: document --original option

    Oblomov authored and gitster committed Aug 30, 2007
    Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. git-filter-branch: more detailed USAGE

    Oblomov authored and gitster committed Aug 30, 2007
    Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. Makefile: do not allow gnu make to remove test-*.o files

    gitster committed Aug 31, 2007
    It appears parallel build (-j) gets confused.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. Temporary fix for stack smashing in mailinfo

    raalkml authored and gitster committed Aug 30, 2007
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. Fixing comment in merge strategies

    pinetops authored and gitster committed Aug 30, 2007
    Comments in both these strategies refer to the wrong number
    of remotes
    
    Signed-off-by: Tom Clarke <tom@u2i.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 30, 2007
  1. ls-files --error-unmatch: do not barf if the same pattern is given tw…

    gitster committed Aug 30, 2007
    …ice.
    
    This is most visible when you do "git commit Makefile Makefile"; it
    may be a stupid request, but that is not a reason to fail the command.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 29, 2007
  1. Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

    gitster committed Aug 29, 2007
    * 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Fix bug causing undefined variable error when cherry-picking
  2. completion: also complete git-log's --left-right and --cherry-pick op…

    dscho authored and gitster committed Aug 29, 2007
    …tion
    
    Both --left-right and --cherry-pick are particularly long to type, so
    help the user there.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. gitk: Fix bug causing undefined variable error when cherry-picking

    paulusmack committed Aug 29, 2007
    When "Show nearby tags" is turned off and the user did a cherry-pick,
    we were trying to access variables relating to the descendent/ancestor
    tag & head computations in addnewchild though they hadn't been set.
    This makes sure we don't do that.  Reported by Johannes Sixt.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  4. git-daemon(1): assorted improvements.

    gitster committed Aug 29, 2007
    Jari Aalto noticed a handful places in git-daemon documentation
    that need to be improved.
    
     * --inetd makes --pid-file to be ignored, in addition to --user
       and --group
    
     * receive-pack service was not described at all.  We should, if
       only to warn about the security implications of it.
    
     * There was no example of per repository configuration.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>