[ANNOUNCE] GIT 1.5.3

[ANNOUNCE] GIT 1.5.3

[Junio C Hamano]

The latest feature release GIT 1.5.3 is available at the usual
places:

  http://www.kernel.org/pub/software/scm/git/

  git-1.5.3.tar.{gz,bz2}			(tarball)
  git-htmldocs-1.5.3.tar.{gz,bz2}		(preformatted docs)
  git-manpages-1.5.3.tar.{gz,bz2}		(preformatted docs)
  RPMS/$arch/git-*-1.5.3-1.$arch.rpm	(RPM)

GIT v1.5.3 Release Notes
========================

Updates since v1.5.2
--------------------

* The commit walkers other than http are officially deprecated,
  but still supported for now.

* The submodule support has Porcelain layer.

  Note that the current submodule support is minimal and this is
  deliberately so.  A design decision we made is that operations
  at the supermodule level do not recurse into submodules by
  default.  The expectation is that later we would add a
  mechanism to tell git which submodules the user is interested
  in, and this information might be used to determine the
  recursive behaviour of certain commands (e.g. "git checkout"
  and "git diff"), but currently we haven't agreed on what that
  mechanism should look like.  Therefore, if you use submodules,
  you would probably need "git submodule update" on the
  submodules you care about after running a "git checkout" at
  the supermodule level.

* There are a handful pack-objects changes to help you cope better
  with repositories with pathologically large blobs in them.

* For people who need to import from Perforce, a front-end for
  fast-import is in contrib/fast-import/.

* Comes with git-gui 0.8.2.

* Comes with updated gitk.

* New commands and options.

  - "git log --date=<format>" can use more formats: iso8601, rfc2822.

  - The hunk header output from "git diff" family can be customized
    with the attributes mechanism.  See gitattributes(5) for details.

  - "git stash" allows you to quickly save away your work in
    progress and replay it later on an updated state.

  - "git rebase" learned an "interactive" mode that let you
    pick and reorder which commits to rebuild.

  - "git fsck" can save its findings in $GIT_DIR/lost-found, without a
    separate invocation of "git lost-found" command.  The blobs stored by
    lost-found are stored in plain format to allow you to grep in them.

  - $GIT_WORK_TREE environment variable can be used together with
    $GIT_DIR to work in a subdirectory of a working tree that is
    not located at "$GIT_DIR/..".

  - Giving "--file=<file>" option to "git config" is the same as
    running the command with GIT_CONFIG=<file> environment.

  - "git log" learned a new option "--follow", to follow
    renaming history of a single file.

  - "git filter-branch" lets you rewrite the revision history of
    specified branches. You can specify a number of filters to
    modify the commits, files and trees.

  - "git cvsserver" learned new options (--base-path, --export-all,
    --strict-paths) inspired by "git daemon".

  - "git daemon --base-path-relaxed" can help migrating a repository URL
    that did not use to use --base-path to use --base-path.

  - "git commit" can use "-t templatefile" option and commit.template
    configuration variable to prime the commit message given to you in the
    editor.

  - "git submodule" command helps you manage the projects from
    the superproject that contain them.

  - In addition to core.compression configuration option,
    core.loosecompression and pack.compression options can
    independently tweak zlib compression levels used for loose
    and packed objects.

  - "git ls-tree -l" shows size of blobs pointed at by the
    tree entries, similar to "/bin/ls -l".

  - "git rev-list" learned --regexp-ignore-case and
    --extended-regexp options to tweak its matching logic used
    for --grep fitering.

  - "git describe --contains" is a handier way to call more
    obscure command "git name-rev --tags".

  - "git gc --aggressive" tells the command to spend more cycles
    to optimize the repository harder.

  - "git repack" learned a "window-memory" limit which
    dynamically reduces the window size to stay within the
    specified memory usage.

  - "git repack" can be told to split resulting packs to avoid
    exceeding limit specified with "--max-pack-size".

  - "git fsck" gained --verbose option.  This is really really
    verbose but it might help you identify exact commit that is
    corrupt in your repository.

  - "git format-patch" learned --numbered-files option.  This
    may be useful for MH users.

  - "git format-patch" learned format.subjectprefix configuration
    variable, which serves the same purpose as "--subject-prefix"
    option.

  - "git tag -n -l" shows tag annotations while listing tags.

  - "git cvsimport" can optionally use the separate-remote layout.

  - "git blame" can be told to see through commits that change
    whitespaces and indentation levels with "-w" option.

  - "git send-email" can be told not to thread the messages when
    sending out more than one patches.

  - "git send-email" can also be told how to find whom to cc the
    message to for each message via --cc-cmd.

  - "git config" learned NUL terminated output format via -z to
    help scripts.

  - "git add" learned "--refresh <paths>..." option to selectively refresh
    the cached stat information.

  - "git init -q" makes the command quieter.

  - "git -p command" now has a cousin of opposite sex, "git --no-pager
    command".

