security issues and to prepare for the outstanding upgrade of gitweb.
Changes since git 1.6.0.2:
- Fix output line format for zip archive generation.
- Fix continuation of git rebase -i in case of modified files (conflict).
- Honor the pre-rebase hook for git rebase -i.
- Fix inconsistent behavior of git diff --quiet and diff --exit-code.
- Use multiple element hunk headers from git diff correctly.
- Portability fix for the git diff hunk header regexps.
- Fix git index-pack inside .git/objects/pack directory.
- Fix git index-pack in thin-pack mode.
- Some git stash apply fixes.
- Fixed format string vulnerabilities (e.g. in git remote).
- Fix behavior of git checkout -b <existingbranch>.
- Make git checkout -q actually quiet.
- In quiet remote operation, we don't need the remote side to send along
all the statistics we discard.
- Don't do cross-directory renames when creating packs.
- git prune now also removes stale temp files under .git/objects/pack.
- Have git merge prune empty directories.
- Have git merge allocate enough memory for the structure itself when
enumerating the parents of the resulting commit.
- Stop git blame -C -C from segfaulting if it encounters a submodule
reference.
- If only file times were changed, don't have git rm claim local
modifications.
- If set-tree fails, don't let git svn output Perl compile errors.
- Fix various NULL pointer crashes (e.g. in apply, reset, update-index).
- Remove bash completion support for various non-space tools.
- Don't have git add -p claim no changes if binary files have been
modified.
- Fix git archive in bare repositories.
- Have git diff display the number of new or deleted files for the case
where there have been too many of them to allow rename detection.
- Fix git push --mirror to not try to send the stash.
- If the remote end is up to date, still update the tracking reference upon
git push.
- Make git pull $there $branch:$current_branch work on unborn branches.
- Have git reset --hard remove new paths after giving up resolving a
conflicting merge.
- Fix git send-email fd leak in directory scanning.
- Make submodule directories appear as tracked in git status.
- Have git svn invoke "git command" rather than "git-command".
- Have git update-ref -d honor --no-deref.
- Fix various memory leaks.
- Fix git checkout segfault when HEAD points to a deleted branch.
- Allow switching out of the current branch with git checkout on an
un-checked-out state.
- Have git fast-export export all tags.
- Make git ls-files --with-tree=<tree> work with options other than -c.
- If the first object in git pack-objects exceeds --max-pack-size, don't
stuff even more objects in.
- Stop git-p4 from replacing multilike keywords. (They don't exist.)
- Make git tag complain about mutually incompatible options.
- Fix performance for git internal diff on large files with repeating
chunks.
- Don't let git repack grab objects out of packs marked with .keep into
new packs.
- Fix git fsck deep recursion.
- Fix git fast-export and fast-import on old style annotated tags without
tagger information.
- Have git mergetool honor the "--".
- Fix segfault of git show <tag> where <tag> points at a nonexistent object.
- Fix handling of lists of mail addresses for git send-email.
- Fix branch ancestry logic in git svn if the history fetching process
was interrupted.
change ${.CURDIR}/../... to ../../devel/scmgit/...; makes
a lot more sense.
Fixes since v1.6.0.1
--------------------
* Installation on platforms that needs .exe suffix to git-* programs were
broken in 1.6.0.1.
* Installation on filesystems without symbolic links support did nto
work well.
* In-tree documentations and test scripts now use "git foo" form to set a
better example, instead of the "git-foo" form (which is an acceptable
form if you have "PATH=$(git --exec-path):$PATH" in your script)
* Many commands did not use the correct working tree location when used
with GIT_WORK_TREE environment settings.
* Some systems needs to use compatibility fnmach and regex libraries
independent from each other; the compat/ area has been reorganized to
allow this.
* "git apply --unidiff-zero" incorrectly applied a -U0 patch that inserts
a new line before the second line.
* "git blame -c" did not exactly work like "git annotate" when range
boundaries are involved.
* "git checkout file" when file is still unmerged checked out contents from
a random high order stage, which was confusing.
* "git clone $there $here/" with extra trailing slashes after explicit
local directory name $here did not work as expected.
* "git diff" on tracked contents with CRLF line endings did not drive "less"
intelligently when showing added or removed lines.
* "git diff --dirstat -M" did not add changes in subdirectories up
correctly for renamed paths.
* "git diff --cumulative" did not imply "--dirstat".
* "git for-each-ref refs/heads/" did not work as expected.
* "git gui" allowed users to feed patch without any context to be applied.
* "git gui" botched parsing "diff" output when a line that begins with two
dashes and a space gets removed or a line that begins with two pluses
and a space gets added.
* "git gui" translation updates and i18n fixes.
* "git index-pack" is more careful against disk corruption while completing
a thin pack.
* "git log -i --grep=pattern" did not ignore case; neither "git log -E
--grep=pattern" triggered extended regexp.
* "git log --pretty="%ad" --date=short" did not use short format when
showing the timestamp.
* "git log --author=author" match incorrectly matched with the
timestamp part of "author " line in commit objects.
* "git log -F --author=author" did not work at all.
* Build procedure for "git shell" that used stub versions of some
functions and globals was not understood by linkers on some platforms.
* "git stash" was fooled by a stat-dirty but otherwise unmodified paths
and refused to work until the user refreshed the index.
* "git svn" was broken on Perl before 5.8 with recent fixes to reduce
use of temporary files.
* "git verify-pack -v" did not work correctly when given more than one
packfile.
Also contains many documentation updates.
GIT v1.6.0.1 Release Notes
==========================
Fixes since v1.6.0
------------------
* "git diff --cc" did not honor content mangling specified by
gitattributes and core.autocrlf when reading from the work tree.
* "git diff --check" incorrectly detected new trailing blank lines when
whitespace check was in effect.
* "git for-each-ref" tried to dereference NULL when asked for '%(body)" on
a tag with a single incomplete line as its payload.
* "git format-patch" peeked before the beginning of a string when
"format.headers" variable is empty (a misconfiguration).
* "git help help" did not work correctly.
* "git mailinfo" (hence "git am") was unhappy when MIME multipart message
contained garbage after the finishing boundary.
* "git mailinfo" also was unhappy when the "From: " line only had a bare
e-mail address.
* "git merge" did not refresh the index correctly when a merge resulted in
a fast-forward.
* "git merge" did not resolve a truly trivial merges that can be done
without content level merges.
* "git svn dcommit" to a repository with URL that has embedded usernames
did not work correctly.
* Contains other various documentation fixes.
|GIT v1.6.0 Release Notes|
+========================+
User visible changes
- Templates now installed in ${PREFIX}/share/examples/scmgit/templates
and registered as REQD_FILES. Template subdirectories are
registered in MAKE_DIRS.
- Installing the many git-foo binaries/scripts into libexec/git-core
is now default and better supported. If you've written any
scripts or use any applications which expect the git-foo commands
to be in ${PREFIX}/bin, please do update them accordingly.
+--------------------+
|Updates since v1.5.6|
+--------------------+
(subsystems)
* git-p4 in contrib learned "allowSubmit" configuration to control on
which branch to allow "submit" subcommand.
* git-gui learned to stage changes per-line.
(portability)
* Changes for MinGW port have been merged, thanks to Johannes Sixt and
gangs.
* Sample hook scripts shipped in templates/ are now suffixed with
*.sample.
(documentation)
* Updated howto/update-hook-example
* Got rid of usage of "git-foo" from the tutorial and made typography
more consistent.
* Disambiguating "--" between revs and paths is finally documented.
(performance, robustness, sanity etc.)
* index-pack used too much memory when dealing with a deep delta chain.
This has been optimized.
* reduced excessive inlining to shrink size of the "git" binary.
* verify-pack checks the object CRC when using version 2 idx files.
* When an object is corrupt in a pack, the object became unusable even
when the same object is available in a loose form, We now try harder to
fall back to these redundant objects when able. In particular, "git
repack -a -f" can be used to fix such a corruption as long as necessary
objects are available.
* Performance of "git-blame -C -C" operation is vastly improved.
* git-clone does not create refs in loose form anymore (it behaves as
if you immediately ran git-pack-refs after cloning). This will help
repositories with insanely large number of refs.
* core.fsyncobjectfiles configuration can be used to ensure that the loose
objects created will be fsync'ed (this is only useful on filesystems
that does not order data writes properly).
* "git commit-tree" plumbing can make Octopus with more than 16 parents.
"git commit" has been capable of this for quite some time.
(usability, bells and whistles)
* even more documentation pages are now accessible via "man" and "git help".
* A new environment variable GIT_CEILING_DIRECTORIES can be used to stop
the discovery process of the toplevel of working tree; this may be useful
when you are working in a slow network disk and are outside any working
tree, as bash-completion and "git help" may still need to run in these
places.
* By default, stash entries never expire. Set reflogexpire in [gc
"refs/stash"] to a reasonable value to get traditional auto-expiration
behaviour back
* Longstanding latency issue with bash completion script has been
addressed. This will need to be backmerged to 'maint' later.
* pager.<cmd> configuration variable can be used to enable/disable the
default paging behaviour per command.
* "git-add -i" has a new action 'e/dit' to allow you edit the patch hunk
manually.
* git-am records the original tip of the branch in ORIG_HEAD before it
starts applying patches.
* git-apply can handle a patch that touches the same path more than once
much better than before.
* git-apply can be told not to trust the line counts recorded in the input
patch but recount, with the new --recount option.
* git-apply can be told to apply a patch to a path deeper than what the
patch records with --directory option.
* git-archive can be told to omit certain paths from its output using
export-ignore attributes.
* git-archive uses the zlib default compression level when creating
zip archive.
* git-archive's command line options --exec and --remote can take their
parameters as separate command line arguments, similar to other commands.
IOW, both "--exec=path" and "--exec path" are now supported.
* With -v option, git-branch describes the remote tracking statistics
similar to the way git-checkout reports by how many commits your branch
is ahead/behind.
* git-branch's --contains option used to always require a commit parameter
to limit the branches with; it now defaults to list branches that
contains HEAD if this parameter is omitted.
* git-branch's --merged and --no-merged option used to always limit the
branches relative to the HEAD, but they can now take an optional commit
argument that is used in place of HEAD.
* git-bundle can read the revision arguments from the standard input.
* git-cherry-pick can replay a root commit now.
* git-clone can clone from a remote whose URL would be rewritten by
configuration stored in $HOME/.gitconfig now.
* "git-clone --mirror" is a handy way to set up a bare mirror repository.
* git-cvsserver learned to respond to "cvs co -c".
* git-diff --check now checks leftover merge conflict markers.
* "git-diff -p" learned to grab a better hunk header lines in
BibTex, Pascal/Delphi, and Ruby files and also pays attention to
chapter and part boundary in TeX documents.
* When remote side used to have branch 'foo' and git-fetch finds that now
it has branch 'foo/bar', it refuses to lose the existing remote tracking
branch and its reflog. The error message has been improved to suggest
pruning the remote if the user wants to proceed and get the latest set
of branches from the remote, including such 'foo/bar'.
* fast-export learned to export and import marks file; this can be used to
interface with fast-import incrementally.
* fast-import and fast-export learned to export and import gitlinks.
* "gitk" left background process behind after being asked to dig very deep
history and the user killed the UI; the process is killed when the UI
goes away now.
* git-rebase records the original tip of branch in ORIG_HEAD before it is
rewound.
* "git rerere" can be told to update the index with auto-reused resolution
with rerere.autoupdate configuration variable.
* git-rev-parse learned $commit^! and $commit^@ notations used in "log"
family. These notations are available in gitk as well, because the gitk
command internally uses rev-parse to interpret its arguments.
* git-rev-list learned --children option to show child commits it
encountered during the traversal, instead of showing parent commits.
* git-send-mail can talk not just over SSL but over TLS now.
* git-shortlog honors custom output format specified with
"--pretty=format:".
* "git-stash save" learned --keep-index option. This lets you stash away
the local changes and bring the changes staged in the index to your
working tree for examination and testing.
* git-stash also learned branch subcommand to create a new branch out of
stashed changes.
* git-status gives the remote tracking statistics similar to the way
git-checkout reports by how many commits your branch is ahead/behind.
* "git-svn dcommit" is now aware of auto-props setting the subversion user
has.
* You can tell "git status -u" to even more aggressively omit checking
untracked files with --untracked-files=no.
* Original SHA-1 value for "update-ref -d" is optional now.
* Error codes from gitweb are made more descriptive where possible, rather
than "403 forbidden" as we used to issue everywhere.
(internal)
* git-merge has been reimplemented in C.
+------------------+
|Fixes since v1.5.6|
+------------------+
All of the fixes in v1.5.6 maintenance series are included in
this release, unless otherwise noted.
* git-clone ignored its -u option; the fix needs to be backported to
'maint';
* git-mv used to lose the distinction between changes that are staged
and that are only in the working tree, by staging both in the index
after moving such a path.
* "git-rebase -i -p" rewrote the parents to wrong ones when amending
(either edit or squash) was involved, and did not work correctly
when fast forwarding.
this ensures that git never has to install its own copy, thereby
avoiding future conflicts with devel/p5-Error. Plus, the pkgsrc
version is newer.
While here, set PKG_SYSCONFSUBDIR=git and explicitly specify sysconfdir
in CONFIGURE_ARGS. Remove trailing slash from GITCOREDIR.
Long list of changes since 1.5.6:
Fixes since v1.5.6.3
--------------------
* Various commands could overflow its internal buffer on a platform
with small PATH_MAX value in a repository that has contents with
long pathnames.
* There wasn't a way to make --pretty=format:%<> specifiers to honor
.mailmap name rewriting for authors and committers. Now you can with
%aN and %cN.
* Bash completion wasted too many cycles; this has been optimized to be
usable again.
* Bash completion lost ref part when completing something like "git show
pu:Makefile".
* "git-cvsserver" did not clean up its temporary working area after
annotate request.
* "git-daemon" called syslog() from its signal handler, which was a
no-no.
* "git-fetch" into an empty repository used to remind that the fetch will
be huge by saying "no common commits", but this was an unnecessary
noise; it is already known by the user anyway.
* "git-http-fetch" would have segfaulted when pack idx file retrieved
from the other side was corrupt.
* "git-index-pack" used too much memory when dealing with a deep delta
chain.
* "git-mailinfo" (hence "git-am") did not correctly handle in-body [PATCH]
line to override the commit title taken from the mail Subject header.
* "git-rebase -i -p" lost parents that are not involved in the history
being rewritten.
* "git-rm" lost track of where the index file was when GIT_DIR was
specified as a relative path.
* "git-rev-list --quiet" was not quiet as advertised.
Contains other various documentation fixes.
Fixes since v1.5.6.2
--------------------
* Setting core.sharerepository to traditional "true" value was supposed
to make the repository group writable but should not affect permission
for others. However, since 1.5.6, it was broken to drop permission
for others when umask is 022, making the repository unreadable by others.
* Setting GIT_TRACE will report spawning of external process via
run_command().
* Using an object with very deep delta chain pinned memory needed for
extracting intermediate base objects unnecessarily long,
leading to excess memory usage.
* Bash completion script did not notice '--' marker on the command
line and tried the relatively slow "ref completion" even when
completing arguments after one.
* Registering a non-empty blob racily and then truncating the working
tree file for it confused "racy-git avoidance" logic into thinking
that the path is now unchanged.
* The section that describes attributes related to git-archive were placed
in a wrong place in the gitattributes(5) manual page.
* "git am" was not helpful to the users when it detected that the committer
information is not set up properly yet.
* "git clone" had a leftover debugging fprintf().
* "git clone -q" was not quiet enough as it used to and gave object count
and progress reports.
* "git clone" marked downloaded packfile with .keep; this could be a
good thing if the remote side is well packed but otherwise not,
especially for a project that is not really big.
* "git daemon" used to call syslog() from a signal handler, which
could raise signals of its own but generally is not reentrant. This
was fixed by restructuring the code to report syslog() after the handler
returns.
* When "git push" tries to remove a remote ref, and corresponding
tracking ref is missing, we used to report error (i.e. failure to
remove something that does not exist).
* "git mailinfo" (hence "git am") did not handle commit log messages in a
MIME multipart mail correctly.
Futureproof
-----------
* "git-shell" accepts requests without a dash between "git" and
subcommand name (e.g. "git upload-pack") which the newer client will
start to make sometime in the future.
Fixes since v1.5.6.1
--------------------
* "git clone" from a remote that is named with url.insteadOf setting in
$HOME/.gitconfig did not work well.
* "git describe --long --tags" segfaulted when the described revision was
tagged with a lightweight tag.
* "git diff --check" did not report the result via its exit status
reliably.
* When remote side used to have branch 'foo' and git-fetch finds that now
it has branch 'foo/bar', it refuses to lose the existing remote tracking
branch and its reflog. The error message has been improved to suggest
pruning the remote if the user wants to proceed and get the latest set
of branches from the remote, including such 'foo/bar'.
* "git reset file" should mean the same thing as "git reset HEAD file",
but we required disambiguating -- even when "file" is not ambiguous.
* "git show" segfaulted when an annotated tag that points at another
annotated tag was given to it.
* Optimization for a large import via "git-svn" introduced in v1.5.6 had a
serious memory and temporary file leak, which made it unusable for
moderately large import.
* "git-svn" mangled remote nickname used in the configuration file
unnecessarily.
Fixes since v1.5.6
------------------
* Last minute change broke loose object creation on AIX.
* (performance fix) We used to make $GIT_DIR absolute path early in the
programs but keeping it relative to the current directory internally
gives 1-3 per-cent performance boost.
* bash completion knows the new --graph option to git-log family.
* git-diff -c/--cc showed unnecessary "deletion" lines at the context
boundary.
* git-for-each-ref ignored %(object) and %(type) requests for tag
objects.
* git-merge usage had a typo.
* Rebuilding of git-svn metainfo database did not take rewriteRoot
option into account.
* Running "git-rebase --continue/--skip/--abort" before starting a
rebase gave nonsense error messages.
by Makefile.common and Makefile. Add empty declarations of missing
variables in Makefile and remove inclusion of Makefile.common there.
This package should now build properly.
GIT v1.5.5.1 Release Notes
==========================
Fixes since v1.5.5
------------------
* "git archive --prefix=$path/" mishandled gitattributes.
* "git fetch -v" that fetches into FETCH_HEAD did not report the summary
the same way as done for updating the tracking refs.
* "git svn" misbehaved when the configuration file customized the "git
log" output format using format.pretty.
* "git submodule status" leaked an unnecessary error message.
* "git log --date-order --topo-order" did not override the earlier
date-order with topo-order as expected.
* "git bisect good $this" did not check the validity of the revision
given properly.
* "url.<there>.insteadOf" did not work correctly.
* "git clean" ran inside subdirectory behaved as if the directory was
explicitly specified for removal by the end user from the top level.
* "git bisect" from a detached head leaked an unnecessary error message.
* "git bisect good $a $b" when $a is Ok but $b is bogus should have
atomically failed before marking $a as good.
* "git fmt-merge-msg" did not clean up leading empty lines from commit
log messages like "git log" family does.
* "git am" recorded a commit with empty Subject: line without
complaining.
* when given a commit log message whose first paragraph consists of
multiple lines, "git rebase" squashed it into a single line.
* "git remote add $bogus_name $url" did not complain properly.
* Also comes with various documentation updates.
The scmgit-base package now installs most of its binaries, e.g. git-*,
to ${PREFIX}/libexec/git-core/ instead of ${PREFIX}/bin. There are
only two programs under ${LOCALBASE}/bin: the "master" git(7) wrapper
program and the gitk tcl/tk repository browser. Given that there are
many different GIT interfaces (GUI applications, devel/tig, shell
completion scripts, etc.), it seemed needless to me to have 120+
binaries--a vast majority of which most users would seldom invoke
directly--polluting ${LOCALBASE}/bin.
GIT v1.5.5 Release Notes
========================
Updates since v1.5.4
--------------------
(subsystems)
* Comes with git-gui 0.10.1
(portability)
* We shouldn't ask for BSD group ownership semantics by setting g+s bit
on directories on older BSD systems that refuses chmod() by non root
users. BSD semantics is the default there anyway.
* Bunch of portability improvement patches coming from an effort to port
to Solaris has been applied.
(performance)
* On platforms with suboptimal qsort(3) implementation, there
is an option to use more reasonable substitute we ship with
our software.
* New configuration variable "pack.packsizelimit" can be used
in place of command line option --max-pack-size.
* "git fetch" over the native git protocol used to make a
connection to find out the set of current remote refs and
another to actually download the pack data. We now use only
one connection for these tasks.
* "git commit" does not run lstat(2) more than necessary
anymore.
(usability, bells and whistles)
* Bash completion script (in contrib) are aware of more commands and
options.
* You can be warned when core.autocrlf conversion is applied in
such a way that results in an irreversible conversion.
* A catch-all "color.ui" configuration variable can be used to
enable coloring of all color-capable commands, instead of
individual ones such as "color.status" and "color.branch".
* The commands refused to take absolute pathnames where they
require pathnames relative to the work tree or the current
subdirectory. They now can take absolute pathnames in such a
case as long as the pathnames do not refer outside of the
work tree. E.g. "git add $(pwd)/foo" now works.
* Error messages used to be sent to stderr, only to get hidden,
when $PAGER was in use. They now are sent to stdout along
with the command output to be shown in the $PAGER.
* A pattern "foo/" in .gitignore file now matches a directory
"foo". Pattern "foo" also matches as before.
* bash completion's prompt helper function can talk about
operation in-progress (e.g. merge, rebase, etc.).
* Configuration variables "url.<usethis>.insteadof = <otherurl>" can be
used to tell "git-fetch" and "git-push" to use different URL than what
is given from the command line.
* "git add -i" behaves better even before you make an initial commit.
* "git am" refused to run from a subdirectory without a good reason.
* After "git apply --whitespace=fix" fixes whitespace errors in a patch,
a line before the fix can appear as a context or preimage line in a
later patch, causing the patch not to apply. The command now knows to
see through whitespace fixes done to context lines to successfully
apply such a patch series.
* "git branch" (and "git checkout -b") to branch from a local branch can
optionally set "branch.<name>.merge" to mark the new branch to build on
the other local branch, when "branch.autosetupmerge" is set to
"always", or when passing the command line option "--track" (this option
was ignored when branching from local branches). By default, this does
not happen when branching from a local branch.
* "git checkout" to switch to a branch that has "branch.<name>.merge" set
(i.e. marked to build on another branch) reports how much the branch
and the other branch diverged.
* When "git checkout" has to update a lot of paths, it used to be silent
for 4 seconds before it showed any progress report. It is now a bit
more impatient and starts showing progress report early.
* "git commit" learned a new hook "prepare-commit-msg" that can
inspect what is going to be committed and prepare the commit
log message template to be edited.
* "git cvsimport" can now take more than one -M options.
* "git describe" learned to limit the tags to be used for
naming with --match option.
* "git describe --contains" now barfs when the named commit
cannot be described.
* "git describe --exact-match" describes only commits that are tagged.
* "git describe --long" describes a tagged commit as $tag-0-$sha1,
instead of just showing the exact tagname.
* "git describe" warns when using a tag whose name and path contradict
with each other.
* "git diff" learned "--relative" option to limit and output paths
relative to the current directory when working in a subdirectory.
* "git diff" learned "--dirstat" option to show birds-eye-summary of
changes more concisely than "--diffstat".
* "git format-patch" learned --cover-letter option to generate a cover
letter template.
* "git gc" learned --quiet option.
* "git gc" now automatically prunes unreachable objects that are two
weeks old or older.
* "git gc --auto" can be disabled more easily by just setting gc.auto
to zero. It also tolerates more packfiles by default.
* "git grep" now knows "--name-only" is a synonym for the "-l" option.
* "git help <alias>" now reports "'git <alias>' is alias to <what>",
instead of saying "No manual entry for git-<alias>".
* "git help" can use different backends to show manual pages and this can
be configured using "man.viewer" configuration.
* "gitk" does not restore window position from $HOME/.gitk anymore (it
still restores the size).
* "git log --grep=<what>" learned "--fixed-strings" option to look for
<what> without treating it as a regular expression.
* "git gui" learned an auto-spell checking.
* "git push <somewhere> HEAD" and "git push <somewhere> +HEAD" works as
expected; they push the current branch (and only the current branch).
In addition, HEAD can be written as the value of "remote.<there>.push"
configuration variable.
* When the configuration variable "pack.threads" is set to 0, "git
repack" auto detects the number of CPUs and uses that many threads.
* "git send-email" learned to prompt for passwords
interactively.
* "git send-email" learned an easier way to suppress CC
recipients.
* "git stash" learned "pop" command, that applies the latest stash and
removes it from the stash, and "drop" command to discard the named
stash entry.
* "git submodule" learned a new subcommand "summary" to show the
symmetric difference between the HEAD version and the work tree version
of the submodule commits.
* Various "git cvsimport", "git cvsexportcommit", "git cvsserver",
"git svn" and "git p4" improvements.
(internal)
* Duplicated code between git-help and git-instaweb that
launches user's preferred browser has been refactored.
* It is now easier to write test scripts that records known
breakages.
* "git checkout" is rewritten in C.
* "git remote" is rewritten in C.
* Two conflict hunks that are separated by a very short span of common
lines are now coalesced into one larger hunk, to make the result easier
to read.
* Run-command API's use of file descriptors is documented clearer and
is more consistent now.
* diff output can be sent to FILE * that is different from stdout. This
will help reimplementing more things in C.
Fixes since v1.5.4
------------------
All of the fixes in v1.5.4 maintenance series are included in
this release, unless otherwise noted.
* "git-http-push" did not allow deletion of remote ref with the usual
"push <remote> :<branch>" syntax.
* "git-rebase --abort" did not go back to the right location if
"git-reset" was run during the "git-rebase" session.
* "git imap-send" without setting imap.host did not error out but
segfaulted.
GIT v1.5.4.5 Release Notes
==========================
Fixes since v1.5.4.4
--------------------
* "git fetch there" when the URL information came from the Cogito style
branches/there file did not update refs/heads/there (regression in
1.5.4).
* Bogus refspec configuration such as "remote.there.fetch = =" were not
detected as errors (regressionin 1.5.4).
* You couldn't specify a custom editor whose path contains a whitespace
via GIT_EDITOR (and core.editor).
* The subdirectory filter to "git filter-branch" mishandled a history
where the subdirectory becomes empty and then later becomes non-empty.
* "git shortlog" gave an empty line if the original commit message was
malformed (e.g. a botched import from foreign SCM). Now it finds the
first non-empty line and uses it for better information.
* When the user fails to give a revision parameter to "git svn", an error
from the Perl interpreter was issued because the script lacked proper
error checking.
* After "git rebase" stopped due to conflicts, if the user played with
"git reset" and friends, "git rebase --abort" failed to go back to the
correct commit.
* Additional work trees prepared with git-new-workdir (in contrib/) did
not share git-svn metadata directory .git/svn with the original.
* "git-merge-recursive" did not mark addition of the same path with
different filemodes correctly as a conflict.
* "gitweb" gave malformed URL when pathinfo stype paths are in use.
* "-n" stands for "--no-tags" again for "git fetch".
* "git format-patch" did not detect the need to add 8-bit MIME header
when the user used format.header configuration.
* "rev~" revision specifier used to mean "rev", which was inconsistent
with how "rev^" worked. Now "rev~" is the same as "rev~1" (hence it
also is the same as "rev^1"), and "rev~0" is the same as "rev^0"
(i.e. it has to be a commit).
* "git quiltimport" did not grok empty lines, lines in "file -pNNN"
format to specify the prefix levels and lines with trailing comments.
* "git rebase -m" triggered pre-commit verification, which made
"rebase --continue" impossible.
As usual, it also comes with many documentation fixes and clarifications.
being passed in struct to localtime_r (convert from timeval to timespec).
GIT v1.5.4.4 Release Notes
==========================
Fixes since v1.5.4.3
--------------------
* Building and installing with an overtight umask such as 077 made
installed templates unreadable by others, while the rest of the install
are done in a way that is friendly to umask 022.
* "git cvsexportcommit -w $cvsdir" misbehaved when GIT_DIR is set to a
relative directory.
* "git http-push" had an invalid memory access that could lead it to
segfault.
* When "git rebase -i" gave control back to the user for a commit that is
marked to be edited, it just said "modify it with commit --amend",
without saying what to do to continue after modifying it. Give an
explicit instruction to run "rebase --continue" to be more helpful.
* "git send-email" in 1.5.4.3 issued a bogus empty In-Reply-To: header.
* "git bisect" showed mysterious "won't bisect on seeked tree" error message.
This was leftover from Cogito days to prevent "bisect" starting from a
cg-seeked state. We still keep the Cogito safety, but running "git bisect
start" when another bisect was in effect will clean up and start over.
* "git push" with an explicit PATH to receive-pack did not quite work if
receive-pack was not on usual PATH. We earlier fixed the same issue
with "git fetch" and upload-pack, but somehow forgot to do so in the
other direction.
* git-gui's info dialog was not displayed correctly when the user tries
to commit nothing (i.e. without staging anything).
* "git revert" did not properly fail when attempting to run with a
dirty index.
* "git merge --no-commit --no-ff <other>" incorrectly made commits.
* "git merge --squash --no-ff <other>", which is a nonsense combination
of options, was not rejected.
* "git ls-remote" and "git remote show" against an empty repository
failed, instead of just giving an empty result (regression).
* "git fast-import" did not handle a renamed path whose name needs to be
quoted, due to a bug in unquote_c_style() function.
* "git cvsexportcommit" was confused when multiple files with the same
basename needed to be pushed out in the same commit.
* "git daemon" did not send early errors to syslog.
* "git log --merge" did not work well with --left-right option.
* "git svn" promprted for client cert password every time it accessed the
server.
* The reset command in "git fast-import" data stream was documented to
end with an optional LF, but it actually required one.
* "git svn dcommit/rebase" did not honor --rewrite-root option.
Also included are a handful documentation updates.
configure script. This not only makes our Makefiles more readable, but
also performs various checks that were previously hard-coded, e.g.
whether or not iconv's *char arguments are constified or not. We also
no longer need the huge mess which checks for the asciidoc/xmlto versions
in git-docs/Makefile. Also, misc. makefile fixes/stylistic changes and
removal of Python dependencies. I don't see how they are needed.
Python modules should be installed as seperate ${PKGPKGPREFIX}-scmgit
packages.
This was a somewhat radical change, so please report any problems.
Changes since 1.5.4:
* RPM spec used to pull in everything with 'git'. This has been
changed so that 'git' package contains just the core parts,
and we now supply 'git-all' metapackage to slurp in everything.
This should match end user's expectation better.
* When some refs failed to update, git-push reported "failure"
which was unclear if some other refs were updated or all of
them failed atomically (the answer is the former). Reworded
the message to clarify this.
* "git clone" from a repository whose HEAD was misconfigured
did not set up the remote properly. Now it tries to do
better.
* Updated git-push documentation to clarify what "matching"
means, in order to reduce user confusion.
* Updated git-add documentation to clarify "add -u" operates in
the current subdirectory you are in, just like other commands.
* git-gui updates to work on OSX and Windows better.
* The configuration parser was not prepared to see string
valued variables misspelled as boolean and segfaulted.
* Temporary files left behind due to interrupted object
transfers were not cleaned up with "git prune".
* "git config --unset" was confused when the unset variables
were spelled with continuation lines in the config file.
* The merge message detection in "git cvsimport" did not catch
a message that began with "Merge...".
* "git status" suggests "git rm --cached" for unstaging the
earlier "git add" before the initial commit.
* "git status" output was incorrect during a partial commit.
* "git bisect" refused to start when the HEAD was detached.
* "git bisect" allowed a wildcard character in the commit
message expanded while writing its log file.
* Manual pages were not formatted correctly with docbook xsl
1.72; added a workaround.
* "git-commit -C $tag" used to work but rewrite in C done in
1.5.4 broke it. This was fixed in 1.5.4.1.
* An entry in the .gitattributes file that names a pattern in a
subdirectory of the directory it is in did not match
correctly (e.g. pattern "b/*.c" in "a/.gitattributes" should
match "a/b/foo.c" but it didn't). This was fixed in 1.5.4.1.
* Customized color specification was parsed incorrectly when
numeric color values are used. This was fixed in 1.5.4.1.
* http transport misbehaved when linked with curl-gnutls.
* "git-commit -C $tag" used to work but rewrite in C done in
1.5.4 broke it.
* An entry in the .gitattributes file that names a pattern in a
subdirectory of the directory it is in did not match
correctly (e.g. pattern "b/*.c" in "a/.gitattributes" should
match "a/b/foo.c" but it didn't).
* Customized color specification was parsed incorrectly when
numeric color values are used. This was fixed in 1.5.4.1.
There are quite a few changes and (welcomed) fixes: please see
the release notes in ${WRKSRC}/Documentation/RelNotes-1.5.4.
A small subset of the changes are included here.
Added
-----
* i18n support for gitk.
Removal
-------
* "git svnimport" was removed in favor of "git svn". It is still there
in the source tree (contrib/examples) but unsupported.
* As git-commit and git-status have been rewritten, "git runstatus"
helper script lost all its users and has been removed.
Fixes since v1.5.3 (unique to the 1.5.4 branch)
------------------
These fixes are only in v1.5.4 and not backported to v1.5.3 maintenance
series.
* The way "git diff --check" behaves is much more consistent with the way
"git apply --whitespace=warn" works.
* "git svn" talking with the SVN over HTTP will correctly quote branch
and project names.
* "git config" did not work correctly on platforms that define
REG_NOMATCH to an even number.
* Recent versions of AsciiDoc 8 has a change to break our
documentation; a workaround has been implemented.
* "git diff --color-words" colored context lines in a wrong color.
Also, update to 1.5.3.7.
Fixes since v1.5.3.6
--------------------
* git-send-email added 8-bit contents to the payload without
marking it as 8-bit in a CTE header.
* "git-bundle create a.bndl HEAD" dereferenced the symref and
did not record the ref as 'HEAD'; this prevented a bundle
from being used as a normal source of git-clone.
* The code to reject nonsense command line of the form
"git-commit -a paths..." and "git-commit --interactive
paths..." were broken.
* Adding a signature that is not ASCII-only to an original
commit that is ASCII-only would make the result non-ASCII.
"git-format-patch -s" did not mark such a message correctly
with MIME encoding header.
* git-add sometimes did not mark the resulting index entry
stat-clean. This affected only cases when adding the
contents with the same length as the previously staged
contents, and the previous staging made the index entry
"racily clean".
* git-commit did not honor GIT_INDEX_FILE the user had in the
environment.
* When checking out a revision, git-checkout did not report where the
updated HEAD is if you happened to have a file called HEAD in the
work tree.
* "git-rev-list --objects" mishandled a tree that points at a
submodule.
* "git cvsimport" was not ready for packed refs that "git gc" can
produce and gave incorrect results.
* Many scripted Porcelains were confused when you happened to have a
file called "HEAD" in your work tree.
* Miscellaneous updates to the user manual and documentation.
properly upstream).
Fixes since v1.5.3.5
====================
* git-cvsexportcommit handles root commits better.
* git-svn dcommit used to clobber when sending a series of
patches.
* git-svn dcommit failed after attempting to rebase when
started with a dirty index; now it stops upfront.
* git-grep sometimes refused to work when your index was
unmerged.
* "git-grep -A1 -B2" acted as if it was told to run "git -A1 -B21".
* git-hash-object did not honor configuration variables, such as
core.compression.
* git-index-pack choked on a huge pack on 32-bit machines, even when
large file offsets are supported.
* atom feeds from git-web said "10" for the month of November.
* a memory leak in commit walker was plugged.
* When git-send-email inserted the original author's From:
address in body, it did not mark the message with
Content-type: as needed.
* git-revert and git-cherry-pick incorrectly refused to start
when the work tree was dirty.
* git-clean did not honor core.excludesfile configuration.
* git-add mishandled ".gitignore" files when applying them to
subdirectories.
* While importing a too branchy history, git-fastimport did not
honor delta depth limit properly.
* Support for zlib implementations that lack ZLIB_VERNUM and definition
of deflateBound() has been added.
* Quite a lot of documentation clarifications.
IT v1.5.2.5 Release Notes
==========================
Fixes since v1.5.2.4
--------------------
* Bugfixes
- "git add -u" had a serious data corruption problem in one
special case (when the changes to a subdirectory's files
consist only deletion of files).
- "git add -u <path>" did not work from a subdirectory.
- "git apply" left an empty directory after all its files are
renamed away.
- "git $anycmd foo/bar", when there is a file 'foo' in the
working tree, complained that "git $anycmd foo/bar --" form
should be used to disambiguate between revs and files,
which was completely bogus.
- "git checkout-index" and other commands that checks out
files to the work tree tried unlink(2) on directories,
which is a sane thing to do on sane systems, but not on
Solaris when you are root.
* Documentation Fixes and Updates
- A handful documentation fixes.
GIT v1.5.2.4 Release Notes
==========================
Fixes since v1.5.2.3
--------------------
* Bugfixes
- "git-gui" bugfixes, including a handful fixes to run it
better on Cygwin/MSYS.
- "git checkout" failed to switch back and forth between
branches, one of which has "frotz -> xyzzy" symlink and
file "xyzzy/filfre", while the other one has a file
"frotz/filfre".
- "git prune" used to segfault upon seeing a commit that is
referred to by a tree object (aka "subproject").
- "git diff --name-status --no-index" mishandled an added file.
- "git apply --reverse --whitespace=warn" still complained
about whitespaces that a forward application would have
introduced.
* Documentation Fixes and Updates
- A handful documentation updates.
As part of this, the correct install program is now used, the tar specified
by pkgsrc is used, added a missing tar to tools, stopped hardcoding the
c-compiler, and added a missing wish:run to the tools. Whew!
Here is the very brief list of ...
Updates in v1.5.0 since v1.4.4 series
-------------------------------------
* Index manipulation
* Repository layout and objects transfer
* Bare repositories
* Reflog
* Crufts removal
* Detached HEAD
* Packed refs
* Configuration
* Updated features
* Less external dependency
* I18n
* e-mailed patches
* Foreign SCM interfaces
* User support
* Sliding mmap
* Shallow clones
...
the complete list is in the source package.
Changes from the announce mails:
Subject: [5][ANNOUNCE] GIT 1.4.1.1
The primary purpose of this release is to fix the breakage
people reported while cloning large quantity of data via git
protocol, and the server side incorrectly timing out. I am very
sorry for the breakage.
A big thanks goes to Matthias Lederhofer who fixed the breakage
for us. The fix was cherry-picked from the "master" branch.
Subject: [5][ANNOUNCE] GIT 1.4.2.1
This release is primarily for these two fixes:
* git-mv was broken. Notably, this did not work:
git-mv foo foo-renamed
* git-http-fetch failed to follow objects/info/alternates on
the remote side. This broke a fetch from Paul's powerpc.git
repository.
Subject: [5][ANNOUNCE] GIT 1.4.2.2
This is strictly a bugfix release. While we will soon be in
stabilization slow-down for 1.4.3, one of the bugs this release
contains fixes for actually has bitten people who use the kernel
commits mailing list, so this is to push the fixes out early.
Subject: [5][ANNOUNCE] GIT 1.4.2.3
Sorry to be doing two maintenance releases in rapid succession,
but git-mv breakage causes random tree corruption and is rather
serious.
Subject: [5][ANNOUNCE] GIT 1.4.2.4
We are close to 1.4.3, so this update could become moot very
soon, but just in case we have to delay it, I am pushing this
out for a rather important performance fix. Without it, "git
diff" on 64-bit machines can run 100x times slower than it
should be on unfortunate input.
Many thanks go to Jim Mayering for giving an easy to reproduce
initial problem report, and Linus and Davide Libenzi to quickly
come up with a fix.
Subject: [5][ANNOUNCE] GIT 1.4.2
Changes since v1.4.1.1 are as follows:
A Large Angry SCM:
Additional merge-base tests (revised)
Alex Riesen:
Do not use perl in git-commit.sh
Trivial path optimization test
Alexandre Julliard:
git.el: Run git-rerere on commits if the rr-cache directory exists.
git.el: Prepend a slash to the file name when adding to .gitignore.
git.el: Try to reuse an existing buffer when running git-status.
git.el: Put the git customize group in the 'tools' parent group.
show-branch: Fix another performance problem.
Alp Toker:
Fix some doubled word typos
Fix some doubled word typos
Fix typos involving the word 'commit'
typofix (git-name-rev documentation)
git-send-email: Remove redundant Reply-To header
gitweb: Send XHTML as 'application/xhtml+xml' where possible
gitweb: Include a site name in page titles
gitweb: Make command invocations go through the git wrapper
documentation (urls.txt) typofix
Daniel Drake:
gitweb: escape tag comments
Dennis Stosberg:
gitweb: Declare global variables with "our"
gitweb: Declare global variables with "our"
Eric Wong:
Add git-instaweb, instantly browse the working repo with gitweb
instaweb: fix unportable ';' usage in sed
t8001-annotate: fix a bash-ism in this test
git-svn: avoid fetching files outside of the URL we're tracking
git-svn: migrate out of contrib
builtin-log: respect diff configuration options
diff.c: respect diff.renames config option
templates/hooks--update: replace diffstat calls with git diff --stat
git-svn: fix --file/-F option in commit-diff
tests: Set EDITOR=: and VISUAL=: globally
git-fetch: fix a bashism (==)
git-svn: don't check for migrations/upgrades on commit-diff
typechange tests for git apply (currently failing)
git-svn: fix fetching new directories copies when using SVN:: libs
git-svn: correctly kill keyword expansion without munging EOLs
git-svn: bugfix: allow SVN:: lib users to track the root of the repositor
y
git-svn: split the path from the url correctly with limited perms
Gerrit Pape:
Build on Debian GNU/kFreeBSD
Jakub Narebski:
Allow INSTALL, bindir, mandir to be set in main Makefile
Rename man1 and man7 variables to man1dir and man7dir
autoconf: Use autoconf to write installation directories to config.mak.au
togen
send-email: format 2822 datestring ourselves.
Teach make clean about configure and autoconf
Copy description of build configuration variables to configure.ac
autoconf: Preparing the way for autodetection
autoconf: Checks for typedefs, structures, and compiler characteristics.
autoconf: Checks for some library functions.
autoconf: Checks for libraries
autoconf: Checks for some programs
configure.ac vertical whitespace usage cleanup
Wrap long lines in docstrings in contrib/emacs/git.el
Display help for Git mode after pressing `h' or `?' in *git-status*
Jeff King:
pack-objects: check pack.window for default window size
Colorize 'commit' lines in log ui
git-push: allow -f as an alias for --force
git-push: remove obsolete git-push.sh
Documentation: convert uses of git-link macro to gitlink
git-annotate: remove extraneous debugging line
git-push: allow pushing from subdirectories
Joachim B Haga:
Make zlib compression level configurable, and change default.
Joachim Berdal Haga:
core.compression documentation formatting fix.
Johannes Schindelin:
refactor merge_bases() as preparation to libify merge-base
move get_merge_bases() to core lib.
Makefile: replace ugly and unportable sed invocation
Make git-fmt-merge-msg a builtin
Makefile: export NO_SVN_TESTS
Close the index file between writing and committing
Fix linking for not-so-clever linkers.
Fix t4114 on cygwin
Always reset the color _before_ printing out the newline
cvsserver: suppress warnings
cvsserver: avoid warning about active db handles
Allow an alias to start with "-p"
git wrapper: add --git-dir=<path> and --bare options
git-instaweb: some Apache have mod_cgi builtin
git-instaweb: respect bindir from Makefile
gitweb: fix two warnings
t7001: add test for git-mv dir1 dir2/
git-cvsserver: support multiline commit messages
Extract helper bits from c-merge-recursive work
Make git-mv a builtin
builtin git-mv: support moving directories
instaweb: Be more clear if httpd or the browser fail
cvsserver: imitate git-update-ref when committing
Makefile: ssh-pull.o depends on ssh-fetch.c
Teach git-apply about '-R'
Fix http-fetch
tar-tree: illustrate an obscure feature better
Fix crash when GIT_DIR is invalid
Jonas Fonseca:
Documentation/urls.txt: Use substitution to escape square brackets
Update git-init-db(1) and documentation of core.sharedRepository
Josef Weidendorfer:
Extend testing git-mv for renaming of subdirectories
Josh Triplett:
git-format-patch: Make the second and subsequent mails replies to the fir
st
Add option to enable threading headers
Add option to set initial In-Reply-To/References
Junio C Hamano:
Makefile: add framework to verify and bench sha1 implementations.
test-sha1: test hashing large buffer
t4013: add tests for diff/log family output options.
t4013: add more tests around -c and --cc
Fix some more diff options changes.
t4013 test updates for new output code.
combine-diff.c: type sanity.
format-patch: fix diff format option implementation
t4013: add format-patch tests.
t4013: note improvements brought by the new output code.
gitweb: optimize per-file history generation
gitweb: optimize per-file history generation
t4013: add "diff" UI program tests.
builtin-diff: turn recursive on when defaulting to --patch format.
commit.c: do not redefine UNINTERESTING bit.
get_merge_bases: clean up even when there is no common commit.
revert clear-commit-marks for now.
boolean: accept yes and no as well
send-email: do not barf when Term::ReadLine does not like your terminal
t6200: fmt-merge-msg test.
git-grep: fix parsing of pathspec separator '--'
git-grep: fix exit code when we use external grep.
git-grep: use a bit more specific error messages.
Re-fix clear_commit_marks().
git-grep: boolean expression on pattern matching.
git-reset: complain and exit upon seeing an unknown parameter.
mailinfo: assume input is latin-1 on the header as we do for the body
diffcore-rename: try matching up renames without populating filespec firs
t.
builtin-rev-parse.c: constness tightening
show-branch: match documentation and usage
rev-parse documentation: talk about range notation.
git-svn: migrate out of contrib (follow-up)
diff.c: --no-color to defeat diff.color configuration.
Update diff-options and config documentation.
git log -p --merge [[--] paths...]
colored diff: diff.color = auto fix
diff: do not use configuration magic at the core-level
"git -p cmd" to page anywhere
merge-base: update the clean-up postprocessing
fmt-merge-msg fix
Fix grammatical error in git-revert
git-repack: avoid redirecting stderr into git-pack-objects
test-lib: unset GIT_TRACE
t4013 diff format tests update
Adjust t4013 tests to corrected format-patch.
Documentation: Fix ssh://[user@]host.xz URL
fetch/clone: check return status from ls-remote
builtin-prune.c: forgot TYPE => OBJ changes.
Documentation/Makefile: product depends on asciidoc.conf
builtin-log: typefix for recent format-patch changes.
show-branch: fix performance problem.
checkout -f failed to check out a file if an existing directory interfere
d.
apply: check D/F conflicts more carefully.
apply: split out removal and creation into different phases.
apply: handle type-changing patch correctly.
git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"
git-fetch: fix --keep vs --thin
unpack-objects: remove stale and confusing comment
t4112: simplify the test and remove unneeded working tree file.
lost-found: use fsck-objects --full
git-reset: detect update-ref error and report it.
log and diff family: honor config even from subdirectories
git-apply -R: binary patches are irreversible for now.
t4103: fix binary patch application test.
git-checkout: allow "checkout HEAD -- path"
Builtins: control the use of pager from the command table.
fetch/clone: mark messages from remote side stand out.
Cygwin needs NO_C99_FORMAT???
Fix "git diff blob1 blob2" showing the diff in reverse.
read-tree: shadowed variable fix.
Add a couple of subdirectory tests.
diff.c: do not use pathname comparison to tell renames
Show both blob names from "git diff blob1 blob2"
sideband: do not use color, just say "remote:"
Documentation/git.txt: link git-svn and git-instaweb from the main page.
GIT 1.4.2-rc3
Further clean-up: usage() vs die()
Makefile: Cygwin does not seem to need NO_STRLCPY
Fix "grep -w"
debugging: XMALLOC_POISON
builtin-mv: fix use of uninitialized memory.
GIT-VERSION-GEN: adjust for ancient git
Documentation: git-status takes the same options as git-commit
Fix tutorial-2.html
check return value from diff_setup_done()
find_unique_abbrev() with len=0 should not abbreviate
make --find-copies-harder imply -C
allow diff.renamelimit to be set regardless of -M/-C
git-apply: applying a patch to make a symlink shorter.
combine-diff: use color
Fix git-diff A...B
builtin-apply: remove unused increment
git-sh-setup: do not use repo-config to test the git directory
git-am: give better diagnostics when the patch does not apply during --3w
ay
Better error message when we are unable to lock the index file
t/t4013: fix futzing with the version string.
Linus Torvalds:
xdiff: generate "anti-diffs" aka what is common to two files
Prepare "git-merge-tree" for future work
Improved three-way blob merging code
Improve git-peek-remote
builtin "git prune"
Make the unpacked object header functions static to sha1_file.c
Remove TYPE_* constant macros and use object_type enums consistently.
sha1_file: add the ability to parse objects in "pack file format"
Call setup_git_directory() early
Call setup_git_directory() much earlier
Fix double "close()" in ce_compare_data
Fix up some fallout from "setup_git_directory()" cleanups
Luben Tuikov:
gitweb: Enable tree (directory) history display
gitweb: Enable tree (directory) history display
Add "raw" output option to blobs in "tree" view format
gitweb.cgi: Create $git_temp if it doesn't exist
gitweb.cgi: Teach "a=blob" action to know the blob/file mime type
gitweb.css: Use monospace fonts for commits and tree-diff.
gitweb.cgi: Teach git_history() to read hash from $hash_base
gitweb.cgi: Include direct link to "raw" files from "history"
gitweb.cgi: git_blame2: an alternative simple working git blame
gitweb.cgi: git_blame2: Allow back-trekking through commits
gitweb.cgi: Show "raw" head of project link even when $hash is not define
d
gitweb.cgi: git_blame2: Revision blocks now have alternating colors
gitweb.cgi: Centralize printing of the page path
gitweb.cgi: git_blame2: slight optimization reading the blame lines
Lukas Sandström:
git-am: Don't accept an mbox on stdin of we already have a .dotest direct
ory
Martin Langhoff:
cvsexportcommit - add -a (add author line) flag, cleanup warnings
Matthias Kestenholz:
Make git-prune-packed a builtin
Make git-repo-config a builtin
use declarations from builtin.h for builtin commands
Matthias Lederhofer:
GIT_TRACE: show which built-in/external commands are executed
change ent to tree in git-diff documentation
git-rev-list: add documentation for --parents, --no-merges
daemon: use a custom die routine with syslog
daemon: if one of the standard fds is missing open it to /dev/null
upload-pack: ignore write errors to stderr
daemon: new option --pid-file=<path> to store the pid
daemon: new option --detach to run git-daemon in background
Documentation about exclude/ignore files
argv created by handle_alias should be NULL terminated
upload-pack: fix timeout in create_pack_file
daemon: documentation for --reuseaddr, --detach and --pid-file
setup_git_directory_gently: do not barf when GIT_DIR is given.
git.c: allow alias expansion without a git directory
pager: config variable pager.color
git-grep: document --and, --or, --not, ( and )
Michael:
fixed variable declaration in gitk
Michael Krelin:
handle https:// protocol in git-clone
Michael S. Tsirkin:
mailinfo: accept >From in message header
Michal Rokos:
sed -e '/RE/r rfile/' needs space in 'r rfile'
Using 'perl' in *.sh
Paul Mackerras:
gitk: Allow the user to set some colors
gitk: Show the currently checked-out head in bold font
Pavel Roskin:
Assorted typo fixes
Typofix in Makefile comment.
Typofix in configure.ac comment.
Fix more typos, primarily in the code
Avoid C99 comments, use old-style C comments instead.
Quote all calls to GIT_CONF_APPEND_LINE
Set datarootdir in config.mak.in
Peter Baumann:
git-cvsexportcommit can't handle merge commits correctly
Peter Eriksen:
Substitute xmalloc()+memset(0) with xcalloc().
Petr Baudis:
Remove -d from *-fetch usage strings
Make pull() take some implicit data as explicit arguments
Make pull() support fetching multiple targets at once
Teach git-local-fetch the --stdin switch
Teach git-http-fetch the --stdin switch
Ramsay Jones:
Ensure git-clone exits with error if perl script fails.
Fix annotate test script; notice when git-annotate fails.
Fix installation of templates on ancient systems.
New tests and en-passant modifications to mktag.
Add NO_C99_FORMAT to support older compilers.
Fix header breakage due to redefining PATH_MAX.
Remove cmd_usage() routine and re-organize the help/usage code.
Fix header breakage with _XOPEN_SOURCE.
Fixup command names in some usage strings.
Replace some calls to die(usage_str) with usage(usage_str).
Allow config file to specify Signed-off-by identity in format-patch.
commit walkers: setup_ident() to record correct committer in ref-log.
Rene Scharfe:
Add get_merge_bases_clean()
Add '...' operator for revisions
Make clear_commit_marks() clean harder
Fold get_merge_bases_clean() into get_merge_bases()
rev-list: free commit_list in ... handler
git-tar-tree: fix minor memory leak
Add has_extension()
git-verify-pack: show usage when no pack was specified
git-verify-pack: more careful path handling
git-verify-pack: insist on .idx extension
git-verify-pack: get rid of while loop
git-verify-pack: free pack after use and a cleanup
git-verify-pack: buffer overrun paranoia
git-verify-pack: no need to count errors
drop length argument of has_extension
Robert Shearman:
format-patch: Generate a newline between the subject header and the messa
ge \
body
rebase: Fix the detection of fast-forwarding of the current branch to ups
tream.
rebase: Make the fast-fowarding message more user-friendly by using branc
h \
names instead of SHA1 IDs.
Rutger Nijlunsing:
http-push: Make WebDAV work with (broken?) default apache2 WebDAV module
Add Documentation/howto/setup-git-server-over-http.txt
Ryan Anderson:
annotate: Support annotation of files on other revisions.
annotate: Correct most merge following to annotate correctly.
Disable color detection during format-patch
log-tree: show_log() should respect the setting of diffopt->line_terminat
ion
annotate: Fix bug when parsing merges with differing real and logical par
ents.
Santi Béjar:
Teach rev-parse the ... syntax.
Defaulting fetch to origin when set in the repo-config
Sergey Vlasov:
Fix "git-fetch --tags" exit status when nothing has been changed
Shawn Pearce:
Avoid C99 initializers
Allow user.name and user.email to drive reflog entry.
Record the type of commit operation in the reflog.
Log ref changes made by git-fetch and git-pull.
Log ref changes made by git-merge and git-pull.
Log ref changes made by quiltimport.
Log ref changes made by resolve.
Make lazy mkdir more robust.
Record rebase changes as 'rebase' in the reflog.
Disable linking with Fink or DarwinPorts.
Display an error from update-ref if target ref name is invalid.
Stephan Feder:
Do not drop data from '\0' until eol in patch output
Teach --text option to diff
Teach diff -a as shorthand for --text
Add -a and --text to common diff options help
diff-options: Explain --text and -a
Timo Hirvonen:
Merge with_raw, with_stat and summary variables to output_format
Make --raw option available for all diff commands
Set default diff output format after parsing command line
DIFF_FORMAT_RAW is not default anymore
Add msg_sep to diff_options
Don't xcalloc() struct diffstat_t
whatchanged: Default to DIFF_FORMAT_RAW
Print empty line between raw, stat, summary and patch
diff-tree: Use ---\n as a message separator
log --raw: Don't descend into subdirectories by default
Fix diff-tree -s
GIT_TRACE: fix a mixed declarations and code warning
diff: Support both attributes and colors
diff: Support 256 colors
Unknown:
A better-scheduled PPC SHA-1 implementation.
Uwe Zeisberger:
Document rev-list's option --merge
Ville Skyttä:
Fix print-log and diff compatibility with recent vc versions
Willy Tarreau:
tar-tree: add the "tar.umask" config option
Yakov Lerner:
Mention the [user@] part in documentation of ssh:// urls.
Subject: [5][ANNOUNCE] GIT 1.4.3.1
This is primarily to work around changes in the recent GNU diff output
format. Also it contains irritation fix for "git diff" which now
paginates its output by default.
Subject: [5][ANNOUNCE] GIT 1.4.3.2
This is primarily to fix two rather embarrasing breakage
discovered post 1.4.3.1 release.
- The pager change to default to LESS=FRS exposed problem with less
that switches to alternate screen, shows its output and then switches
back immediately from the alternate screen afterwards -- which means
the user would not have a chance to see _anything_.
- Older upload-pack protocol clients did not pass host= and recent
git-daemon change to support virtual hosting did not handle this
correctly (although it attempted to do so, the check was borked).
Subject: [5][ANNOUNCE] GIT 1.4.3.3
Sorry to be doing three follow-up releases in a row. This is
primarily fix the partitioning of programs in generated RPM. If
you are installing all of git it does not matter, but by mistake
we were placing git-archive into git-arch subpackage, which
meant that you need to install tla only to use git-tar-tree and
git-archive --format=zip.
Thanks for Gerrit for noticing and reporting it, although he is
from Debian camp ;-).
Subject: [5][ANNOUNCE] GIT 1.4.3.4
Among many minor fixes and documentation updates, this contains these
fixes:
- revision traversal now treats --unpacked as commit filter,
not traversal limiter. If you have unpacked commits that are
parents of packed ones which are in turn parents of commits
that are unpacked, running rev-list starting at the latest
unpacked commits used to _stop_ at the first packed commit
and older unpacked commits were not shown. With this update,
the traversal does not stop at packed commits, and shows the
older unpacked commits. The updated semantics is easier to
use with git-repack --unpacked.
- In a repository configured for shared access, if the
permission bits of existing directories are misconfigured
(e.g. running repository commands as root by mistake), a
codepath to create a new object failed with incorrect error
message. Fixed.
- An earlier fix to cope with traditional-style patches that
were generated with --unified=0 broke handling of creation
and deletion diffs in git-apply. Fixed.
Subject: [5][ANNOUNCE] GIT 1.4.3.5
The 'master' front has been very quiet and it will hopefully
soon produce 1.4.4 but in the meantime here is primarily to fix
git-svn correctness issues.
Subject: [6][ANNOUNCE] GIT 1.4.3
User visible changes, other than bugfixes, since v1.4.2.4 are:
- upload-tar is deprecated but not removed; we now have
upload-archive --format=tar and --format=zip instead.
- ftp:// protocol is supported the same way as http:// and
https://
- git-diff paginates its output to the tty by default. If this
irritates you, using LESS=RF might help.
- git-cherry-pick does not leave often useless "cherry-picked
from" message.
- git-merge-recursive was replaced by a rewritten implemention
in C. The original Python implementation is available as
"recursive-old" strategy for now, but hopefully we can remove
it in the next cycle.
- git-daemon can do name based virtual hosting.
- git-daemon can serve tar and zip snapshots.
- many gitweb tweaks and cleanups.
- git-apply --reverse, --reject.
- git-diff --color highlights whitespace errors.
- git-diff --stat can be taught to use non-default widths.
- git-status can use colors.
- many more commands are built-in.
Subject: [5][ANNOUNCE] GIT 1.4.4.1
This contains mostly small post-release fixups.
Subject: [5][ANNOUNCE] GIT 1.4.4
Quite a lot of changes during the last month.
- pack-refs, along with a lot of internal clean-up of the code
that deal with refs, is in. A repository with many tags
would benefit from packing and pruning them. Currently dumb
transports are not capable of fetching from a repository that
has packed and pruned its refs, so please keep that in mind.
Hopefully we will get an update for dumb transports shortly.
- git native transport can now keep transferred packs without
exploding it into loose objects. Also "git repack" can be
told to keep "historical" packs from getting repacked by
marking them with .keep file. Docmentation update is
probably needed.
- git-blame can now detect line movements across files. No, it
is not called git-pickaxe.
- a lot of gitweb and git-svn updates.
GIT is a "directory content manager" designed to handle absolutely massive
projects with speed and efficiency, and the release of the 2.6.12 (and later)
versions of the Linux kernel as well as more and more other projects switching
to it would indicate that it does this task well.
GIT falls in the category of distributed source code management tools, similar
to e.g. GNU Arch or Monotone (or, in the commercial world, BitKeeper). Every
GIT working directory is a full-fledged repository with full revision tracking
capabilities, not dependent on network access to a central server.
Packaged by pancake@phreaker.net.
tonnerre
bjs
joerg
wiz
tnn
rillig
dmcmahill
obache