* Updated behavior of existing commands.

  - "gitweb" can offer multiple snapshot formats.

    ***NOTE*** Unfortunately, this changes the format of the
    $feature{snapshot}{default} entry in the per-site
    configuration file 'gitweb_config.perl'.  It used to be a
    three-element tuple that describe a single format; with the
    new configuration item format, you only have to say the name
    of the format ('tgz', 'tbz2' or 'zip').  Please update the
    your configuration file accordingly.

  - "git clone" uses -l (hardlink files under .git) by default when
    cloning locally.

  - URL used for "git clone" and friends can specify nonstandard SSH port
    by using sh://host:port/path/to/repo syntax.

  - "git bundle create" can now create a bundle without negative refs,
    i.e. "everything since the beginning up to certain points".

  - "git diff" (but not the plumbing level "git diff-tree") now
    recursively descends into trees by default.

  - "git diff" does not show differences that come only from
    stat-dirtiness in the form of "diff --git" header anymore.
    It runs "update-index --refresh" silently as needed.

  - "git tag -l" used to match tags by globbing its parameter as if it
    has wildcard '*' on both ends, which made "git tag -l gui" to match
    tag 'gitgui-0.7.0'; this was very annoying.  You now have to add
    asterisk on the sides you want to wildcard yourself.

  - The editor to use with many interactive commands can be
    overridden with GIT_EDITOR environment variable, or if it
    does not exist, with core.editor configuration variable.  As
    before, if you have neither, environment variables VISUAL
    and EDITOR are consulted in this order, and then finally we
    fall back on "vi".

  - "git rm --cached" does not complain when removing a newly
    added file from the index anymore.

  - Options to "git log" to affect how --grep/--author options look for
    given strings now have shorter abbreviations.  -i is for ignore case,
    and -E is for extended regexp.

  - "git log" learned --log-size to show the number of bytes in
    the log message part of the output to help qgit.

  - "git log --name-status" does not require you to give "-r" anymore.
    As a general rule, Porcelain commands should recurse when showing
    diff.

  - "git format-patch --root A" can be used to format everything
    since the beginning up to A.  This was supported with
    "git format-patch --root A A" for a long time, but was not
    properly documented.

  - "git svn dcommit" retains local merge information.

  - "git svnimport" allows an empty string to be specified as the
    trunk/ directory.  This is necessary to suck data from a SVN
    repository that doe not have trunk/ branches/ and tags/ organization
    at all.

  - "git config" to set values also honors type flags like --bool
    and --int.

  - core.quotepath configuration can be used to make textual git
    output to emit most of the characters in the path literally.

  - "git mergetool" chooses its backend more wisely, taking
    notice of its environment such as use of X, Gnome/KDE, etc.

  - "gitweb" shows merge commits a lot nicer than before.  The
    default view uses more compact --cc format, while the UI
    allows to choose normal diff with any parent.

  - snapshot files "gitweb" creates from a repository at
    $path/$project/.git are more useful.  We use $project part
    in the filename, which we used to discard.

  - "git cvsimport" creates lightweight tags; there is no
    interesting information we can record in an annotated tag,
    and the handcrafted ones the old code created was not
    properly formed anyway.

  - "git push" pretends that you immediately fetched back from
    the remote by updating corresponding remote tracking
    branches if you have any.

  - The diffstat given after a merge (or a pull) honors the
    color.diff configuration.

  - "git commit --amend" is now compatible with various message source
    options such as -m/-C/-c/-F.

  - "git apply --whitespace=strip" removes blank lines added at
    the end of the file.

  - "git fetch" over git native protocols with "-v" option shows
    connection status, and the IP address of the other end, to
    help diagnosing problems.

  - We used to have core.legacyheaders configuration, when
    set to false, allowed git to write loose objects in a format
    that mimicks the format used by objects stored in packs.  It
    turns out that this was not so useful.  Although we will
    continue to read objects written in that format, we do not
    honor that configuration anymore and create loose objects in
    the legacy/traditional format.

  - "--find-copies-harder" option to diff family can now be
    spelled as "-C -C" for brevity.

  - "git mailsplit" (hence "git am") can read from Maildir
    formatted mailboxes.

  - "git cvsserver" does not barf upon seeing "cvs login"
    request.

  - "pack-objects" honors "delta" attribute set in
    .gitattributes.  It does not attempt to deltify blobs that
    come from paths with delta attribute set to false.

  - "new-workdir" script (in contrib) can now be used with a
    bare repository.

  - "git mergetool" learned to use gvimdiff.

  - "gitview" (in contrib) has a better blame interface.

  - "git log" and friends did not handle a commit log message
    that is larger than 16kB; they do now.

  - "--pretty=oneline" output format for "git log" and friends
    deals with "malformed" commit log messages that have more
    than one lines in the first paragraph better.  We used to
    show the first line, cutting the title at mid-sentence; we
    concatenate them into a single line and treat the result as
    "oneline".

  - "git p4import" has been demoted to contrib status.  For
    a superior option, checkout the "git p4" front end to
    "git fast-import" (also in contrib).  The man page and p4
    rpm have been removed as well.

  - "git mailinfo" (hence "am") now tries to see if the message
    is in utf-8 first, instead of assuming iso-8859-1, if
    incoming e-mail does not say what encoding it is in.

* Builds

  - old-style function definitions (most notably, a function
    without parameter defined with "func()", not "func(void)")
    have been eradicated.

  - "git tag" and "git verify-tag" have been rewritten in C.

* Performance Tweaks

  - "git pack-objects" avoids re-deltification cost by caching
    small enough delta results it creates while looking for the
    best delta candidates.

  - "git pack-objects" learned a new heuristcs to prefer delta
    that is shallower in depth over the smallest delta
    possible.  This improves both overall packfile access
    performance and packfile density.

  - diff-delta code that is used for packing has been improved
    to work better on big files.

  - when there are more than one pack files in the repository,
    the runtime used to try finding an object always from the
    newest packfile; it now tries the same packfile as we found
    the object requested the last time, which exploits the
    locality of references.

  - verifying pack contents done by "git fsck --full" got boost
    by carefully choosing the order to verify objects in them.

  - "git read-tree -m" to read into an already populated index
    has been optimized vastly.  The effect of this can be seen
    when switching branches that have differences in only a
    handful paths.

  - "git add paths..." and "git commit paths..." has also been
    heavily optimized.

Fixes since v1.5.2
------------------

All of the fixes in v1.5.2 maintenance series are included in
this release, unless otherwise noted.

* Bugfixes

  - "gitweb" had trouble handling non UTF-8 text with older
    Encode.pm Perl module.

  - "git svn" misparsed the data from the commits in the repository when
    the user had "color.diff = true" in the configuration.  This has been
    fixed.

  - There was a case where "git svn dcommit" clobbered changes made on the
    SVN side while committing multiple changes.

  - "git-write-tree" had a bad interaction with racy-git avoidance and
    gitattributes mechanisms.

  - "git --bare command" overrode existing GIT_DIR setting and always
    made it treat the current working directory as GIT_DIR.

  - "git ls-files --error-unmatch" does not complain if you give the
    same path pattern twice by mistake.

  - "git init" autodetected core.filemode but not core.symlinks, which
    made a new directory created automatically by "git clone" cumbersome
    to use on filesystems that require these configurations to be set.

  - "git log" family of commands behaved differently when run as "git
    log" (no pathspec) and as "git log --" (again, no pathspec).  This
    inconsistency was introduced somewhere in v1.3.0 series but now has
    been corrected.

  - "git rebase -m" incorrectly displayed commits that were skipped.

----------------------------------------------------------------

Shortlog since v1.5.2.5 is too long, so I'll list just the names
of contributors here and thank everybody.

Adam Roben: 5
Alberto Bertogli: 1
Alecs King: 1
Alexandre Julliard: 9
Alexandre Vassalotti: 1
Alex Riesen: 27
Andrew Ruder: 2
Andy Whitcroft: 3
Aneesh Kumar K.V: 2
Arjen Laarhoven: 2
Benjamin Sergeant: 1
Bradford C. Smith: 2
Brian Downing: 13
Brian Gernhardt: 5
Brian Hetro: 5
Carlos Rica: 13
Christian Stimming: 1
CJ van den Berg: 1
Dana L. How: 8
Daniel Barkalow: 8
Dan McGee: 1
Dave O'Neill: 1
Dave Watson: 1
David Kågedal: 1
David Kastrup: 16
David Soria Parra: 1
David Symonds: 1
Elvis Pranskevichus: 1
Emil Medve: 2
Eric Wong: 11
Fernando J. Pereda: 1
Francis Moreau: 1
Frank Lichtenheld: 12
Geert Bosch: 1
Gerrit Pape: 5
Giuseppe Bilotta: 2
Greg KH: 1
Han-Wen Nienhuys: 30
Ismail Dönmez: 1
Jakub Narebski: 27
James Bowes: 3
Jari Aalto: 1
J. Bruce Fields: 9
Jeff King: 14
Jeffrey C. Ollie: 2
Jens Axboe: 1
Jim Meyering: 6
Joe Perches: 1
Johan Herland: 1
Johannes Schindelin: 77
Johannes Sixt: 14
Jonas Fonseca: 3
Jon Loeliger: 1
Josh Triplett: 2
Julian Phillips: 3
Junio C Hamano: 160
Jyotirmoy Bhattacharya: 1
Kevin Green: 1
Kristian Høgsberg: 1
Kumar Gala: 1
Lars Hjemli: 12
Linus Torvalds: 21
Luben Tuikov: 1
Luiz Fernando N. Capitulino: 3
Lukas Sandström: 1
Marco Costalba: 3
Marcus Fritzsch: 1
Marius Storm-Olsen: 8
Mark Levedahl: 13
martin f. krafft: 2
Martin Koegler: 5
Martin Waitz: 1
Matthias Lederhofer: 21
Matthieu Moy: 2
Matthijs Melchior: 1
Matt Kraai: 3
Matt McCutchen: 4
Michael Ellerman: 2
Michael Hendricks: 2
Michael Krelin: 1
Michael S. Tsirkin: 1
Mike Hommey: 2
Miklos Vajna: 2
Miles Bader: 1
Nanako Shiraishi: 5
Nguyễn Thái Ngọc Duy: 1
Nicolas Pitre: 14
Paul Mackerras: 37
Peter Hagervall: 1
Petr Baudis: 6
Pierre Habouzit: 3
Quy Tonthat: 2
Randal L. Schwartz: 2
Reece H. Dunn: 1
René Scharfe: 10
Richard MUSIL: 1
Robert Ewald: 1
Robert Schiele: 2
Robin Rosenberg: 5
Sam Vilain: 3
Scott Lamb: 2
Sean Estabrooks: 6
Seth Falcon: 1
Shawn O. Pearce: 140
Simon Hausmann: 231
Stefan Sperling: 1
Steffen Prohaska: 3
Stephen Rothwell: 1
Steve Hoelzer: 3
Steven Grimm: 4
Steven Walter: 1
Sven Verdoolaege: 7
Theodore Ts'o: 4
Thomas Schwinge: 2
Tom Clarke: 1
Uwe Kleine-König: 5
Väinö Järvelä: 1

A note from the maintainer

[Junio C Hamano]

Now a new feature release is out, it's a good time to welcome new
people to the list.  This message talks about how git.git is managed,
and how you can work with it.

* IRC and Mailing list

Many active members of development community hang around on #git
IRC channel on Freenode.  Its log is available at:

        http://colabti.de/irclogger/irclogger_log/git

The development however is primarily done on this mailing list
you are reading right now.  If you have patches, please send
them to the list, following Documentation/SubmittingPatches.

I usually try to read all patches posted to the list, and follow
almost all the discussions on the list, unless the topic is about an
obscure corner that I do not personally use.  But I am obviously not
perfect.  If you sent a patch that you did not hear from anybody for
three days, that is a very good indication that it was dropped on the
floor --- please do not hesitate to remind me.

The list archive is available at a few public sites as well:

        http://marc.theaimsgroup.com/?l=git
        http://news.gmane.org/gmane.comp.version-control.git
	http://www.spinics.net/lists/git/

and some people seem to prefer to read it over NNTP:

        nntp://news.gmane.org/gmane.comp.version-control.git

* Repositories, branches and documentation.

My public git.git repository is at:

        git://git.kernel.org/pub/scm/git/git.git/

Immediately after I publish to the primary repository at kernel.org, I
also push into an alternate here:

        git://repo.or.cz/alt-git.git/

Impatient people might have better luck with the latter one.

Their gitweb interfaces are found at:

	http://git.kernel.org/?p=git/git.git
	http://repo.or.cz/w/alt-git.git

There are three branches in git.git repository that are not
about the source tree of git: "todo", "html" and "man".  The
first one was meant to contain TODO list for me, but I am not
good at maintaining such a list so it is not as often updated as
it could/should be.  It also contains some helper scripts I use
to maintain git.

The "html" and "man" are autogenerated documentation from the
tip of the "master" branch; the tip of "html" is extracted to be
visible at kernel.org at:

        http://www.kernel.org/pub/software/scm/git/docs/

The above URL is the top-level documentation page, and it has
links to documentation of older releases.

The script to maintain these two documentation branches are
found in "todo" branch as dodoc.sh, if you are interested.  It
is a good demonstration of how to use an update hook to automate
a task.

There are four branches in git.git repository that track the
source tree of git: "master", "maint", "next", and "pu".  I may
add more maintenance branches (e.g. "maint-1.5.1") if we have
huge backward incompatible feature updates in the future to keep
an older release alive; I may not, but the distributed nature of
git means any volunteer can run a stable-tree like that himself.

The "master" branch is meant to contain what are very well
tested and ready to be used in a production setting.  There
could occasionally be minor breakages or brown paper bag bugs
but they are not expected to be anything major.  Every now and
then, a "feature release" is cut from the tip of this branch and
they typically are named with three dotted decimal digits.  The
last such release was v1.5.3 done on Sep 2nd this year.  You
can expect that the tip of the "master" branch is always as
stable as any of the released versions, if not more stable.

Whenever a feature release is made, "maint" branch is forked off
from "master" at that point.  Obvious, safe and urgent fixes
after a feature release are applied to this branch and
maintenance releases are cut from it.  The maintenance releases
are named with four dotted decimal, named after the feature
release they are updates to; the last such release was v1.5.2.5.
New features never go to this branch.  This branch is also
merged into "master" to propagate the fixes forward.

A trivial and safe enhancement goes directly on top of "master".
A new development, either initiated by myself or more often by
somebody who found his or her own itch to scratch, does not
usually happen on "master", however.  Instead, a separate topic
branch is forked from the tip of "master", and it first is
tested in isolation; I may make minimum fixups at this point.
Usually there are a handful such topic branches that are running
ahead of "master" in git.git repository.  I do not publish the
tip of these branches in my public repository, however, partly
to keep the number of branches that downstream developers need
to worry about low, and primarily because I am lazy.

I judge the quality of topic branches, taking advices from the
mailing list discussions.  Some of them start out as "good idea
but obviously is broken in some areas (e.g. breaks the existing
testsuite)" and then with some more work (either by the original
contributor or help from other people on the list) becomes "more
or less done and can now be tested by wider audience".  Luckily,
most of them start out in the latter, better shape.

The "next" branch is to merge and test topic branches in the
latter category.  In general, the branch always contains the tip
of "master".  It might not be quite rock-solid production ready,
but is expected to work more or less without major breakage.  I
usually use "next" version of git for my own work, so it cannot
be _that_ broken to prevent me from pushing the changes out.
The "next" branch is where new and exciting things take place.
Note that being in "next" does not mean the change will be in
the next feature release.

The above three branches, "master", "maint" and "next" are never
rewound, so you should be able to safely track them (this
automatically means the topics that have been merged into "next"
are not rebased, and you can find the tip of topic branches you
are interested in from the output of "git log next").

The "pu" (proposed updates) branch bundles all the remainder of
topic branches.  The "pu" branch, and topic branches that are
only in "pu", are subject to rebasing in general.  By the above
definition of how "next" works, you can tell that this branch
will contain quite experimental and obviously broken stuff.

When a topic that was in "pu" proves to be in testable shape, it
graduates to "next".  I do this with:

        git checkout next
        git merge that-topic-branch

Sometimes, an idea that looked promising turns out to be not so
good and the topic can be dropped from "pu" in such a case.

A topic that is in "next" is expected to be tweaked and fixed to
perfection before it is merged to "master" (that's why "master"
can be expected to stay very stable).  Similarly to the above, I
do it with this:

        git checkout master
        git merge that-topic-branch
        git branch -d that-topic-branch

However, being in "next" is not a guarantee to appear in the
next release (being in "master" is such a guarantee, unless it
is later found seriously broken and reverted), or even in any
future release.  There even were cases that topics needed
reverting a few commits in them before graduating to "master",
or a topic that already was in "next" were entirely reverted
from "next" because fatal flaws were found in them later.

Starting from v1.5.0, "master" and "maint" have release notes
for the next release in Documentation/RelNotes-* files, so that
I do not have to run around summarizing what happened just
before the release.


* Other people's trees, trusted lieutenants and credits.

Documentation/SubmittingPatches outlines who your changes should
be sent to.  As described in contrib/README, I would delegate
fixes and enhancements in contrib/ area to primary contributors
of them.

Although the following are included in git.git repository, they
have their own authoritative repository and maintainers:

 git-gui/ -- this subdirectory comes from Shawn Pearce's git-gui
             project, which is found at:

             git://repo.or.cz/git-gui.git

 gitk     -- this file is maintained by Paul Mackerras, at:

             git://git.kernel.org/pub/scm/gitk/gitk.git

I would like to thank everybody who helped to raise git into the
current shape.  Especially I would like to thank the git list
regulars whose help I have relied on and expect to continue
relying on heavily:

 - Linus on general design issues.

 - Linus, Shawn Pearce, Johannes Schindelin, Nicolas Pitre, and
   Rene Scharfe on general implementation issues.

 - Shawn and Nicolas Pitre on pack issues.

 - Martin Langhoff and Frank Lichtenheld on cvsserver and cvsimport.

 - Paul Mackerras on gitk.

 - Eric Wong on git-svn.

 - Jakub Narebski, Petr Baudis, and Luben Tuikov on gitweb.

 - J. Bruce Fields on documentaton issues.

 - Johannes Schindelin and Johannes Sixt for their effort to
   move things forward on the Windows front.  Although my
   repository does not have much from the effort of MinGW team,
   I expect a merge into mainline will happen so that everybody
   can work from the same codebase.

 - People on non-Linux platforms for keeping their eyes on
   portability; especially, Randal Schwartz, Theodore Ts'o,
   Jason Riedy, Thomas Glanzmann, but countless others as well.

* This document

The latest copy of this document is found in git.git repository,
on 'todo' branch, as MaintNotes.

Re: [ANNOUNCE] GIT 1.5.3

[H. Peter Anvin]

Junio C Hamano wrote:
> 
> * For people who need to import from Perforce, a front-end for
>   fast-import is in contrib/fast-import/.
> 

There seems to be an issue with this and RPMS.

In particular, there is no longer a git-p4 RPMS, which prevents git from 
getting upgraded at all by yum.

Anyone who knows yum well enough to explain what needs to be done so 
that yum knows this is obsolete?

	-hpa

Re: [ANNOUNCE] GIT 1.5.3

[David Kastrup]

Junio C Hamano <gitster@pobox.com> writes:

> The latest feature release GIT 1.5.3 is available at the usual
> places:
>
>   http://www.kernel.org/pub/software/scm/git/
>
>   git-1.5.3.tar.{gz,bz2}			(tarball)
>   git-htmldocs-1.5.3.tar.{gz,bz2}		(preformatted docs)
>   git-manpages-1.5.3.tar.{gz,bz2}		(preformatted docs)
>   RPMS/$arch/git-*-1.5.3-1.$arch.rpm	(RPM)
>
> GIT v1.5.3 Release Notes
> ========================

Initial info doc support might have been mentioned.  While it is not
really something to write home about yet, the mention might draw
people willing to work on it, like providing indexing tags or muscling
AsciiDoc into including manpages in an appendix (both of which would
also benefit the Docbook output).  Well, something for the 1.5.4
release announcement.  Sorry for overlooking this before the actual
announcement.

-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum

Re: [ANNOUNCE] GIT 1.5.3

[Junio C Hamano]

"H. Peter Anvin" <hpa@zytor.com> writes:

> Junio C Hamano wrote:
>>
>> * For people who need to import from Perforce, a front-end for
>>   fast-import is in contrib/fast-import/.
>
> There seems to be an issue with this and RPMS.
>
> In particular, there is no longer a git-p4 RPMS, which prevents git
> from getting upgraded at all by yum.
>
> Anyone who knows yum well enough to explain what needs to be done so
> that yum knows this is obsolete?

Geez.  Is this only about upgrading, or is initial install also
affected?

Re: [ANNOUNCE] GIT 1.5.3

[David Kastrup]

"H. Peter Anvin" <hpa@zytor.com> writes:

> Junio C Hamano wrote:
>>
>> * For people who need to import from Perforce, a front-end for
>>   fast-import is in contrib/fast-import/.
>>
>
> There seems to be an issue with this and RPMS.
>
> In particular, there is no longer a git-p4 RPMS, which prevents git
> from getting upgraded at all by yum.
>
> Anyone who knows yum well enough to explain what needs to be done so
> that yum knows this is obsolete?

Probably a matter of the correct spec file.  In auctex.spec, we have

Summary: 	Enhanced TeX modes for Emacsen
Name: 		auctex
Version: 	11.84
Release: 	1%{distri}
License: 	GPL
Group: 		%{commongroup}
URL: 		http://www.gnu.org/software/auctex/
Source0:        ftp://ftp.gnu.org/pub/gnu/auctex/%{name}-%{version}.tar.gz
BuildArchitectures: noarch
BuildRoot: 	%{_tmppath}/%{name}-root

%description
AUCTeX is [...]

%package emacs
Summary: 	Enhanced TeX modes for GNU Emacs
Group:          %{commongroup}
Requires: 	emacs >= 21
Obsoletes:      ge_auc emacs-auctex auctex preview-latex-emacs
Conflicts:      emacspeak < 18
Provides:       auctex


So auctex-emacs obsoletes the previous "auctex" package and some other
packages.  It also provides "auctex" since some other packages might
require it.

Basically, you need to provide everything that a third-party package
might have asked for, and you need to obsolete everything that you
intend to replace.

-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum

Re: [ANNOUNCE] GIT 1.5.3

[Arkadiusz Miskiewicz]

Junio C Hamano wrote:

> The latest feature release GIT 1.5.3 is available at the usual
> places:

Hm,

/usr/bin/make -C t/ all
make[1]: Entering directory `/home/users/arekm/rpm/BUILD/git-1.5.3/t'
*** t0000-basic.sh ***
*   ok 1: .git/objects should be empty after git init in an empty repo.
*   ok 2: .git/objects should have 3 subdirectories.
*   ok 3: git update-index without --add should fail adding.
*   ok 4: git update-index with --add should succeed.
*   ok 5: writing tree out with git write-tree
*   ok 6: validate object ID of a known tree.
*   ok 7: git update-index without --remove should fail removing.
*   ok 8: git update-index with --remove should be able to remove.
*   ok 9: git write-tree should be able to write an empty tree.
*   ok 10: validate object ID of a known tree.
*   ok 11: adding various types of objects with git update-index --add.
*   ok 12: showing stage with git ls-files --stage
*   ok 13: validate git ls-files output for a known tree.
*   ok 14: writing tree out with git write-tree.
*   ok 15: validate object ID for a known tree.
*   ok 16: showing tree with git ls-tree
*   ok 17: git ls-tree output for a known tree.
*   ok 18: showing tree with git ls-tree -r
*   ok 19: git ls-tree -r output for a known tree.
*   ok 20: showing tree with git ls-tree -r -t
*   ok 21: git ls-tree -r output for a known tree.
*   ok 22: writing partial tree out with git write-tree --prefix.
*   ok 23: validate object ID for a known tree.
*   ok 24: writing partial tree out with git write-tree --prefix.
*   ok 25: validate object ID for a known tree.
*   ok 26: put invalid objects into the index.
*   ok 27: writing this tree without --missing-ok.
*   ok 28: writing this tree with --missing-ok.
*   ok 29: git read-tree followed by write-tree should be idempotent.
*   ok 30: validate git diff-files output for a know cache/work tree state.
*   ok 31: git update-index --refresh should succeed.
*   ok 32: no diff after checkout and git update-index --refresh.
*   ok 33: git commit-tree records the correct tree in a commit.
*   ok 34: git commit-tree records the correct parent in a commit.
*   ok 35: git commit-tree omits duplicated parent in a commit.
*   ok 36: update-index D/F conflict
*   ok 37: absolute path works as expected
* passed all 37 test(s)
*** t0001-init.sh ***
* FAIL 1: plain

                (
                        unset GIT_DIR GIT_WORK_TREE &&
                        mkdir plain &&
                        cd plain &&
                        git init
                ) &&
                check_config plain/.git false unset

*   ok 2: plain with GIT_WORK_TREE
* FAIL 3: plain bare

                (
                        unset GIT_DIR GIT_WORK_TREE GIT_CONFIG &&
                        mkdir plain-bare-1 &&
                        cd plain-bare-1 &&
                        git --bare init
                ) &&
                check_config plain-bare-1 true unset

*   ok 4: plain bare with GIT_WORK_TREE
*   ok 5: GIT_DIR bare
*   ok 6: GIT_DIR non-bare
*   ok 7: GIT_DIR & GIT_WORK_TREE (1)
*   ok 8: GIT_DIR & GIT_WORK_TREE (2)
* failed 2 among 8 test(s)
make[1]: *** [t0001-init.sh] Error 1
make[1]: Leaving directory `/home/users/arekm/rpm/BUILD/git-1.5.3/t'

verified on 2 machines (so /dev/ is ok this time)

-- 
Arkadiusz Miśkiewicz        PLD/Linux Team
arekm / maven.pl            http://ftp.pld-linux.org/

Re: [ANNOUNCE] GIT 1.5.3

[H. Peter Anvin]

David Kastrup wrote:
> "H. Peter Anvin" <hpa@zytor.com> writes:
> 
>> Junio C Hamano wrote:
>>> * For people who need to import from Perforce, a front-end for
>>>   fast-import is in contrib/fast-import/.
>>>
>> There seems to be an issue with this and RPMS.
>>
>> In particular, there is no longer a git-p4 RPMS, which prevents git
>> from getting upgraded at all by yum.
>>
>> Anyone who knows yum well enough to explain what needs to be done so
>> that yum knows this is obsolete?
> 
> Probably a matter of the correct spec file.  In auctex.spec, we have
> 

 From the looks of it, there is still a git-p4, it just moved to contrib 
and uses fast-import, so removing its rpm package was probably broken in 
the first place.

"make rpm" is also broken for "dirty" builds, which is bad for testing.

	-hpa

Re: [ANNOUNCE] GIT 1.5.3

[Alex Riesen]

Arkadiusz Miskiewicz, Sun, Sep 02, 2007 10:43:38 +0200:
> *** t0001-init.sh ***
> * FAIL 1: plain
> 
>                 (
>                         unset GIT_DIR GIT_WORK_TREE &&
>                         mkdir plain &&
>                         cd plain &&
>                         git init
>                 ) &&
>                 check_config plain/.git false unset
> 
> *   ok 2: plain with GIT_WORK_TREE
> * FAIL 3: plain bare
> 
>                 (
>                         unset GIT_DIR GIT_WORK_TREE GIT_CONFIG &&
>                         mkdir plain-bare-1 &&
>                         cd plain-bare-1 &&
>                         git --bare init
>                 ) &&
>                 check_config plain-bare-1 true unset
> 

Do you have bash-2.05b as /bin/sh ?

Re: [ANNOUNCE] GIT 1.5.3

[Johannes Schindelin]

Hi,

On Sun, 2 Sep 2007, Arkadiusz Miskiewicz wrote:

> Junio C Hamano wrote:
> 
> > The latest feature release GIT 1.5.3 is available at the usual
> > places:
> 
> Hm,
> 
> [...]
>
> *** t0001-init.sh ***
> * FAIL 1: plain
> 
>                 (
>                         unset GIT_DIR GIT_WORK_TREE &&
>                         mkdir plain &&
>                         cd plain &&
>                         git init
>                 ) &&
>                 check_config plain/.git false unset

Please try the verbose mode: cd t/ && sh t0001-init.sh -i -v.  If that 
does not show you _what_ the problem is, try "sh -x [...]".

If you still cannot find what the problem is, please tell us what platform 
you're running on, and show us the output of the "-i -v" invocation.

Ciao,
Dscho

Re: [ANNOUNCE] GIT 1.5.3

[Alex Riesen]

Johannes Schindelin, Sun, Sep 02, 2007 12:59:04 +0200:
> Hi,
> 
> On Sun, 2 Sep 2007, Arkadiusz Miskiewicz wrote:
> 
> > Junio C Hamano wrote:
> > 
> > > The latest feature release GIT 1.5.3 is available at the usual
> > > places:
> > 
> > Hm,
> > 
> > [...]
> >
> > *** t0001-init.sh ***
> > * FAIL 1: plain
> > 
> >                 (
> >                         unset GIT_DIR GIT_WORK_TREE &&
> >                         mkdir plain &&
> >                         cd plain &&
> >                         git init
> >                 ) &&
> >                 check_config plain/.git false unset
> 
> Please try the verbose mode: cd t/ && sh t0001-init.sh -i -v.  If that 
> does not show you _what_ the problem is, try "sh -x [...]".

if that is buggy bash-2.05b the problem will just disappear.

I don't remember what it was when I first met this, but it seemed to be
very specific to this particular version of bash.

Re: [ANNOUNCE] GIT 1.5.3

[Arkadiusz Miskiewicz]

Johannes Schindelin wrote:

> Hi,
> 
> On Sun, 2 Sep 2007, Arkadiusz Miskiewicz wrote:
> 
>> Junio C Hamano wrote:
>> 
>> > The latest feature release GIT 1.5.3 is available at the usual
>> > places:
>> 
>> Hm,
>> 
>> [...]
>>
>> *** t0001-init.sh ***
>> * FAIL 1: plain
>> 
>>                 (
>>                         unset GIT_DIR GIT_WORK_TREE &&
>>                         mkdir plain &&
>>                         cd plain &&
>>                         git init
>>                 ) &&
>>                 check_config plain/.git false unset
> 
> Please try the verbose mode: cd t/ && sh t0001-init.sh -i -v.  If that
> does not show you _what_ the problem is, try "sh -x [...]".
> 
> If you still cannot find what the problem is, please tell us what platform
> you're running on, and show us the output of the "-i -v" invocation.

Found out why this happens. My /bin/sh is pdksh (not bash).

AAAA was never set and:

/bin/sh (pdksh)
[arekm@carme-pld ~]$ unset AAAA
[arekm@carme-pld ~]$ echo $?
1

/bin/bash
[arekm@carme-pld ~]$ unset AAAA
[arekm@carme-pld ~]$ echo $?
0

It's pdksh bug, susv3 says "Unsetting a variable or function that was not
previously set shall not be considered an error and does not cause the
shell to abort."

Going to fix pdksh then.

> Ciao,
> Dscho

-- 
Arkadiusz Miśkiewicz        PLD/Linux Team
arekm / maven.pl            http://ftp.pld-linux.org/

Re: [ANNOUNCE] GIT 1.5.3

[Nicolas Vilz]

On Sat, Sep 01, 2007 at 11:31:17PM -0700, Junio C Hamano wrote:
>   - URL used for "git clone" and friends can specify nonstandard SSH port
>     by using sh://host:port/path/to/repo syntax.

Sorry, but could this be a typo and should be 

     by using ssh://host:port/path/to/repo syntax.
              ^^^ 


Sincerly
Nicolas

Re: [ANNOUNCE] GIT 1.5.3

[Sean]

On Sun, 02 Sep 2007 10:57:03 +0100
"H. Peter Anvin" <hpa@zytor.com> wrote:

>  From the looks of it, there is still a git-p4, it just moved to contrib 
> and uses fast-import, so removing its rpm package was probably broken in 
> the first place.

Hi Peter,

Items in contrib aren't officially supported, so it doesn't sound like
a good idea to offer installs for them.  Of course, it might be a good
idea to promote git-p4 up out of contrib and add it to the spec file.

As things stand now, do you get an error when trying to upgrade Git via
yum?   I'd have thought things would upgrade fine but leave the old git-p4
rpm hanging around.  Either way, the obsoletes line mentioned by David
sounds like the right solution.

As an aside, when I sent the patch removing git-p4import from the spec
file I mentioned that I had no way to test it and asked for testers.
Git needs a spec file maintainer so that issues like this can be caught
before release.  Without a maintainer, it should probably be demoted
to contrib itself.

Sean

Re: [ANNOUNCE] GIT 1.5.3

[Junio C Hamano]

Sean <seanlkml@sympatico.ca> writes:

> On Sun, 02 Sep 2007 10:57:03 +0100
> "H. Peter Anvin" <hpa@zytor.com> wrote:
>
>>  From the looks of it, there is still a git-p4, it just moved to contrib 
>> and uses fast-import, so removing its rpm package was probably broken in 
>> the first place.
> ...
> As an aside, when I sent the patch removing git-p4import from the spec
> file I mentioned that I had no way to test it and asked for testers.
> Git needs a spec file maintainer so that issues like this can be caught
> before release.  Without a maintainer, it should probably be demoted
> to contrib itself.

For majority of general public, I thought the spec file _I_
ship, along with RPM files _I_ build, are contrib status
already.  Don't distro people do their own RPM packages, instead
of using what I placed on k.org?

Assuming that we do not give the old git-p4import script
packaged in "git-p4 package", would the following patch be all
that is needed, or do we need other things in the spec file?

-- snipsnap clipcrap --

diff --git a/git.spec.in b/git.spec.in
index fe7b3d8..3d56e17 100644
--- a/git.spec.in
+++ b/git.spec.in
@@ -13,6 +13,7 @@ Source: 	http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
 BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git
+Obsoletes:	git-p4
 
 %description
 Git is a fast, scalable, distributed revision control system with an

Re: [ANNOUNCE] GIT 1.5.3

[David Kågedal]

Junio C Hamano <gitster@pobox.com> writes:

> GIT v1.5.3 Release Notes
> ========================
>
> Updates since v1.5.2
> --------------------
>
> * The commit walkers other than http are officially deprecated,
>   but still supported for now.

As I think I said before, this first bullet point makes no sense to
git users.  Only hardcore git developers know what a "commit walker
is", and what commit walkers exist (other than html, obviously).  How
will they know if they are using one of the things you just
deprecated?

-- 
David Kågedal

Re: [ANNOUNCE] GIT 1.5.3

[David Kågedal]

David Kågedal <davidk@lysator.liu.se> writes:

> Junio C Hamano <gitster@pobox.com> writes:
>
>> GIT v1.5.3 Release Notes
>> ========================
>>
>> Updates since v1.5.2
>> --------------------
>>
>> * The commit walkers other than http are officially deprecated,
>>   but still supported for now.
>
> As I think I said before, this first bullet point makes no sense to
> git users.  Only hardcore git developers know what a "commit walker
> is", and what commit walkers exist (other than html, obviously).  How

I'm not trying to make you even more confused. Make that "http",
please. :-)

> will they know if they are using one of the things you just
> deprecated?

-- 
David Kågedal

Re: [ANNOUNCE] GIT 1.5.3

[Sean]

On Sun, 02 Sep 2007 15:13:09 -0700
Junio C Hamano <gitster@pobox.com> wrote:

Hi Junio,

> For majority of general public, I thought the spec file _I_
> ship, along with RPM files _I_ build, are contrib status
> already.  Don't distro people do their own RPM packages, instead
> of using what I placed on k.org?

Didn't know you used RPM yourself, so I guess this is just
a case of something slipping through rather than the spec file
needing a maintainer.  Having said that, it seems odd that you
would say the spec file included with git is "contrib status
already".   How can something be contrib status unless it
is in the contrib directory of Git?
 
> Assuming that we do not give the old git-p4import script
> packaged in "git-p4 package", would the following patch be all
> that is needed, or do we need other things in the spec file?

Given the comment from David, I suspect your patch is all
that's needed; hopefully Peter can give it a quick test.

Sean

Re: [ANNOUNCE] GIT 1.5.3

[Junio C Hamano]

David Kågedal <davidk@lysator.liu.se> writes:

> David Kågedal <davidk@lysator.liu.se> writes:
>
>> Junio C Hamano <gitster@pobox.com> writes:
>>
>>> GIT v1.5.3 Release Notes
>>> ========================
>>>
>>> Updates since v1.5.2
>>> --------------------
>>>
>>> * The commit walkers other than http are officially deprecated,
>>>   but still supported for now.
>>
>> As I think I said before, this first bullet point makes no sense to
>> git users.  Only hardcore git developers know what a "commit walker
>> is", and what commit walkers exist (other than html, obviously).  How
>
> I'm not trying to make you even more confused. Make that "http",
> please. :-)

Unless you work extremely hard at it, you won't be using the
local and/or ssh walkers.  The entry is really meant for
Porcelain writers (aka plumbing users).

It's a tricky balancing act.  Not everybody is the end user who
is only interested in using Porcelain.  The release note for a
new release somehow needs to mention changes that would affect
only plumbing users as well.

Re: [ANNOUNCE] GIT 1.5.3

[Steven Grimm]

Junio C Hamano wrote:
> It's a tricky balancing act.  Not everybody is the end user who
> is only interested in using Porcelain.  The release note for a
> new release somehow needs to mention changes that would affect
> only plumbing users as well.
>   

No argument there, of course; it needs to be documented. But maybe not 
as the very first item at the top of the release notes, which people 
might expect to be organized in a "most user-visible first" order. I 
usually expect to see general descriptions of new features and critical 
bugfixes at the top of a program's release notes, with the option to 
keep reading if I want the low-level details.

Barring that, or even in addition to that, would it make sense to have 
separate "porcelain" and "plumbing" sections of the release notes? 
Obviously some changes straddle the two, but there are a lot that are 
pretty clear-cut one way or the other. Then end users can ignore the 
plumbing section and porcelain writers can jump straight to it.

-Steve

Re: [ANNOUNCE] GIT 1.5.3

[Junio C Hamano]

Steven Grimm <koreth@midwinter.com> writes:

> No argument there, of course; it needs to be documented. But maybe not
> as the very first item at the top of the release notes, which people
> might expect to be organized in a "most user-visible first" order. I
> usually expect to see general descriptions of new features and
> critical bugfixes at the top of a program's release notes, with the
> option to keep reading if I want the low-level details.
>
> Barring that, or even in addition to that, would it make sense to have
> separate "porcelain" and "plumbing" sections of the release notes?

I think that makes sense, as "most user-visible first" order
will be different what kind of "user" you are.

Re: [ANNOUNCE] GIT 1.5.3

[Junio C Hamano]

Sean <seanlkml@sympatico.ca> writes:

> On Sun, 02 Sep 2007 15:13:09 -0700
> Junio C Hamano <gitster@pobox.com> wrote:
> ...
>> For majority of general public, I thought the spec file _I_
>> ship, along with RPM files _I_ build, are contrib status
>> already.  Don't distro people do their own RPM packages, instead
>> of using what I placed on k.org?
>
> Didn't know you used RPM yourself, so I guess this is just
> a case of something slipping through rather than the spec file
> needing a maintainer.

Well, I do not _use_ it, but the RPM I have on k.org and mention
as part of the announcement are built by me by typing "make
rpm".  What I meant to say was that these RPM files may not be
"official" at all from the point of view of distro users, and I
suspect that distro "package maintainers" for git would not be
doing just a plain vanilla "make rpm" using the spec file that
comes as part of git.git repository.

Re: [ANNOUNCE] GIT 1.5.3

[H. Peter Anvin]

Sean wrote:
> On Sun, 02 Sep 2007 10:57:03 +0100
> "H. Peter Anvin" <hpa@zytor.com> wrote:
> 
>>  From the looks of it, there is still a git-p4, it just moved to contrib 
>> and uses fast-import, so removing its rpm package was probably broken in 
>> the first place.
> 
> Hi Peter,
> 
> Items in contrib aren't officially supported, so it doesn't sound like
> a good idea to offer installs for them.  Of course, it might be a good
> idea to promote git-p4 up out of contrib and add it to the spec file.

Well, the old one was out of contrib, too.  Maybe it should never have 
been packaged up, but it was...

> As things stand now, do you get an error when trying to upgrade Git via
> yum?   I'd have thought things would upgrade fine but leave the old git-p4
> rpm hanging around.  Either way, the obsoletes line mentioned by David
> sounds like the right solution.

Yes, it gets an error, because all the git RPMs are tied together by 
explicit version number and so can only be upgraded as a group.

> As an aside, when I sent the patch removing git-p4import from the spec
> file I mentioned that I had no way to test it and asked for testers.
> Git needs a spec file maintainer so that issues like this can be caught
> before release.  Without a maintainer, it should probably be demoted
> to contrib itself.

Well, git on kernel.org (and many other places) critically depends on 
rpms being available.

	-hpa

Re: [ANNOUNCE] GIT 1.5.3

[H. Peter Anvin]

Sean wrote:
> 
> Given the comment from David, I suspect your patch is all
> that's needed; hopefully Peter can give it a quick test.
> 

It sounds like it; I don't know how to test it other than placing in the 
repository and try to upgrade.  It can't be any worse, so I don't see 
any harm in just doing it.

	-hpa

Re: [ANNOUNCE] GIT 1.5.3

[Junio C Hamano]

"H. Peter Anvin" <hpa@zytor.com> writes:

> Sean wrote:
>>
>> Given the comment from David, I suspect your patch is all
>> that's needed; hopefully Peter can give it a quick test.
>
> It sounds like it; I don't know how to test it other than placing in
> the repository and try to upgrade.  It can't be any worse, so I don't
> see any harm in just doing it.

Ok, should I then do that single change, cut 1.5.3.1 with it and
ping you?

Re: [ANNOUNCE] GIT 1.5.3

[H. Peter Anvin]

Junio C Hamano wrote:
> "H. Peter Anvin" <hpa@zytor.com> writes:
> 
>> Sean wrote:
>>> Given the comment from David, I suspect your patch is all
>>> that's needed; hopefully Peter can give it a quick test.
>> It sounds like it; I don't know how to test it other than placing in
>> the repository and try to upgrade.  It can't be any worse, so I don't
>> see any harm in just doing it.
> 
> Ok, should I then do that single change, cut 1.5.3.1 with it and
> ping you?

Sounds good to me.

	-hpa

Re: [ANNOUNCE] GIT 1.5.3

[Junio C Hamano]

"H. Peter Anvin" <hpa@zytor.com> writes:

>> Ok, should I then do that single change, cut 1.5.3.1 with it and
>> ping you?
>
> Sounds good to me.

Thanks, and sorry for the trouble.  I am building one on k.org,
and after placing the result in the RPMS/x86-64 and running the
yummy script, I'll ping you again.  If it installs fine for you,
I'll boot my wife's machine to do i386 as well, but it is
getting a bit late now, so it might have to be tomorrow.

-- >8 -- snipsnap -- >8 -- clipcrap -- >8 --
From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 2 Sep 2007 15:16:44 -0700
Subject: [PATCH] GIT 1.5.3.1: obsolete git-p4 in RPM spec file.

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>
---
 git.spec.in                        |    1 +
 Documentation/RelNotes-1.5.3.1.txt |   10 ++++++++++
 Documentation/git.txt              |    5 ++++-
 GIT-VERSION-GEN                    |    2 +-
 RelNotes                           |    2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/RelNotes-1.5.3.1.txt

diff --git a/git.spec.in b/git.spec.in
index fe7b3d8..bdb293d 100644
--- a/git.spec.in
+++ b/git.spec.in
@@ -25,6 +25,7 @@ This is a dummy package which brings in all subpackages.
 Summary:	Core git tools
 Group:		Development/Tools
 Requires:	zlib >= 1.2, rsync, curl, less, openssh-clients, expat
+Obsoletes:	git-p4
 %description core
 Git is a fast, scalable, distributed revision control system with an
 unusually rich command set that provides both high-level operations
diff --git a/Documentation/RelNotes-1.5.3.1.txt b/Documentation/RelNotes-1.5.3.1.txt
new file mode 100644
index 0000000..7ff546c
--- /dev/null
+++ b/Documentation/RelNotes-1.5.3.1.txt
@@ -0,0 +1,10 @@
+GIT v1.5.3.1 Release Notes
+==========================
+
+Fixes since v1.5.3
+------------------
+
+This is solely to fix the generated RPM's dependencies.  We used
+to have git-p4 package but we do not anymore.  As suggested on
+the mailing list, this release makes git-core "Obsolete" git-p4,
+so that yum update would not complain.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index ceca892..6f7db29 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,7 +43,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.5.2.5/git.html[documentation for release 1.5.2.5]
+* link:v1.5.3/git.html[documentation for release 1.5.3]
+
+* release notes for
+  link:RelNotes-1.5.3.1.txt[1.5.3.1].
 
 * release notes for
   link:RelNotes-1.5.2.5.txt[1.5.2.5],
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 3c0032c..3835fb3 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.3.GIT
+DEF_VER=v1.5.3.1.GIT
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index 0de5e66..ea8f800 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.5.3.txt
\ No newline at end of file
+Documentation/RelNotes-1.5.3.1.txt
\ No newline at end of file
-- 
1.5.3

Re: [ANNOUNCE] GIT 1.5.3

[H. Peter Anvin]

Junio C Hamano wrote:
> "H. Peter Anvin" <hpa@zytor.com> writes:
> 
>>> Ok, should I then do that single change, cut 1.5.3.1 with it and
>>> ping you?
>> Sounds good to me.
> 
> Thanks, and sorry for the trouble.  I am building one on k.org,
> and after placing the result in the RPMS/x86-64 and running the
> yummy script, I'll ping you again.  If it installs fine for you,
> I'll boot my wife's machine to do i386 as well, but it is
> getting a bit late now, so it might have to be tomorrow.
> 

git.kernel.org is actually an i386 machine (the only one we have left), too.

	-hpa

Re: [ANNOUNCE] GIT 1.5.3

[Junio C Hamano]

"H. Peter Anvin" <hpa@zytor.com> writes:

> Junio C Hamano wrote:
>> "H. Peter Anvin" <hpa@zytor.com> writes:
>>
>>>> Ok, should I then do that single change, cut 1.5.3.1 with it and
>>>> ping you?
>>> Sounds good to me.
>>
>> Thanks, and sorry for the trouble.  I am building one on k.org,
>> and after placing the result in the RPMS/x86-64 and running the
>> yummy script, I'll ping you again.  If it installs fine for you,
>> I'll boot my wife's machine to do i386 as well, but it is
>> getting a bit late now, so it might have to be tomorrow.
>>
>
> git.kernel.org is actually an i386 machine (the only one we have left), too.

I see /usr/bin/git on the other machine is already 1.5.3.1 so I
take the experiment went well.  I am building the i386 set now.

Re: [ANNOUNCE] GIT 1.5.3

[Junio C Hamano]

"H. Peter Anvin" <hpa@zytor.com> writes:

> Junio C Hamano wrote:
>> "H. Peter Anvin" <hpa@zytor.com> writes:
>>
>>>> Ok, should I then do that single change, cut 1.5.3.1 with it and
>>>> ping you?
>>> Sounds good to me.
>>
>> Thanks, and sorry for the trouble.  I am building one on k.org,
>> and after placing the result in the RPMS/x86-64 and running the
>> yummy script, I'll ping you again.  If it installs fine for you,
>> I'll boot my wife's machine to do i386 as well, but it is
>> getting a bit late now, so it might have to be tomorrow.
>
> git.kernel.org is actually an i386 machine (the only one we have left), too.

Ok, I did the same for i386, up to "yummy" part.  Could you take
care of the rest of the installation procedure, please?

Re: [ANNOUNCE] GIT 1.5.3

[H. Peter Anvin]

Junio C Hamano wrote:
> "H. Peter Anvin" <hpa@zytor.com> writes:
> 
>> Junio C Hamano wrote:
>>> "H. Peter Anvin" <hpa@zytor.com> writes:
>>>
>>>>> Ok, should I then do that single change, cut 1.5.3.1 with it and
>>>>> ping you?
>>>> Sounds good to me.
>>> Thanks, and sorry for the trouble.  I am building one on k.org,
>>> and after placing the result in the RPMS/x86-64 and running the
>>> yummy script, I'll ping you again.  If it installs fine for you,
>>> I'll boot my wife's machine to do i386 as well, but it is
>>> getting a bit late now, so it might have to be tomorrow.
>> git.kernel.org is actually an i386 machine (the only one we have left), too.
> 
> Ok, I did the same for i386, up to "yummy" part.  Could you take
> care of the rest of the installation procedure, please?
> 

Done, all good.

	-hpa

Re: [ANNOUNCE] GIT 1.5.3

[Andreas Ericsson]

Junio C Hamano wrote:
> 
> Assuming that we do not give the old git-p4import script
> packaged in "git-p4 package", would the following patch be all
> that is needed, or do we need other things in the spec file?
> 
> -- snipsnap clipcrap --
> +Obsoletes:	git-p4

That depends. If packages outside of git requires the git-p4 package to function
then this will not suffice and a line saying

	Provides: git-p4

would have to be added instead. If some other already installed package Require:'s
/usr/bin/git-p4import, then that other package is broken and we're toast.

I have a hard time seeing what other package would depend on the git-p4import
script so this was more along the lines of "how rpm dependencies work, kinda"
than a real issue.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231

Re: [ANNOUNCE] GIT 1.5.3

[David Kastrup]

Andreas Ericsson <ae@op5.se> writes:

> Junio C Hamano wrote:
>>
>> Assuming that we do not give the old git-p4import script
>> packaged in "git-p4 package", would the following patch be all
>> that is needed, or do we need other things in the spec file?
>>
>> -- snipsnap clipcrap --
>> +Obsoletes:	git-p4
>
> That depends. If packages outside of git requires the git-p4 package
> to function then this will not suffice and a line saying
>
> 	Provides: git-p4
>
> would have to be added instead.

Not instead, but in addition IIRC (it obsoletes the package and
provides the feature).  But that would be nonsensical if the outside
package indeed requires git-p4 and we don't have it in our current
RPM: the purpose of dependencies is to not have things break silently,
and lying about what we provide would be wrong.

-- 
David Kastrup

Re: [ANNOUNCE] GIT 1.5.3

[Andreas Ericsson]

David Kastrup wrote:
> Andreas Ericsson <ae@op5.se> writes:
> 
>> Junio C Hamano wrote:
>>> Assuming that we do not give the old git-p4import script
>>> packaged in "git-p4 package", would the following patch be all
>>> that is needed, or do we need other things in the spec file?
>>>
>>> -- snipsnap clipcrap --
>>> +Obsoletes:	git-p4
>> That depends. If packages outside of git requires the git-p4 package
>> to function then this will not suffice and a line saying
>>
>> 	Provides: git-p4
>>
>> would have to be added instead.
> 
> Not instead, but in addition IIRC (it obsoletes the package and
> provides the feature).  But that would be nonsensical if the outside
> package indeed requires git-p4 and we don't have it in our current
> RPM: the purpose of dependencies is to not have things break silently,
> and lying about what we provide would be wrong.
> 

No, it really is instead. A package obsoleting one of the features it
provides itself would be insane.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231

Re: [ANNOUNCE] GIT 1.5.3

[David Kastrup]

Andreas Ericsson <ae@op5.se> writes:

> David Kastrup wrote:
>> Andreas Ericsson <ae@op5.se> writes:
>>
>>> Junio C Hamano wrote:
>>>> Assuming that we do not give the old git-p4import script
>>>> packaged in "git-p4 package", would the following patch be all
>>>> that is needed, or do we need other things in the spec file?
>>>>
>>>> -- snipsnap clipcrap --
>>>> +Obsoletes:	git-p4
>>> That depends. If packages outside of git requires the git-p4 package
>>> to function then this will not suffice and a line saying
>>>
>>> 	Provides: git-p4
>>>
>>> would have to be added instead.
>>
>> Not instead, but in addition IIRC (it obsoletes the package and
>> provides the feature).  But that would be nonsensical if the outside
>> package indeed requires git-p4 and we don't have it in our current
>> RPM: the purpose of dependencies is to not have things break silently,
>> and lying about what we provide would be wrong.
>
> No, it really is instead. A package obsoleting one of the features
> it provides itself would be insane.

Not according to my understanding: "Obsoletes:" concerns _packages_,
while "Provides:" concerns features.  So it is perfectly feasible to
obsolete a previously separate package and provide its functionality.

And indeed, our "emacs-auctex" package _both_ obsoletes _and_ provides
"auctex".  And it is not like we did not learn this the hard way...

-- 
David Kastrup