--- git-core-1.6.3.3.orig/Makefile +++ git-core-1.6.3.3/Makefile @@ -330,6 +330,7 @@ # ... and all the rest that could be moved out of bindir to gitexecdir PROGRAMS += $(EXTRA_PROGRAMS) PROGRAMS += git-fast-import$X +PROGRAMS += git-fetch-pack$X PROGRAMS += git-hash-object$X PROGRAMS += git-index-pack$X PROGRAMS += git-merge-index$X @@ -338,6 +339,7 @@ PROGRAMS += git-mktree$X PROGRAMS += git-pack-redundant$X PROGRAMS += git-patch-id$X +PROGRAMS += git-send-pack$X PROGRAMS += git-shell$X PROGRAMS += git-show-index$X PROGRAMS += git-unpack-file$X --- git-core-1.6.3.3.orig/Documentation/RelNotes-1.6.2.4.txt +++ git-core-1.6.3.3/Documentation/RelNotes-1.6.2.4.txt @@ -7,17 +7,9 @@ * The configuration parser had a buffer overflow while parsing an overlong value. -* pruning reflog entries that are unreachable from the tip of the ref - during "git reflog prune" (hence "git gc") was very inefficient. - -* "git-add -p" lacked a way to say "q"uit to refuse staging any hunks for - the remaining paths. You had to say "d" and then ^C. - * "git-checkout " did not update the index entry at the named path; it now does. -* "git-fast-export" choked when seeing a tag that does not point at commit. - * "git init" segfaulted when given an overlong template location via the --template= option. @@ -35,5 +27,5 @@ --- exec >/var/tmp/1 echo O=$(git describe maint) -O=v1.6.2.3-38-g318b847 +O=v1.6.2.3-21-ga51609a git shortlog --no-merges $O..maint --- git-core-1.6.3.3.orig/Documentation/config.txt +++ git-core-1.6.3.3/Documentation/config.txt @@ -295,10 +295,8 @@ group-shareable. When 'umask' (or 'false'), git will use permissions reported by umask(2). When '0xxx', where '0xxx' is an octal number, files in the repository will have this mode value. '0xxx' will override - user's umask value (whereas the other options will only override - requested parts of the user's umask value). Examples: '0660' will make - the repo read/write-able for the owner and group, but inaccessible to - others (equivalent to 'group' unless umask is e.g. '0022'). '0640' is a + user's umask value, and thus, users with a safe umask (0077) can use + this option. Examples: '0660' is equivalent to 'group'. '0640' is a repository that is group-readable but not group-writable. See linkgit:git-init[1]. False by default. --- git-core-1.6.3.3.orig/Documentation/git-init.txt +++ git-core-1.6.3.3/Documentation/git-init.txt @@ -54,21 +54,15 @@ - 'group' (or 'true'): Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). - This is used to loosen the permissions of an otherwise safe umask(2) value. - Note that the umask still applies to the other permission bits (e.g. if - umask is '0022', using 'group' will not remove read privileges from other - (non-group) users). See '0xxx' for how to exactly specify the repository - permissions. - 'all' (or 'world' or 'everybody'): Same as 'group', but make the repository readable by all users. - - '0xxx': '0xxx' is an octal number and each file will have mode '0xxx'. - '0xxx' will override users' umask(2) value (and not only loosen permissions - as 'group' and 'all' does). '0640' will create a repository which is - group-readable, but not group-writable or accessible to others. '0660' will - create a repo that is readable and writable to the current user and group, - but inaccessible to others. + - '0xxx': '0xxx' is an octal number and each file will have mode '0xxx' + Any option except 'umask' can be set using this option. '0xxx' will + override users umask(2) value, and thus, users with a safe umask (0077) + can use this option. '0640' will create a repository which is group-readable + but not writable. '0660' is equivalent to 'group'. By default, the configuration flag receive.denyNonFastForwards is enabled in shared repositories, so that you cannot force a non fast-forwarding push --- git-core-1.6.3.3.orig/debian/changelog +++ git-core-1.6.3.3/debian/changelog @@ -0,0 +1,1714 @@ +git-core (1:1.6.3.3-2~ppa1) jaunty; urgency=low + + * Backport to jaunty. + + -- Tim Potter Thu, 20 Aug 2009 13:52:59 +1000 + +git-core (1:1.6.3.3-2) unstable; urgency=low + + [ Anders Kaseorg ] + * Fix manpage formatting: set ASCIIDOC_NO_ROFF instead of + DOCBOOK_XSL_173 (based on the instructions in Documentation/Makefile) + and don’t override the internal Makefile variable ASCIIDOC_EXTRA + (closes: #530693, #521954, #533320). + + [ Gerrit Pape ] + * debian/control: Standards-Version: 3.8.2.0. + + -- Gerrit Pape Mon, 29 Jun 2009 00:06:59 +0000 + +git-core (1:1.6.3.3-1) unstable; urgency=high + + * new upstream point release. + * daemon: Strictly parse the "extra arg" part of the command + (closes: #532935; CVE-2009-2108). + * debian/rules: add NO_CROSS_DIRECTORY_HARDLINKS=1 to OPTS. + * debian/diff/0006-bug-520116-Makefile-do-not-install-cross...diff: + remove; obsolete. + + -- Gerrit Pape Tue, 23 Jun 2009 08:49:17 +0000 + +git-core (1:1.6.3.1-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Thu, 14 May 2009 21:35:01 +0000 + +git-core (1:1.6.3-1) unstable; urgency=low + + * new upstream release. + * merge branch debian-experimental. + + -- Gerrit Pape Fri, 08 May 2009 07:57:39 +0000 + +git-core (1:1.6.3~rc3-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Wed, 29 Apr 2009 21:58:10 +0000 + +git-core (1:1.6.3~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + + -- Gerrit Pape Mon, 20 Apr 2009 21:44:09 +0000 + +git-core (1:1.6.2.4-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Mon, 20 Apr 2009 20:22:02 +0000 + +git-core (1:1.6.3~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + + -- Gerrit Pape Tue, 14 Apr 2009 23:06:38 +0000 + +git-core (1:1.6.2.3-1) unstable; urgency=low + + * new upstream point release. + * debian/control: Standards-Version: 3.8.1.0. + * debian/control: change subversion to Subversion in description. + * debian/control: Section: vcs (except for git-doc). + + -- Gerrit Pape Tue, 14 Apr 2009 22:46:43 +0000 + +git-core (1:1.6.2.2-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0006-bug-520116-Makefile-do-not-install-cross...diff: + new; Makefile: do not install cross-directory hardlink (thx Jonathan + Nieder, closes: #520116). + * debian/git-daemon/run: run /usr/lib/git-core/git-daemon instead of + 'git daemon' (closes: #522348). + * debian/git-daemon-run.postinst: on upgrade from >> 1:1.6.0, fixup + #522348. + * debian/git-core.emacsen-startup: remove the line + '(add-to-list 'vc-handled-backends 'git)' (closes: #519728). + + -- Gerrit Pape Sun, 05 Apr 2009 20:49:25 +0000 + +git-core (1:1.6.2.1-1) unstable; urgency=low + + * new upstream point release. + * debian/git-core.emacsen-startup: no longer refer to vc-git.el + (closes: #519728). + + -- Gerrit Pape Mon, 16 Mar 2009 22:18:05 +0000 + +git-core (1:1.6.2-1) unstable; urgency=medium + + * new upstream release. + * merge branch debian-experimental. + * debian/diff/0006-Install-builtins-with-the-user-and-group-of...diff, + debian/diff/0007-git-quiltimport-preserve-standard-input-to...diff: + remove; applied upstream. + + -- Gerrit Pape Wed, 04 Mar 2009 22:44:43 +0000 + +git-core (1:1.6.2~rc2-1) experimental; urgency=low + + * merge branch debian-sid. + * new upstream release candidate. + + -- Gerrit Pape Thu, 26 Feb 2009 22:15:13 +0000 + +git-core (1:1.6.1.3-2) unstable; urgency=high + + * debian/diff/0006-Install-builtins-with-the-user-and-group-of...diff: + new from upstream git: Install builtins with the user and group of + the installing personality. + * debian/diff/0007-git-quiltimport-preserve-standard-input-to...diff: + new from upstream git: git-quiltimport: preserve standard input to + be able to read user input (closes: #515910). + + -- Gerrit Pape Thu, 26 Feb 2009 22:01:37 +0000 + +git-core (1:1.6.2~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * debian/git-core.docs, debian/git-doc.docs, debian/rules: move + Documentation/RelNotes* from git-doc to the git-core package + (closes: #514866). + + -- Gerrit Pape Tue, 17 Feb 2009 20:20:03 +0000 + +git-core (1:1.6.2~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + + -- Gerrit Pape Tue, 10 Feb 2009 00:06:02 +0000 + +git-core (1:1.6.1.3-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Mon, 09 Feb 2009 21:31:39 +0000 + +git-core (1:1.6.1.2-1) experimental; urgency=low + + * new upstream release. + * don't fail to clone over http if connection is rate limited + (closes: #512795). + * git svn info no longer fails (closes: #499243). + * debian/rules: ASCIIDOC_EXTRA='-a asciidoc7compatible -a docbook-xsl-172' + and DOCBOOK_XSL_173=Yes when building documentation (thx Niko Tyni + for the patch, closes: #497883). + * merge branch debian-lenny. + * debian/diff/0005-gitweb-do-not-run-git-diff-that-is-Porcelain.diff: + remove; fixed upstream. + + -- Gerrit Pape Mon, 02 Feb 2009 23:26:45 +0000 + +git-core (1:1.5.6.5-3) unstable; urgency=high + + * debian/rules: no longer install symlink /etc/init.d/git-daemon -> + /usr/bin/sv (closes: #511687). + * debian/git-daemon-run.README.Debian: document how to create the + symlink manually to have an LSB compatible /etc/init.d/git-daemon + interface to control the service. + + -- Gerrit Pape Mon, 02 Feb 2009 20:56:15 +0000 + +git-core (1:1.6.0.6-1) experimental; urgency=low + + * debian/control: git-email: Recommends: libnet-smtp-ssl-perl, + libauthen-sasl-perl (thx Kees Cook, closes: #505636). + * debian/diff/0005-bug-506445-hooks-post-receive-email-set-...diff: + new; hooks/post-receive-email: set encoding to utf-8 (thx Alexander + Gerasiov, closes: #506445). + * new upstream point release (closes: #504641). + * gitweb: do not run "git diff" that is Porcelain. + + -- Gerrit Pape Sat, 20 Dec 2008 11:03:49 +0000 + +git-core (1:1.5.6.5-2) unstable; urgency=high + + * debian/diff/0005-gitweb-do-not-run-git-diff-that-is-Porcelain.diff: + new; fix possible gitweb vulnerability: calling "git diff": Jakub + says that legacy-style URI to view two blob differences are never + generated since 1.4.3. This codepath runs "git diff" Porcelain from + the gitweb, which is a no-no. It can trigger diff.external command + that is specified in the configuration file of the repository being + viewed. + + -- Gerrit Pape Wed, 17 Dec 2008 09:27:01 +0000 + +git-core (1:1.6.0.4-1) experimental; urgency=low + + * new upstream point release. + * debian/control: git-email: minor update to the long description + (thx Gerfried Fuchs, closes: #501559). + * debian/rules: TCLTK_PATH=/usr/bin/wish instead of wish8.5 in OPTS. + * debian/control: git-gui, gitk: Depends: tk (>= 8.4) instead of + tk8.5 (thx Adeodato Simó, closes: #503113). + * debian/rules: move the /usr/bin/git-cvsserver program into the + git-cvs package. + + -- Gerrit Pape Tue, 11 Nov 2008 22:36:05 +0000 + +git-core (1:1.6.0.3-1) experimental; urgency=low + + * debian/control: minor update to long descriptions (thx Reuben + Thomas, closes: #499065). + * debian/git-core.emacsen-startup: new; emacsen-startup configuration + file (thx Jari Aalto, closes: #472197). + * debian/rules: install emacsen-startup configuration file into the + git-core package (thx Eddy Mulyono, closes: #446027). + * new upstream point release. + * debian/git-core.conffiles: add /etc/emacs/site-start.d/50git-core.el + + -- Gerrit Pape Tue, 04 Nov 2008 20:26:56 +0000 + +git-core (1:1.6.0.2-1) experimental; urgency=low + + * new upstream point release. + * debian/git-core.NEWS.Debian: new; mention that most of the programs + now are installed outside the default $PATH; the "git-xyzzy" form + in scripts and on the command line is no longer supported in 1.6.0. + * debian/git-core.README.Debian: fix paths in config example (thx + Michael Biebl for the patch, closes: #498741). + * debian/git-core.README.Debian: typo (thx Vincent Bernat for the + patch, closes: #496834). + + -- Gerrit Pape Wed, 24 Sep 2008 20:55:26 +0000 + +git-core (1:1.6.0.1-1) experimental; urgency=low + + * new upstream point release (closes: #496155). + * merge branch debian-sid. + + -- Gerrit Pape Wed, 27 Aug 2008 07:53:36 +0000 + +git-core (1:1.6.0-1) experimental; urgency=low + + * new upstream release. + * svnimport: newer libsvn wants us to ask for the root with "", + not "/" (closes: #492522, #490400). + * Keep some git-* programs in $(bindir); Move all dashed-form + commands to libexecdir (closes: #461212). + * bash: Add more option completions for 'git log' (closes: + #490220). + * Fix buffer overflow in prepare_attr_stack; Fix buffer overflow + in git diff; Fix buffer overflow in git-grep (closes: #494097). + * 0002-bug-438793-git-sh-setup.sh-builtin-tag.c-fallback.diff: redo + as 0002-bug-438793-494505-fallback-to-editor-not-vi.diff (thx + Jonathan Nieder for the patch, closes: #494505). + * debian/rules: add gitexecdir=/usr/lib/git-core to OPTS; adapt + several paths (thx Jonathan Nieder for a patch, closes: #480396). + * debian/gitweb.NEWS.Debian: new; talk about files moved from + /var/www/ to /usr/share/gitweb/ (see #479479; closes: #494467). + * debian/git-daemon/run: run git daemon instead of git-daemon + (dash-less form). + * debian/git-daemon-run.postinst: add gitdaemon system user. + * debian/git-daemon/run: utilize chpst to run git daemon as user + gitdaemon (thx Daniel Kahn Gillmor, closes: #494991). + + -- Gerrit Pape Sun, 24 Aug 2008 22:31:44 +0000 + +git-core (1:1.5.6.5-1) unstable; urgency=high + + * new upstream point release. + * Fix buffer overflow in prepare_attr_stack; Fix buffer overflow + in git diff; Fix buffer overflow in git-grep (CVE-2008-3546; + closes: #494097). + * debian/diff/0005-bug-494097-CVE-2008-3546.diff: remove; obsolete. + + -- Gerrit Pape Sun, 24 Aug 2008 19:22:02 +0000 + +git-core (1:1.5.6.3-1.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix various stack-based buffer overflows when processing overly long + repository pathnames which can be exploited to execute arbitrary code if + a victim is tricked into using git-grep or git-diff on a crafted + repository (CVE-2008-3546; Closes: #494097). + + -- Nico Golde Sat, 09 Aug 2008 13:53:13 +0200 + +git-core (1:1.5.6.3-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0005-git-svn.perl-workaround-assertions-in-svn...diff: + remove; applied upstream (opens: #490400). + * debian/control: Standards-Version: 3.8.0.1. + + -- Gerrit Pape Thu, 17 Jul 2008 07:40:08 +0000 + +git-core (1:1.5.6.2-1) unstable; urgency=low + + * new upstream point release (closes: #489431). + * debian/copyright: apply patch from Ansgar Burchardt: adopt proposed + machine-readable format; clarify some license information (thx, + closes: #488351). + * debian/rules: package gitweb: install gitweb.css, git-favicon.png, + git-logo.png into /usr/share/gitweb/ instead of /var/www/ (closes: + #479479). + * debian/control: package git-arch: no longer Suggests: bazaar + (closes: #486726). + * debian/diff/0005-git-svn.perl-workaround-assertions-in-svn...diff: + new; git-svn.perl: workaround assertions in svn library 1.5.0 + (closes: #489108). + + -- Gerrit Pape Sun, 06 Jul 2008 18:35:27 +0000 + +git-core (1:1.5.6-1) unstable; urgency=low + + * new upstream release. + * merge branch debian-experimental. + + -- Gerrit Pape Thu, 19 Jun 2008 07:38:31 +0000 + +git-core (1:1.5.6~rc3-1) experimental; urgency=low + + * debian/git-daemon-run.postrm: remove log files on purge. + * new upstream release candidate. + * debian/control: package git-core: no longer Depends: cpio, no + longer Recommends: curl. + + -- Gerrit Pape Sun, 15 Jun 2008 11:14:49 +0000 + +git-core (1:1.5.6~rc2-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + * debian/rules: do not build manpages twice (thx Jonathan Nieder). + + -- Gerrit Pape Mon, 09 Jun 2008 12:02:43 +0000 + +git-core (1:1.5.5.4-1) unstable; urgency=low + + * new upstream point release. + * debian/rules: enable DOCBOOK_XSL_172 build variable, fixing man page + breakage (thx Jonathan Nieder, closes: #476634). + * debian/control: Build-Depends: docbook-xsl (>> 1.72) (thx Jonathan + Nieder). + + -- Gerrit Pape Mon, 09 Jun 2008 11:51:19 +0000 + +git-core (1:1.5.6~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * git-svn fails in prop_walk if $self->{path} is not empty (closes: + 477393). + * gitweb: Fix "next" link on bottom of page (closes: #481902). + * merge branch debian-sid. + * debian/rules: add THREADED_DELTA_SEARCH=1 to OPTS (closes: #483534). + + -- Gerrit Pape Thu, 05 Jun 2008 10:14:14 +0000 + +git-core (1:1.5.5.3-1) unstable; urgency=low + + * new upstream point release. + * commit --interactive: properly update the index before commiting + (closes: #480429). + * debian/diff/0005-git-bisect.sh-don-t-accidentally-override...diff: + remove; applied upstream. + * debian/diff/0005-bug-477337-git-svn.perl-fallback-to-pager...diff: + new; git-svn.perl: fallback to 'pager' not 'less' if PAGER is unset + (closes: #477337). + + -- Gerrit Pape Wed, 28 May 2008 19:32:57 +0000 + +git-core (1:1.5.6~rc0-1) experimental; urgency=low + + * merge branch debian-sid. + * new upstream release candidate. + * debian/diff/0004-gitweb-fallback-to-system-wide-config-file...diff: + remove; fixed upstream. + * debian/diff/0005-git-bisect.sh-don-t-accidentally-override...diff: + remove; applied upstream. + + -- Gerrit Pape Mon, 26 May 2008 16:53:38 +0000 + +git-core (1:1.5.5.2-1) unstable; urgency=low + + * new upstream point release. + * diff-options.txt: document the new "--dirstat" option (closes: + #476437). + * debian/diff/0005-git-bisect.sh-don-t-accidentally-override...diff: + new: git-bisect.sh: don't accidentally override existing branch + "bisect" (closes: #478647). + + -- Gerrit Pape Mon, 26 May 2008 16:41:45 +0000 + +git-core (1:1.5.5.1-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Mon, 21 Apr 2008 18:24:34 +0000 + +git-core (1:1.5.5-1) unstable; urgency=low + + * new upstream release. + * gitk: Fix changing colors through Edit->Preferences (closes: #472615). + * Revert "gitweb: Add 'status_str' to parse_difftree_raw_line output" + (closes: #469083). + * merge branch debian/experimental. + + -- Gerrit Pape Tue, 08 Apr 2008 20:26:25 +0000 + +git-core (1:1.5.5~rc3-2) experimental; urgency=low + + * debian/diff/0004-gitweb-fallback-to-system-wide-config-file-if-defaul.diff: + amend: properly apply GITWEB_CONFIG_SYSTEM to gitweb.cgi. + + -- Gerrit Pape Fri, 04 Apr 2008 20:40:48 +0000 + +git-core (1:1.5.5~rc3-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0004-gitweb-fallback-to-system-wide-config-file-if-defaul.diff: + new: gitweb: fallback to system-wide config file if default config does + not exist (closes: #450592). + * debian/rules: remove GITWEB_CONFIG=/etc/gitweb.conf from OPTS. + + -- Gerrit Pape Thu, 03 Apr 2008 19:43:33 +0000 + +git-core (1:1.5.5~rc2-1) experimental; urgency=low + + * new upstream release candidate. + * t9600-cvsimport.sh: set HOME before checking for cvsps availability + (closes: #471969). + * imap-send: properly error out if imap.host is not set in config + (closes: #472632). + * merge branch debian-sid. + + -- Gerrit Pape Fri, 28 Mar 2008 08:53:30 +0000 + +git-core (1:1.5.4.5-1) unstable; urgency=low + + * new upstream point release (closes: #473071). + + -- Gerrit Pape Fri, 28 Mar 2008 08:26:39 +0000 + +git-core (1:1.5.5~rc1-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Sun, 23 Mar 2008 11:55:21 +0000 + +git-core (1:1.5.5~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * git-pull documentation: warn about the option order (closes: #463853). + * hash-object: cleanup handling of command line options (closes: + #464432). + * debian/diff/0004-gitk-properly-deal-with-tag-names-containing-sl.diff: + remove; applied upstream. + + -- Gerrit Pape Wed, 19 Mar 2008 07:45:01 +0000 + +git-core (1:1.5.4.4-1) unstable; urgency=low + + * new upstream point release. + * templates/Makefile: don't depend on local umask setting (closes: + #467518). + * Fix random crashes in http_cleanup() (closes: #468836). + * send-email: fix In-Reply-To regression (closes: #468153). + * git-merge.sh: better handling of combined --squash,--no-ff,--no-commit + options (closes: #468568). + + -- Gerrit Pape Mon, 10 Mar 2008 10:38:51 +0000 + +git-core (1:1.5.4.3-1) unstable; urgency=low + + * new upstream point release. + * git-clone.sh: properly configure remote even if remote's head is + dangling (closes: #466581). + * debian/diff/0004-gitk-properly-deal-with-tag-names-containing-sl.diff: + new: from upstream master: gitk: properly deal with tag names containing / + (slash) (closes: #464104). + * debian/git-daemon-run.postrm: adapt paths in /var/. + + -- Gerrit Pape Sun, 24 Feb 2008 16:19:02 +0000 + +git-core (1:1.5.4.2-2) unstable; urgency=low + + * debian/rules: git-daemon-run: no longer include symlinks for ./supervise/ + subdirectories, update-service now takes care of this. + * debian/git-daemon-run.postinst: remove ad re-add git-daemon service on + upgrade from <= 1.5.4.2-1. + + -- Gerrit Pape Mon, 18 Feb 2008 22:22:14 +0000 + +git-core (1:1.5.4.2-1) unstable; urgency=low + + * new upstream point release. + * cvsimport: have default merge regex also match beginning of commit + message (thx Frédéric Brière, closes: #463468). + * builtin-commit: remove .git/SQUASH_MSG upon successful commit (closes: + #464656). + * debian/rules: change TCLTK_PATH to /usr/bin/wish8.5 in OPTS. + * debian/control: Build-Depends: tcl8.5; git-gui, gitk: Depends: tk8.5 + (closes: #456423). + * debian/git-daemon-run.postinst, debian/git-daemon-run.postrm, + debian/git-daemon-run.prerm: use runit's update-service program to + add/remove the git daemon service, instead of dealing with symlinks in + /var/service/ directly. + * debian/control: package git-daemon: Depends: runit (>= 1.8.0-2) (1st + version that provides the update-service program). + + -- Gerrit Pape Sun, 17 Feb 2008 18:48:00 +0000 + +git-core (1:1.5.4.1-1) unstable; urgency=medium + + * debian/control: Build-Depends: cvsps (for selftests, thx Marco Rodrigues, + closes: #463896). + * new upstream point release. + + -- Gerrit Pape Mon, 11 Feb 2008 12:00:03 +0000 + +git-core (1:1.5.4-1) unstable; urgency=low + + * merge branch debian-experimental. + * new upstream release. + * debian/git-core.README.Debian: add Alias'es for git-favicon.png and + git-logo.png to the VirtualHost example (thx Frederic Briere, closes: + #463732). + * debian/rules: target build-arch-stamp: re-run selftests with --verbose + on test failures. + + -- Gerrit Pape Sun, 03 Feb 2008 05:01:16 +0000 + +git-core (1:1.5.4~rc5-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Mon, 28 Jan 2008 11:01:08 +0000 + +git-core (1:1.5.4~rc4-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0003-bug-448655-check-etc-mailname-if-author-email-is-un.diff: + adapt; don't warn if /etc/mailname does not exist (closes: #461844). + * debian/rules: install /usr/share/gitk/ into the gitk package, not + git-core. + + -- Gerrit Pape Mon, 21 Jan 2008 21:15:21 +0000 + +git-core (1:1.5.4~rc3-1) experimental; urgency=low + + * merge branch debian-sid. + * new upstream release candidate. + * "git pull --tags": error out with a better message (closes: #456035). + * gitk: use user-configured background in view definition dialog + (closes: #457124). + * debian/control: Build-Depends: cvs, libdbd-sqlite3-perl (for selftests). + + -- Gerrit Pape Sat, 12 Jan 2008 15:09:23 +0000 + +git-core (1:1.5.3.8-1) unstable; urgency=low + + * debian/control: for all packages: Suggests: git-doc instead of + Recommends: (thx Andrew Moise, closes: #455369). + * debian/control: add Vcs-Git: http://smarden.org/git/git.git/. + * new upstream point release. + + -- Gerrit Pape Tue, 08 Jan 2008 21:01:35 +0000 + +git-core (1:1.5.4~rc2-1) experimental; urgency=low + + * new upstream release candidate. + * shortlog manpage documentation: work around asciidoc markup issues + (closes: #447911). + * Fix $EDITOR regression introduced by rewrite in C (closes: #446845). + + -- Gerrit Pape Thu, 27 Dec 2007 08:45:01 +0000 + +git-core (1:1.5.4~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * gitweb: Teach "a=blob" action to be more lenient about blob/file mime + type (closes: #435610). + + -- Gerrit Pape Thu, 20 Dec 2007 09:07:10 +0000 + +git-core (1:1.5.4~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * build with correct version information (on amd64, closes: #454935, + #454408). + * git-reset: add -q option to operate quietly (closes: #444933). + * gitk: disable colours when calling git log (closes: #454420). + * "git svnimport" was removed in favor of "git svn" (closes: #436930, + #447325, #447965, #451037). + * git-commit: allow grouping of short options (closes: #407241). + * debian/diff/0004-contrib-hooks-post-receive-email-make-subject-prefix.diff, + debian/diff/0005-Don-t-cache-DESTDIR-in-perl-perl.mak.diff: remove; + applied upstream. + * debian/rules: install git-gui's lib/ directory plus subdirectory + properly. + * debian/control: Build-Depends: gettext. + + -- Gerrit Pape Thu, 13 Dec 2007 14:08:45 +0000 + +git-core (1:1.5.3.7-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0005-Don-t-cache-DESTDIR-in-perl-perl.mak.diff: new; don't + cache DESTDIR in perl/perl.mak (#452077). + * debian/rules: remove $(MAKE) -C perl clean to remove the perl/perl.mak + again, this is now handled through debian/diff/0005 (thx Pierre + Habouzit, #452077). + + -- Gerrit Pape Mon, 3 Dec 2007 10:17:11 +0000 + +git-core (1:1.5.3.6-1.1) unstable; urgency=low + + * Non-maintainer upload: Gerrit is currently changing home, and this bug is + preventing people from installing git, I took the initiative to fix it + before his return. + * debian/rules: force a $(MAKE) -C perl clean to remove the perl/perl.mak + that remembers our DESTDIR and makes perl modules be installed in + debian/git-core/ in the install-indep target again + (closes: #452077, #452078, #452080, #452111, #452324). + + -- Pierre Habouzit Thu, 22 Nov 2007 00:40:08 +0100 + +git-core (1:1.5.3.6-1) unstable; urgency=low + + * debian/implicit: add proper dependencies to support 'parallel build' + through make -j (thx Daniel Schepler for the patch). + * debian/rules: support 'nocheck' in DEB_BUILD_OPTIONS to skip running + the selftests. + * debian/diff/0003-bug-448655-check-etc-mailname-if-author-email-is-un.diff: + new; check /etc/mailname if author email is unknown (closes: #448655). + * debian/gitweb.docs: new; install gitweb/README. + * new upstream point release. + * git-cvsimport: really convert underscores in branch names to dots with + -u (closes: #446495). + * git-mailsplit: with maildirs not only process cur/, but also new/ + (closes: #447396). + * debian/diff/0004-contrib-hooks-post-receive-email-make-subject-prefix.diff: + new; cherry-pick'ed from master: contrib/hooks/post-receive-email: make + subject prefix configurable (closes: #428418). + + -- Gerrit Pape Mon, 19 Nov 2007 12:32:11 +0000 + +git-core (1:1.5.3.5-1) unstable; urgency=low + + * new upstream point release. + * git-config: handle --file option with relative pathname properly; + git-config: print error message if the config file cannot be read; + git-config: don't silently ignore options after --list (closes: + #445208). + + -- Gerrit Pape Thu, 01 Nov 2007 08:35:46 +0000 + +git-core (1:1.5.3.4-1) unstable; urgency=low + + * new upstream point release (closes: #445188). + + -- Gerrit Pape Thu, 04 Oct 2007 08:27:01 +0000 + +git-core (1:1.5.3.3-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Sun, 30 Sep 2007 09:25:06 +0000 + +git-core (1:1.5.3.2-1) unstable; urgency=low + + * new upstream point release. + * git-svn: fix "Malformed network data" with svn:// servers (closes: + #430091, #436142). + * git-commit: Allow partial commit of file removal (closes: #437817). + * git-gui: lib/index.tcl: handle files with % in the filename properly + (closes: #441167). + * git-clone: improve error message if curl program is missing or not + executable (closes: #440976). + * debian/git-daemon-run.postinst: use 'sv -v term git-daemon' instead of + 'sv restart git-daemon' to restart git-daemon service if it was running. + * debian/control: git-core: no longer Suggests: cogito, which was removed. + * debian/diff/genindex.diff: apply and remove. + * debian/gitweb.conf: comment out $home_link, and set to gitweb.cgi's + default (thx Ansgar Burchardt for the patch, closes: 441694). + + -- Gerrit Pape Thu, 20 Sep 2007 07:28:41 +0000 + +git-core (1:1.5.3.1-1) unstable; urgency=low + + * new upstream point release. + * debian/control: git-daemon-run: improve long description (closes: + #440699). + * debian/git-daemon-run.README.Debian: improve. + * debian/control: git-svn: improve long description. + * debian/control: git-cvs: improve long description. + * debian/control: git-core: improve long description (closes: #412560). + + -- Gerrit Pape Tue, 04 Sep 2007 18:18:33 +0000 + +git-core (1:1.5.3-1) unstable; urgency=low + + * merge branch debian-experimental. + * new upstream release. + * debian/control: git-email: move libemail-valid-perl from Depends: to + Recommends: (thx Uwe Kleine-Koenig, closes: #439902). + * debian/control: git-email: no longer Depends: libmail-sendmail-perl (thx + Uwe Kleine-Koenig). + + -- Gerrit Pape Sun, 02 Sep 2007 16:41:54 +0000 + +git-core (1:1.5.3~rc7-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0002-git-merge-do-up-to-date-check-also-for-all-strategie.diff: + remove; included upstream. + + -- Gerrit Pape Wed, 29 Aug 2007 12:22:16 +0000 + +git-core (1:1.5.3~rc6-1) experimental; urgency=low + + * new upstream release candidate. + * git-am: initialize variable $resume on startup (closes: #435807). + * debian/diff/0002-git-merge-do-up-to-date-check-also-for-all-strategie.diff: + new; http://article.gmane.org/gmane.comp.version-control.git/55981. + * debian/diff/0003-git-sh-setup.sh-fallback-to-editor-not-vi-if-VI.diff: + new; git-sh-setup.sh: fallback to 'editor' not 'vi' if $VISUAL and $EDITOR + are unset (thx Mike Hommey, closes: #438793). + * merge branch debian-sid. + + -- Gerrit Pape Sun, 26 Aug 2007 09:54:16 +0000 + +git-core (1:1.5.2.5-2) unstable; urgency=low + + * debian/git-core.conffiles: new; add /etc/bash_completion.d/git. + + -- Gerrit Pape Sun, 26 Aug 2007 09:49:39 +0000 + +git-core (1:1.5.2.5-1) unstable; urgency=low + + * debian/control: fix typo in Build-Depends: libcurl4-gnutls-dev | + libcurl3-gnutls-dev (thx Mikael Eriksson, closes: #433196). + * new upstream point release. + * debian/rules: add TCLTK_PATH=/usr/bin/wish8.4 to OPTS (closes: #438662). + * dbian/control: git-core: Depends: cpio (closes: #438057). + * debian/git-core.README.Debian: fix typos (closes: #438932). + * debian/versions.upstream, debian/changelog.upstream: adapt. + * debian/rules, debian/control: install git-completion.bash from contrib as + /etc/bash_completion.d/git; git-core: Conflicts:, Provides:, Replaces: + git-completion (closes: #437532, thx Sebastian Harl). + + -- Gerrit Pape Sat, 25 Aug 2007 17:56:20 +0000 + +git-core (1:1.5.3~rc4-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Sat, 04 Aug 2007 13:02:05 +0000 + +git-core (1:1.5.3~rc3-1) experimental; urgency=low + + * new upstream release candidate. + * debian/versions.upstream, debian/changelog.upstream: adapt. + + -- Gerrit Pape Fri, 27 Jul 2007 11:13:52 +0000 + +git-core (1:1.5.3~rc2-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/????-Pack-objects-properly-initialize-the-depth-value.diff: + remove; obsolete. + * debian/control, debian/rules: remove git-p4 package again, moved into + contrib/ upstream; see /usr/share/doc/git-core/contrib/p4import/. + * debian/versions.upstream, debian/changelog.upstream: adapt. + + -- Gerrit Pape Fri, 20 Jul 2007 08:47:45 +0000 + +git-core (1:1.5.3~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * git-commit: don't add multiple Signed-off-by: from the same identity + (closes: #430851). + * Fix core.sharedRepository = 2 (closes: #432698). + * merge branch debian-sid. + * debian/versions.upstream, debian/changelog.upstream: adapt. + * debian/diff/0002-gitk-properly-resolve-ambiguity-if-argument-is-both.diff: + remove; doesn't apply anymore. + * debian/diff/0002-Pack-objects-properly-initialize-the-depth-value.diff: + new; on upstream advice. + + -- Gerrit Pape Sat, 14 Jul 2007 11:45:27 +0000 + +git-core (1:1.5.2.4-1) unstable; urgency=low + + * new upstream point release. + * debian/rules: build documentation with ASCIIDOC8=YesPlease (closes: + #432560). + * debian/control: Build-Depends: asciidoc (>> 8.0.0). + * debian/diff/????-git-gui-properly-popup-error-if-gitk-should-be-start.diff: + remove; merged upstream. + * debian/control: Build-Depends: libcurl4-gnutls-dev | libcurl3-gnutsl-dev + (closes: #432812). + * debian/versions.upstream, debian/changelog.upstream: adapt. + + -- Gerrit Pape Fri, 13 Jul 2007 19:13:38 +0000 + +git-core (1:1.5.3~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * debian/changelog.upstream.sh: run git shortlog with option --no-merges. + * debian/versions.upstream, debian/changelog.upstream: update. + * debian/diff/0003-git-svn-trailing-slash-in-prefix-is-mandatory-with.diff, + debian/diff/0004-git-cvsimport-force-checkout-of-working-tree-after-i.diff: + remove; applied upstream. + * debian/diff/00*.diff: adapt. + * debian/rules: put git-gui, git-citool man pages into package git-gui. + + -- Gerrit Pape Tue, 03 Jul 2007 10:01:12 +0000 + +git-core (1:1.5.2.3-1) unstable; urgency=low + + * new upstream point release. + * debian/control: package git-gui: Replaces: git-core (<< 1:1.5.2.2-3) + (thx Frank Lichtenheld, closes: #431481). + * debian/versions.upstream, debian/changelog.upstream: update. + + -- Gerrit Pape Tue, 03 Jul 2007 08:26:11 +0000 + +git-core (1:1.5.2.2-3) unstable; urgency=low + + * debian/rules: move /usr/share/git-gui/ from git-core package into + git-gui package (thx Ansgar Burchardt, closes: #430530). + * debian/diff/0004-git-cvsimport-force-checkout-of-working-tree-after-i.diff: + new; git-cvsimport: force checkout of working tree after initial import + (closes: #430903). + * debian/diff/0005-git-gui-properly-popup-error-if-gitk-should-be-start.diff: + new; git-gui: properly popup error if gitk should be started but is not + installed (#429810). + * debian/control: git-gui: Recommends: gitk (closes: #429810). + * debian/rules: workaround #427907: compile with -O0 instead of -O2 on hppa + (#429389). + + -- Gerrit Pape Fri, 29 Jun 2007 12:54:39 +0000 + +git-core (1:1.5.2.2-2) unstable; urgency=low + + * debian/control: all Architecture: all packages: Depends: git-core (>> + ${source:Upstream-Version}, git-core (<< ${source:Upstream-Version}-.) + instead of (= ${source:Version}) to support binNMUs (closes: #423041, + #430128). + + -- Gerrit Pape Sat, 23 Jun 2007 14:02:36 +0000 + +git-core (1:1.5.2.2-1) unstable; urgency=low + + * new upstream point release. + * Fix typo in remote branch example in git user manual (closes: #427502). + * debian/diff/0003-git-branch-track-fix-tracking-branch-computation.diff: + remove; applied upstream. + * debian/versions.upstream: new; ordered list of upstream versions, + starting with 1.0.0. + * debian/changelog.upstream.sh: new; create changelog.upstream from git + shortlog using debian/versions.upstream. + * debian/changelog.upstream: re-created through changelog.upstream.sh. + * debian/diff/0003-git-svn-trailing-slash-in-prefix-is-mandatory-with.diff: + new; git-svn: trailing slash in prefix is mandatory with --branches/-b + (closes: #429443). + + -- Gerrit Pape Tue, 19 Jun 2007 17:32:30 +0000 + +git-core (1:1.5.2.1-2) unstable; urgency=low + + * debian/diff/0003-git-branch-track-fix-tracking-branch-computation.diff: + new; from upstream master: git-branch --track: fix tracking branch + computation. + + -- Gerrit Pape Fri, 8 Jun 2007 09:04:47 +0000 + +git-core (1:1.5.2.1-1) unstable; urgency=low + + * new upstream point release. + * Create a new manpage for the gitignore format, and reference it + elsewhere (thx Josh Triplett, closes: #427078). + * debian/diff/0002-gitk-properly-resolve-ambiguity-if-argument-is-both.diff: + new; properly resolve ambiguity if argument is both, revision and + filename (closes: #425491). + * debian/control: git-core: Conflicts: git (<< 4.3.20-11) (/usr/bin/git + transition). + * debian/git-daemon-run.README.Debian: new (#422139). + * debian/control: all Architecture: all packages: Depends: git-core + (= ${source:Version}) instead of (>= ...); this makes it no longer + support binNMUs (closes: #425494, reopens: #423041). + + -- Gerrit Pape Sun, 03 Jun 2007 10:09:53 +0000 + +git-core (1:1.5.2-1) unstable; urgency=low + + * merge branch debian-experimental. + * new upstream release. + * gitweb: choose appropriate view for file type if a= parameter missing + (closes: #410465). + * git fetch -q is supported (closes: #423165). + * /usr/bin/git transition (thx Ian Beckwith!). + * debian/git-core.preinst: new; remove /usr/bin/git alternative if + upgrading from versions older than 1:1.5.2~rc3-2. + * debian/git-core.prerm, debian/git-core.postinst: remove; no longer + handle /usr/bin/git alternative through update-alternatives. + * debian/rules: no longer install git program as git-scm. + + -- Gerrit Pape Wed, 30 May 2007 12:38:45 +0000 + +git-core (1:1.5.2~rc3-2) experimental; urgency=low + + * debian/diff/0000-maint-branch-from-20070514.diff: remove; obsolete. + * debian/control: package git-p4: Section: contrib/devel (closes: + #422755). + * debian/control: package git-p4: Depends: git-core (>= ${source:Version}) + instead of (= ${Source-Version}) (to support binNMUs). + + -- Gerrit Pape Tue, 15 May 2007 21:33:06 +0000 + +git-core (1:1.5.1.4-2) unstable; urgency=low + + * debian/diff/0000-maint-branch-from-20070514.diff: new; snapshot upstream + maint branch 20070514: + * includes git-svn fixes (closes: #423599, #423226). + * deian/rules: reverse order when applying diffs (fix typo). + * debian/control: all Architecture: all packages: Depends: git-core (>= + ${source:Version}) instead of (= ${Source-Version}) (to support binNMUs, + closes: #423041). + + -- Gerrit Pape Mon, 14 May 2007 13:15:50 +0000 + +git-core (1:1.5.2~rc3-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0002-Optimize-directory-listing-with-pathspec-limiter.diff: + remove; included upstream. + * debian/control: Build-Depends: tcl8.4 (for gitgui). + * debian/rules: add symlink /etc/init.d/git-daemon -> /usr/bin/sv to + git-daemon-run package (#422139). + + -- Gerrit Pape Mon, 14 May 2007 10:10:02 +0000 + +git-core (1:1.5.1.4-1) unstable; urgency=medium + + * new upstream point release. + * debian/diff/pager-vs-less.diff: rename to + 0001-pager.c-fallback-to-pager-not-less-if-PAGER-is.diff; adapt. + * debian/diff/0002-Optimize-directory-listing-with-pathspec-limiter.diff: + new: Optimize directory listing with pathspec limiter (closes: #420671). + * debian/git-daemon-run.postinst: restart git-daemon service if it was + running. + + -- Gerrit Pape Wed, 09 May 2007 08:48:50 +0000 + +git-core (1:1.5.2~rc2-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Mon, 07 May 2007 18:02:53 +0000 + +git-core (1:1.5.2~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * debian/control, debian/rules: new package git-p4: tools for importing + development history from perforce repositories. + * debian/rules: add WITH_P4IMPORT=1 to OPTS; no longer install + git-p4import.py into /usr/share/doc/git-core/contrib/; add OPTS to + make clean in target clean:; add PYTHON_PATH=/usr/bin/python to OPTS. + + -- Gerrit Pape Tue, 01 May 2007 12:28:15 +0000 + +git-core (1:1.5.1.3-1) unstable; urgency=low + + * new upstream point release. + * git-add tried to optimize by finding common leading directories + across its arguments but botched, causing very confused behaviour + (closes: #420671). + * Documentation/git-reset.txt: suggest git commit --amend in example + (closes: #420112). + * unofficial rpm.spec file shipped with git was letting ETC_GITCONFIG + set to /usr/etc/gitconfig. Tweak the official Makefile to make it + harder for distro people to make the same mistake, by setting the + variable to /etc/gitconfig if prefix is set to /usr (closes: + #420675). + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + + -- Gerrit Pape Tue, 01 May 2007 08:59:06 +0000 + +git-core (1:1.5.1.2-1) unstable; urgency=low + + * new upstream point release. + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + + -- Gerrit Pape Sun, 22 Apr 2007 13:31:05 +0000 + +git-core (1:1.5.1.1-1) unstable; urgency=low + + * new upstream point release. + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + * debian/diff/0010-rename-contrib-hooks-post-receieve-email-to-contrib.diff: + remove; applied upstream. + + -- Gerrit Pape Thu, 12 Apr 2007 09:05:44 +0000 + +git-core (1:1.5.1-1) unstable; urgency=low + + * new upstream release. + * git-svn got almost a rewrite (closes: #416372). + * debian/diff/git-cvsserver-update-hook.diff: remove; included upstream. + * debian/diff/Documentation-git-svnimport.txt-fix-typo.diff, + debian/diff/http-fetch-don-t-use-double-slash-as-directory-sepa.diff, + debian/diff/Documentation-git-rev-parse.txt-fix-example-in-SPEC.diff: + remove; applied upstream. + * debian/diff/GNU-Hurd.diff: remove; obsolete. + * debian/git-daemon-run.postrm: check for deluser being available, if + not, print warning and don't remove system user (closes: #416755). + * debian/changelog.upstream: upstream changes taken from mailing list + announcement, and git shortlog. + * debian/diff/0010-rename-contrib-hooks-post-receieve-email-to-contrib.diff: + new; rename contrib/hooks/post-receieve-email to contrib/hooks/post- + receive-email. + + -- Gerrit Pape Wed, 4 Apr 2007 11:56:18 +0000 + +git-core (1:1.5.0.6-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/http-fetch-don-t-use-double-slash-as-directory-sepa.diff: + new, cherry-pick'ed from upstream master: http-fetch: don't use + double-slash as directory separator in URLs (closes: #409887). + * debian/diff/Documentation-git-svnimport.txt-fix-typo.diff: new: + Documentation/git-svnimport.txt: fix typo. + * debian/diff/Documentation-git-rev-parse.txt-fix-example-in-SPEC.diff: + new Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES + (closes: #404795). + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + + -- Gerrit Pape Thu, 29 Mar 2007 10:51:00 +0000 + +git-core (1:1.5.0.5-1) unstable; urgency=low + + * new upstream point release. + * debian/rules: make sure subdirectories of /usr/share/doc/git-core/ are + mode 0755 (closes: #415328); remove .gitignore file(s) from + /usr/share/doc/git-core/ (closes: #413913). + * debian/control: git-svn: Depends: libterm-readkey-perl (thx Pierre + Habouzit, closes: #415475). + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + + -- Gerrit Pape Wed, 21 Mar 2007 17:02:27 +0000 + +git-core (1:1.5.0.3-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/cvsexportcommit-.msg.diff: remove; applied upstream. + * debian/git-core.docs, debian/git-doc.docs: add RelNotes. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + + -- Gerrit Pape Mon, 5 Mar 2007 19:44:05 +0000 + +git-core (1:1.5.0.2-1) unstable; urgency=low + + * new upstream point release. + * debian/control: git-core: Conflicts: qgit (<< 1.5.5) (closes: #412452). + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + * debian/diff/cvsexportcommit-.msg.diff: new; don't cleanup .msg if not + yet committed to cvs (closes: #412732). + + -- Gerrit Pape Wed, 28 Feb 2007 15:50:53 +0000 + +git-core (1:1.5.0.1-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/git-cvsserver-update-hook.diff: new from upstream pu branch: + Have git-cvsserver call hooks/update before really altering the ref. + * debian/control: git-cvs: Depends: libdbd-sqlite3-perl (git-cvsserver). + + -- Gerrit Pape Sun, 25 Feb 2007 11:38:34 +0000 + +git-core (1:1.5.0-1) experimental; urgency=low + + * new upstream release. + * debian/diff/archimport-empty-dir.diff: remove; applied upstream. + * debian/diff/pager-vs-less.diff, debian/diff/Add-install-lib-target.diff: + adapt. + * debian/control: new package git-gui, the git graphical user interface; + git-core: no longer Depends:, Build-Depends: rcs; git-core: Suggests: + git-gui. + * debian/rules: new package git-gui. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements and git shortlog. + * debian/git-daemon/run: don't limit git-daemon's memory resources. + * debian/control, debian/rules: remove git-core-dev package again, + libgit.a is not a publically usable/useful library at this moment, as + its internal API is not cast in stone yet. + * debian/diff/Add-install-lib-target.diff: remove; there's no git-core-dev + package. + + -- Gerrit Pape Fri, 16 Feb 2007 07:18:44 +0000 + +git-core (1:1.5.0~rc3-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/Add-install-lib-target.diff: new; add install-lib target to + install libgit.a library plus header files (thx Luca Falavigna). + * debian/rules: new package git-core-dev; remove obsolete + WITH_SEND_EMAIL=1, OPTIMIZE="..." from $(OPTS); remove + WITH_OWN_SUBPROCESS_PY=1 from $(OPTS), it's no longer necessary (thx + Luca Falavigna; closes: #403731); make git-p4import.pl available through + /usr/share/doc/git-core/contrib/ (closes: #403387); minor cleanup. + * debian/control: new package git-core-dev (thx Luca Falavigna; closes: + #407722); no longer Build-Depends: python; git-core: no longer Recommends: + python, Suggests: git-core-dev; update short and long descriptions + (closes: #406323); git-arch: Depends: tla, instead of Suggests:. + * debian/diff/GNU-Hurd.diff: adapt. + * debian/diff/archimport-empty-dir.diff: new; git-archimport: initial import + needs empty directory (closes: #400508). + * debian/gitweb.README.Debian: typo. + + -- Gerrit Pape Sat, 3 Feb 2007 09:32:48 +0000 + +git-core (1:1.4.4.4-1) unstable; urgency=low + + * new upstream release, important fixes: + * pack-check.c::verify_packfile(): don't run SHA-1 update on huge data. + * Fix infinite loop when deleting multiple packed refs. + * diff --check: fix off by one error. + * debian/diff/0001-spurious-.sp-in-manpages.diff: remove; included in + upstream version. + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + + -- Gerrit Pape Tue, 9 Jan 2007 19:43:56 +0000 + +git-core (1:1.4.4.3-1) unstable; urgency=medium + + * new upstream release (closes: #404796); important fixes: + * Make sure the empty tree exists when needed in merge-recursive; the + error message may make the user think that their database is corrupt + when its actually not. + * Don't use memcpy when source and dest. buffers may overlap. + * cvsserver: Avoid miscounting bytes in Perl v5.8.x; this breaks the + counting of bytes for the CVS protocol, resulting in the client + expecting less data than we actually send, and storing truncated files. + * debian/diff/0001-spurious-.sp-in-manpages.diff: new from upstream git; + work around spurious .sp in manpages (closes: #388370). + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + + -- Gerrit Pape Fri, 29 Dec 2006 07:38:15 +0000 + +git-core (1:1.4.4.2-1) unstable; urgency=low + + * new upstream release. + * fixes FTBFS on m68k (thx Roman Zippel, closes: #402022). + * 0001-archive-zip-don-t-use-sizeof-struct.diff, + 0002-git-svn-error-out-from-dcommit-on-a-parent-less-commit.diff, + 0003-git-svn-correctly-handle-revision-0-in-SVN-repositories.diff, + 0004-git-svn-preserve-uncommitted-changes-after-dcommit.diff, + 0005-Increase-length-of-function-name-buffer.diff: remove; obsolete. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements and git log | git shortlog. + + -- Gerrit Pape Fri, 8 Dec 2006 19:13:49 +0000 + +git-core (1:1.4.4.1-1) unstable; urgency=low + + * new upstream release (closes: #400191). + * 0001-archive-zip-don-t-use-sizeof-struct.diff: new from upstream git; + replaces debian/diff/not-packed-structs.diff. + * 0002-git-svn-error-out-from-dcommit-on-a-parent-less-commit.diff, + 0003-git-svn-correctly-handle-revision-0-in-SVN-repositories.diff, + 0004-git-svn-preserve-uncommitted-changes-after-dcommit.diff, + 0005-Increase-length-of-function-name-buffer.diff: new from upstream + git. + * debian/diff/genindex.diff: new; support subdirs in gitweb example index + generator (thx David Nusinow; closes: #400284). + * debian/diff/GNU-Hurd.diff, debian/diff/pager-vs-less.diff: adapt. + + -- Gerrit Pape Sun, 26 Nov 2006 14:31:39 +0000 + +git-core (1:1.4.4-2) unstable; urgency=low + + * debian/diff/not-packed-structs.diff: new; don't use sizeof(struct ...), + size doesn't match on arm (fixes selftests failure on arm). + + -- Gerrit Pape Wed, 22 Nov 2006 23:31:11 +0000 + +git-core (1:1.4.4-1) unstable; urgency=low + + * new upstream release (closes: #399575). + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + * debian/control: Build-Depends: unzip (for selftests). + + -- Gerrit Pape Tue, 21 Nov 2006 09:43:37 +0000 + +git-core (1:1.4.3.5-1) unstable; urgency=low + + * new upstream release. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + + -- Gerrit Pape Mon, 13 Nov 2006 17:46:50 +0000 + +git-core (1:1.4.3.3-2) unstable; urgency=medium + + * debian/git-daemon-run.postinst: don't make the log service system user + gitlog member of group adm, but nogroup; gitlog's home directory is + /nonexistent (thx Florian Weimer, closes: #396687). + * debian/git-daemon/log/run: make /var/log/git-daemon log directory mode + 2750, owner gitlog:adm. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + + -- Gerrit Pape Mon, 6 Nov 2006 20:12:08 +0000 + +git-core (1:1.4.3.3-1) unstable; urgency=low + + * new upstream release. + * debian/diff/0001-Set-HOME-for-selftests.diff: remove; applied upstream. + * debian/control: git-core: Depends: libdigest-sha1-perl (closes: #395304, + thx Ichthyostega). + + -- Gerrit Pape Tue, 31 Oct 2006 07:31:21 +0000 + +git-core (1:1.4.3.2-1) unstable; urgency=low + + * new upstream release. + * debian/diff/gitweb.conf.diff: remove; obsolete. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + * debian/rules: add 'GITWEB_CONFIG=/etc/gitweb.conf mandir=/usr/share/man + OPTIMIZE="-O2 -g -Wall" INSTALLDIRS=vendor' to build OPTS, adapt paths; + git-arch: don't include git-archive, git-upload-archive; gitweb: install + git-logo.png, git-favicon.png; git-core: properly install new Git.pm + plus man page. + * debian/diff/0001-Set-HOME-for-selftests.diff: new; set $HOME for + selftests (fixes build/selftest failures). + * debian/control: git-core: Depends: liberror-perl. + + -- Gerrit Pape Tue, 24 Oct 2006 16:32:35 +0000 + +git-core (1:1.4.2.3-2) unstable; urgency=low + + * debian/control: new package git-daemon-run: provide a git-daemon + service; git-core: no longer Suggests: runit, Depends: adduser, the + git-daemon-run package now Depends: runit, adduser. + * debian/debian/git-core.postinst, debian/git-daemon-run.postrm, + debian/git-daemon-run.prerm: new; manage gitlog user and git-daemon + service (closes: #388144). + * debian/git-core.postinst: no longer adduser gitlog, git-daemon-run + package does now. + * debian/git-core.postrm: remove; obsolete. + * debian/rules: install git-daemon service directory in the new + git-daemon-run package instead of the git-core package. + * debian/git-core.conffiles: rename to debian/git-daemon-run.conffiles. + * debian/git-core.README.Debian: adapt. + * debian/control: git-core: Suggests: git-daemon-run. + + -- Gerrit Pape Sun, 8 Oct 2006 09:29:50 +0000 + +git-core (1:1.4.2.3-1) unstable; urgency=medium + + * new upstream release. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + * debian/diff/t3403-skip-3-7.diff: remove; git-am is fixed upstream. + * debian/gitweb.conf: add $stylesheet = "/gitweb.css" (thx Christian + Kujau, closes: #383065). + + -- Gerrit Pape Sun, 8 Oct 2006 07:31:03 +0000 + +git-core (1:1.4.2.1-1) unstable; urgency=low + + * new upstream release (closes: #386820, #387405). + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + * debian/diff/GNU-Hurd.diff: new; make the build process detect and + support the Debian GNU/Hurd architecture (thx Cyril Brulebois, closes: + #379841). + * debian/diff/GNU-kFreeBSD.diff: remove; applied upstream. + * debian/rules: gitweb: install gitweb.css into /var/www/ instead of + /usr/share/doc/gitweb/ (thx Matthijs Melchior, closes: #383065). + * debian/gitweb.docs: remove; obsolete. + * debian/examples/index.aux-generation: example script to generate an + optional index.aux file for the use with gitweb (thx Matthew Wilcox, + #383219). + * debian/gitweb.examples: new; install debian/examples/index.aux-generation + (#383219). + * debian/git-core.README.Debian: new; hints on how to set up a + git.example.org server providing git://, rsync://, http:// access to + repositories from Matthew Wilcox (thx!, closes: #383219). + * debian/gitweb.README.Debian: cleanup; refer to git-core.README.Debian. + * debian/control: git-svn: Depends: libsvn-perl | libsvn-core-perl (thx + Peter Samuelson); git-core, git-doc: Suggests: gitweb; gitweb: + Recommends: git-doc. + * debian/diff/pager-vs-less.diff, debian/diff/gitweb.conf.diff: adapt. + * debian/git-daemon/: new; git-daemon service directory for the use with + runit. + * debian/control: Build-Depends: subversion, libsvn-perl | libsvn-core-perl + (for git-svn selftests); git-core: Suggests: runit, Depends: adduser. + * debian/diff/t3403-skip-3-7.diff: new; skip selftests 3,7 in t3403 as + they fail without a terminal connected. + * debian/git-core.conffiles: new; add /etc/sv/git-daemon/run, + /etc/sv/git-daemon/log/run. + + -- Gerrit Pape Fri, 15 Sep 2006 12:46:58 +0000 + +git-core (1:1.4.1.1-1) unstable; urgency=low + + * new upstream release. + * debian/diff/GNU-kFreeBSD.diff: new; make the build process detect and + support the Debian GNU/kFreeBSD architecture (thx Petr Salinger, closes: + #380209). + + -- Gerrit Pape Sat, 29 Jul 2006 15:31:04 +0000 + +git-core (1:1.4.1-2) unstable; urgency=low + + * adopt package gitweb, now included in git-core upstream source (thx + Andres Salomon): + * debian/control, debian/rules: build gitweb package. + * debian/copyright: adapt. + * debian/gitweb.README.Debian, debian/gitweb.conf, debian/gitweb.docs: + new; taken from Andres' gitweb package. + * debian/diff/gitweb.conf.diff: new; adapt Andres' gitweb.conf.patch. + * debian/gitweb.conffiles: new; /etc/gitweb.conf. + * debian/changelog: use epoch 1 to supersede gitweb-264 package version. + * debian/rules: set DESTDIR in environment, not build flags. + + -- Gerrit Pape Thu, 27 Jul 2006 21:44:06 +0000 + +git-core (1.4.1-1) unstable; urgency=low + + * new upstream release. + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + * debian/rules: user same build flags and prefix to $(MAKE) in build + and install target to prevent rebuild in install target. + + -- Gerrit Pape Tue, 11 Jul 2006 21:38:33 +0000 + +git-core (1.4.0-1) unstable; urgency=low + + * new upstream release. + * debian/changelog.upstream: new; upstream changes taken from mailing + list announcement. + * debian/rules: install debian/changelog.upstream as upstream changelog. + * debian/diff/pager-vs-less.diff: adapt. + * debian/control: Standards-Version: 3.7.2.0. + + -- Gerrit Pape Wed, 14 Jun 2006 17:04:56 +0000 + +git-core (1.3.3-2) unstable; urgency=medium + + * debian/control: git-core: Depends: perl-modules (closes: #369737). + * debian/diff/pager-vs-less.diff: new; fallback to `pager` not `less` + if $PAGER is unset (closes: #369742). + + -- Gerrit Pape Sat, 10 Jun 2006 11:18:48 +0000 + +git-core (1.3.3-1) unstable; urgency=low + + * new upstream release. + + -- Gerrit Pape Thu, 25 May 2006 10:46:00 +0000 + +git-core (1.3.2-1) unstable; urgency=low + + * new upstream release. + + -- Gerrit Pape Wed, 10 May 2006 20:41:39 +0000 + +git-core (1.3.1-1) unstable; urgency=low + + * new upstream release (closes: #364678). + * debian/rules: install contrib/ directory into /usr/share/doc/git-core/. + + -- Gerrit Pape Mon, 1 May 2006 13:01:42 +0000 + +git-core (1.2.6-1) unstable; urgency=low + + * new upstream release. + * debian/control: git-cvs: Depends: cvsps (>> 2.1-0). + + -- Gerrit Pape Sun, 16 Apr 2006 14:37:53 +0000 + +git-core (1.2.4-1) unstable; urgency=low + + * new upstream release (closes: #354563). + + -- Gerrit Pape Fri, 3 Mar 2006 21:33:58 +0000 + +git-core (1.2.1-1) unstable; urgency=low + + * new upstream release (closes: #353041). + * debian/control: git-core: Recommends: ssh-client instead of + openssh-client (closes: #350708). + + -- Gerrit Pape Thu, 16 Feb 2006 09:33:42 +0000 + +git-core (1.1.5-1) unstable; urgency=high + + * new upstream release. + * checkout: do not make a temporary copy of symlink target. + If the index records an insanely long symbolic link, copying + into the temporary would overflow the buffer (noticed by Mark + Wooding). (closes: #350274). + + -- Gerrit Pape Sat, 28 Jan 2006 20:16:44 +0000 + +git-core (1.1.3-1) unstable; urgency=low + + * new upstream release. + + -- Gerrit Pape Mon, 16 Jan 2006 10:19:37 +0000 + +git-core (1.0.8-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/t6001-rev-lisge-order.sh.diff: remove; applied upstream. + * debian/control: Build-Depends: libcurl3-gnutls-dev | libcurl3-dev, + python, asciidoc (>> 7.0.2-3) (ease backport to sarge, thx Norbert + Tretkowski, closes: #344929). + + -- Gerrit Pape Mon, 9 Jan 2006 19:19:36 +0000 + +git-core (1.0.6-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/t6001-rev-list-merge-order.sh.diff: new: fix skipping + merge-order test with NO_OPENSSL=1. + * debian/rules: re-enable git-rev-list --merge-order selftests. + * debian/control: git-svn: Depends: libwww-perl (closes: #345045). + + -- Gerrit Pape Mon, 2 Jan 2006 20:25:57 +0000 + +git-core (1.0.5-1) unstable; urgency=low + + * new upstream point release. + * debian/rules: don't take upstream changelog from upstream + debian/changelog. + * debian/changelog.upstream: remove again. + + -- Gerrit Pape Tue, 27 Dec 2005 13:25:53 +0000 + +git-core (1.0.3-1) unstable; urgency=low + + * new upstream point release. + * debian/changelog.upstream: new: upstream changelog taken from upstream + debian/changelog. + * debian/rules: install debian/changelog.upstream as upstream changelog; + remove obsolete VERSION variable. + + -- Gerrit Pape Fri, 23 Dec 2005 14:58:14 +0000 + +git-core (1.0.0-1) unstable; urgency=medium + + * new upstream release: GIT 1.0.0. + + -- Gerrit Pape Wed, 21 Dec 2005 16:17:18 +0000 + +git-core (0.99.9n-1) unstable; urgency=low + + * new upstream version: GIT 0.99.9n aka 1.0rc6. + * debian/rules: rename git program in git-core package to git-scm, + handle /usr/bin/git program through update-alternatives (as suggested + by Ian Beckwith, see #342363). + * debian/control: git-core: Conflicts: git (<< 4.3.20-8) (closes: + #342363). + * debian/git-core.postinst, debian/git-core.prerm: new: run + update-alternatives --install /usr/bin/git git /usr/bin/git-scm with + priority 70 on configure, and --remove on remove respectively. + + -- Gerrit Pape Thu, 15 Dec 2005 11:24:51 +0000 + +git-core (0.99.9m-1) unstable; urgency=low + + * new upstream version: GIT 0.99.9m aka 1.0rc5. + * sets PYTHONPATH for selftests (fixes autobuild test failures). + * switch from tarball-in-tarball approach to original upstream tarball. + * debian/changelog: add changelog history, Junio C Hamano, Ryan Anderson, + Eric Biederman previously were maintaining this package unofficially. + * debian/control: Build-Depends: rcs (for selftests); git-core: + Recommends: patch, less, Suggests: cogito; git-arch: Suggests: tla, + bazzar; git-cvs: Depends: cvsps, Suggests: cvs; git-svn: Depends: + libsvn-core-perl (closes:#342617), Suggests: subversion; git-email: + Depends: libmail-sendmail-perl, libemail-valod-perl; update short + description (lots taken from upstream unofficial package, thx). + * debian/git-core.docs, debian/git-doc.docs: adapt. + * debian/rules: adapt; remove target unpack; add target patch; adapt + target clean. + + -- Gerrit Pape Wed, 14 Dec 2005 19:48:41 +0000 + +git-core (0.99.9l-1) unstable; urgency=low + + * new upstream version. + * debian/rules: apply diffs with patch -p1. + * debian/control, debian/rules: split off git-arch, git-cvs, git-svn, + git-email packages, as suggested by upstream: + http://article.gmane.org/gmane.comp.version-control.git/13185 + * debian/git-doc.docs: get docs from temporary install directory; + include *.txt docs. + * debian/control: git-doc: Section: doc; Suggests: git-core, git-arch, + git-cvs, git-svn, git-email, gitk; git-core: Suggests: git-arch, + git-cvs, git-svn, git-email, gitk. + + -- Gerrit Pape Mon, 5 Dec 2005 18:04:37 +0000 + +git-core (0.99.9k-1) unstable; urgency=low + + * new upstream version. + * debian/implicit: update to revision 1.11. + * debian/git-doc.docs: add git/Documentation/howto, + git/Documentation/technical (closes: #341178). + + -- Gerrit Pape Tue, 29 Nov 2005 21:45:53 +0000 + +git-core (0.99.9j-1) unstable; urgency=low + + * initial version. + * debian/control: git-core: Replaces: cogito (<< 0.16rc2-0); cogito >= + 0.16rc2-0 no longer includes the git core components, but depends on + the git-core package (see #338789). + + -- Gerrit Pape Fri, 18 Nov 2005 22:26:36 +0000 + +git-core (0.99.9j-0) unstable; urgency=low + + * GIT 0.99.9j aka 1.0rc3 + + -- Junio C Hamano Wed, 16 Nov 2005 20:39:55 -0800 + +git-core (0.99.9i-0) unstable; urgency=low + + * GIT 0.99.9i aka 1.0rc2 + + -- Junio C Hamano Mon, 14 Nov 2005 18:38:27 -0800 + +git-core (0.99.9h-0) unstable; urgency=low + + * GIT 0.99.9h + + -- Junio C Hamano Fri, 11 Nov 2005 22:33:18 -0800 + +git-core (0.99.9g-0) unstable; urgency=low + + * GIT 0.99.9g + + -- Junio C Hamano Wed, 9 Nov 2005 21:01:55 -0800 + +git-core (0.99.9f-0) unstable; urgency=low + + * GIT 0.99.9f + + -- Junio C Hamano Tue, 8 Nov 2005 01:21:52 -0800 + +git-core (0.99.9e-0) unstable; urgency=low + + * GIT 0.99.9e + + -- Junio C Hamano Sun, 6 Nov 2005 18:37:18 -0800 + +git-core (0.99.9d-0) unstable; urgency=low + + * GIT 0.99.9d + + -- Junio C Hamano Sat, 5 Nov 2005 11:46:37 -0800 + +git-core (0.99.9c-0) unstable; urgency=low + + * GIT 0.99.9c + + -- Junio C Hamano Thu, 3 Nov 2005 15:44:54 -0800 + +git-core (0.99.9b-0) unstable; urgency=low + + * GIT 0.99.9b + + -- Junio C Hamano Tue, 1 Nov 2005 21:39:39 -0800 + +git-core (0.99.9a-0) unstable; urgency=low + + * GIT 0.99.9a + + -- Junio C Hamano Sun, 30 Oct 2005 15:03:32 -0800 + +git-core (0.99.9.GIT-2) unstable; urgency=low + + * Build Dependency did not include libexpat-dev. + + -- Junio C Hamano Sun, 13 Nov 2005 01:55:34 -0800 + +git-core (0.99.9.GIT-1) unstable; urgency=low + + * Do not scatter txt and html documentation into feature + subpackages. Do place man pages into them. + * Capture more cvs stuff into git-cvs package. + + -- Junio C Hamano Tue, 8 Nov 2005 01:19:06 -0800 + +git-core (0.99.9.GIT-0) unstable; urgency=low + + * Test Build. + + -- Junio C Hamano Sat, 5 Nov 2005 11:18:13 -0800 + +git-core (0.99.9-1) unstable; urgency=low + + * Split the git-core binary package into core, doc, and foreign SCM + interoperability modules. + + -- Junio C Hamano Sat, 5 Nov 2005 11:18:13 -0800 + +git-core (0.99.9-0) unstable; urgency=low + + * GIT 0.99.9 + + -- Junio C Hamano Sat, 29 Oct 2005 14:34:30 -0700 + +git-core (0.99.8-0) unstable; urgency=low + + * GIT 0.99.8 + + -- Junio C Hamano Sun, 2 Oct 2005 12:54:26 -0700 + +git-core (0.99.7-0) unstable; urgency=low + + * GIT 0.99.7 + + -- Junio C Hamano Sat, 10 Sep 2005 18:36:39 -0700 + +git-core (0.99.6-0) unstable; urgency=low + + * GIT 0.99.6 + + -- Junio C Hamano Wed, 24 Aug 2005 23:09:35 -0700 + +git-core (0.99.5-1) unstable; urgency=low + + * Enable git-send-email on Debian. There is no reason to shy + away from it, since we have the necessary Perl modules available. + + -- Junio C Hamano Thu, 25 Aug 2005 14:16:59 -0700 + +git-core (0.99.5-0) unstable; urgency=low + + * GIT 0.99.5 + + -- Junio C Hamano Wed, 10 Aug 2005 22:05:00 -0700 + +git-core (0.99.4-4) unstable; urgency=low + + * Mark git-tk as architecture neutral. + + -- Junio C Hamano Fri, 12 Aug 2005 13:25:00 -0700 + +git-core (0.99.4-3) unstable; urgency=low + + * Split off gitk. + * Do not depend on diff which is an essential package. + * Use dh_movefiles, not dh_install, to stage two subpackages. + + -- Matthias Urlichs Thu, 11 Aug 2005 01:43:24 +0200 + +git-core (0.99.4-2) unstable; urgency=low + + * Git 0.99.4 official release. + + -- Junio C Hamano Wed, 10 Aug 2005 15:00:00 -0700 + +git-core (0.99.4-1) unstable; urgency=low + + * Pass prefix down to the submake when building. + + -- Junio C Hamano Sat, 6 Aug 2005 13:00:00 -0700 + +git-core (0.99-2) unstable; urgency=low + + * Conflict with the GNU Interactive Tools package, which also installs + /usr/bin/git. + * Use the Mozilla SHA1 code and/or the PPC assembly in preference to + OpenSSL. This is only a partial fix for the license issues with OpenSSL. + * Minor tweaks to the Depends. + + -- Ryan Anderson Sat, 23 Jul 2005 14:15:00 -0400 + +git-core (0.99-1) unstable; urgency=low + + * Update deb package support to build correctly. + + -- Ryan Anderson Thu, 21 Jul 2005 02:03:32 -0400 + +git-core (0.99-0) unstable; urgency=low + + * Initial deb package support + + -- Eric Biederman Tue, 12 Jul 2005 10:57:51 -0600 --- git-core-1.6.3.3.orig/debian/changelog.upstream +++ git-core-1.6.3.3/debian/changelog.upstream @@ -0,0 +1,20361 @@ +Version v1.6.3.3; changes since v1.6.3.2: +----------------------------------------- + +Anders Kaseorg (1): + for-each-ref: Do not lookup objects when they will not be used + +Clemens Buchacher (1): + refuse to merge during a merge + +Jim Meyering (1): + use xstrdup, not strdup in ll-merge.c + +Johannes Schindelin (1): + import-tars: support symlinks + +Johannes Sixt (2): + fetch-pack: close output channel after sideband demultiplexer terminates + diff.c: plug a memory leak in an error path + +Junio C Hamano (3): + t3505: fix abuse of test_expect_code + attribute: whitespace set to true detects all errors known to git + GIT 1.6.3.3 + +Linus Torvalds (1): + Fix big left-shifts of unsigned char + +Marco Nelissen (1): + fix handling of iconv configuration options + +Mark Lodato (1): + http.c: fix compiling with libcurl 7.9.2 + +Michael J Gruber (1): + builtin-remote: Make "remote show" display all urls + +Miklos Vajna (1): + git-svn documentation: fix typo in 'rebase vs. pull/merge' section + +Nanako Shiraishi (1): + .gitattributes: CR at the end of the line is an error + +Paolo Bonzini (2): + Documentation: git-send-mail can take rev-list arg to drive format-patch + avoid exponential regex match for java and objc function names + +René Scharfe (1): + upload-archive: fix infinite loop on Cygwin + +Shawn O. Pearce (1): + daemon: Strictly parse the "extra arg" part of the command + +Stephen Boyd (3): + git-rerere.txt: grammatical fixups and cleanups + pull, rebase: simplify to use die() + git-show-ref.txt: remove word and make consistent + +Tay Ray Chuan (1): + http*: cleanup slot->local after fclose + +Thomas Rast (1): + Documentation: refer to gitworkflows(7) from tutorial and git(1) + +Uwe Kleine-König (1): + rebase--interactive: remote stray closing parenthesis + + +Version v1.6.3.2; changes since v1.6.3.1: +----------------------------------------- + +Alex Riesen (7): + Introduce an unlink(2) wrapper which gives warning if unlink failed + replace direct calls to unlink(2) with unlink_or_warn + print unlink(2) errno in copy_or_link_directory + Clarify kind of conflict in merge-one-file helper + ls-tree manpage: use "unless" instead of "when ... is not" + ls-tree manpage: output of ls-tree is compatible with update-index + http-push.c::remove_locks(): fix use after free + +Charles Bailey (2): + t6023: merge-file fails to output anything for a degenerate merge + Change xdl_merge to generate output even for null merges + +Clemens Buchacher (1): + fix segfault showing an empty remote + +Dan McGee (1): + Fix type-punning issues + +Daniel Cordero (1): + builtin-checkout: Don't tell user that HEAD has moved before it has + +Dave Olszewski (1): + merge-recursive: never leave index unmerged while recursing + +Giuseppe Bilotta (1): + completion: use git rev-parse to detect bare repos + +Jeff King (6): + fix GIT_TRACE segfault with shell-quoted aliases + add: don't complain when adding empty project root + for-each-ref: fix segfault in copy_email + lock_ref: inform callers of unavailable ref + fetch: report ref storage DF errors more accurately + fix cat-file usage message and documentation + +Jim Meyering (2): + format-patch let -k override a config-specified format.numbered + pre-commit.sample: don't print incidental SHA1 + +Johannes Schindelin (2): + Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile + Cope better with a _lot_ of packs + +Johannes Sixt (1): + t3701: ensure correctly set up repository after skipped tests + +Junio C Hamano (8): + Revert "git-add--interactive: remove hunk coalescing" + completion: fix PS1 display during a merge on detached HEAD + completion: simplify "current branch" in __git_ps1() + completion: enhance "current branch" display + Prepare for 1.6.3.2 + Update draft release notes for 1.6.3.2 + blame: correctly handle a path that used to be a directory + GIT 1.6.3.2 + +Linus Torvalds (3): + Avoid unnecessary 'lstat()' calls in 'get_stat_data()' + Teach 'git checkout' to preload the index contents + dir.c: clean up handling of 'path' parameter in read_directory_recursive() + +Matt Graham (1): + Splitting a hunk that adds a line at the top fails in "add -p" + +Michael J Gruber (1): + merge-options.txt: Clarify merge --squash + +Nanako Shiraishi (1): + test: checkout shouldn't say that HEAD has moved if it didn't + +Nicolas Pitre (1): + allow OFS_DELTA objects during a push + +René Scharfe (4): + grep: fix word-regexp colouring + grep: fix word-regexp at the beginning of lines + grep: fix colouring of matches with zero length + grep: fix empty word-regexp matches + +Stephen Boyd (6): + api-parse-options.txt: use 'func' instead of 'funct' + tests: Add tests for missing format-patch long options + completion: add missing options to show-branch and show + show-branch: Fix die message in parse_reflog_param() + commit: -F overrides -t + apply, fmt-merge-msg: use relative filenames + +Thomas Rast (2): + Documentation: teach stash/pop workflow instead of stash/apply + add -i: do not dump patch during application + +Tony Kemp (1): + Turn on USE_ST_TIMESPEC for OpenBSD + + +Version v1.6.3.1; changes since v1.6.3: +--------------------------------------- + +Alex Riesen (1): + Clarify kind of conflict in merge-one-file helper + +Alexander Potashev (1): + Documentation: cloning to empty directory is allowed + +Felipe Contreras (1): + git config: clarify --add and --get-color + +Junio C Hamano (4): + Start 1.6.3.1 maintenance series. + archive-tar.c: squelch a type mismatch warning + Revert "checkout branch: prime cache-tree fully" + GIT 1.6.3.1 + + +Version v1.6.3; changes since v1.6.3-rc4: +----------------------------------------- + +Alex Riesen (1): + improve error message in config.c + +Allan Caffee (1): + dir.c: Fix two minor grammatical errors in comments + +Bernd Ahlers (1): + Work around BSD whose typeof(tv.tv_sec) != time_t + +Brandon Casey (7): + t4018-diff-funcname: add cpp xfuncname pattern to syntax test + t8005: use egrep when extended regular expressions are required + t4118: add missing '&&' + t4118: avoid sed invocation on file without terminating newline + t/annotate-tests.sh: avoid passing a non-newline terminated file to sed + t4200: remove two unnecessary lines + t4200: convert sed expression which operates on non-text file to perl + +Junio C Hamano (4): + GIT 1.6.1.4 + GIT 1.6.2.5 + git-clean doc: the command only affects paths under $(cwd) + GIT 1.6.3 + +Nguyễn Thái Ngọc Duy (1): + t4029: use sh instead of bash + +Nicolas Pitre (1): + honor repack.usedeltabaseoffset when fetching packs + +Robin H. Johnson (1): + git-svn: fix a sloppy Getopt::Long usage + +Stephen Boyd (8): + completion: add missing configuration variables to _git_config() + completion: add {gui,diff,merge}tool, man, and pager config variables + completion: complete values for help.format + completion: complete values for log.date + completion: complete values for send-email + git-am.txt: add an 'a', say what 'it' is, simplify a sentence + git-am.txt: Use date or value instead of time or timestamp + git-am.txt: reword extra headers in message body + + +Version v1.6.3-rc4; changes since v1.6.3-rc3: +--------------------------------------------- + +Alex Riesen (3): + git-gui: Update Russian translation + improve error message in config.c + gitk: Add Russian translation + +Alexander Gavrilov (3): + git-gui: Fix post-commit status with subject in non-locale encoding + git-gui: Avoid an infinite rescan loop in handle_empty_diff. + git-gui: Support more git version notations. + +Allan Caffee (2): + builtin-merge: fix a typo in an error message + Documentation: fix a grammatical error in api-builtin.txt + +Benjamin Kramer (1): + daemon.c: fix segfault on OS X + +Christian Stimming (1): + gitk: Mark forgotten string for translation + +Daniel A. Steffen (2): + gitk: Fixes for Mac OS X TkAqua + git-gui: Fixes for Mac OS X TkAqua + +Eric Blake (2): + Makefile: installing git in cygwin 1.7.0 + doc: consistently use ASCIIDOC_EXTRA + +Felipe Contreras (2): + git config: error when editing a repo config and not being in one + Fix a bunch of pointer declarations (codestyle) + +Ferry Huberts (1): + git-gui: Ensure consistent usage of mergetool.keepBackup + +Giuseppe Bilotta (1): + gitk: Provide a window icon if possible + +Jeff King (1): + Makefile: fix NO_PERL bug with gitweb + +Jens Lehmann (4): + git-gui: Fix merge conflict display error when filename contains spaces + git-gui: When calling post-commit hook wrong variable was cleared. + git-gui: run post-checkout hook on checkout + git-gui: run post-checkout hook after clone + +Joerg Bornemann (1): + git-gui: fix use of undeclared variable diff_empty_count + +Johannes Schindelin (2): + t5701: do not get stuck in empty-push/ + Rename core.unreliableHardlinks to core.createObject + +Johannes Sixt (1): + prune-packed: advanced progress even for non-existing fan-out directories + +Junio C Hamano (3): + diff -c -p: do not die on submodules + merge-recursive: do not die on a conflicting submodule + GIT 1.6.3-rc4 + +Linus Torvalds (1): + grep: fix segfault when "git grep '('" is given + +Mark Drago (1): + Add semicolon to curly brace group in main Makefile + +Markus Heidelberg (5): + git-gui: don't hide the Browse button when resizing the repo chooser + git-gui: fix deleting from the context menu with empty selection + git-gui: use `git --html-path` to get the location of installed HTML docs + git-gui (Win): make "Explore Working Copy" more robust + git-gui (Win): make starting via "Git GUI Here" on .git/ possible + +Michele Ballabio (2): + gitk: Mark some more strings for translation + gitk: Map KP_Divide to focus the search box + +Pat Thoyts (4): + gitk: Handle blobs containing a DOS end-of-file marker + gitk: Remember and restore the window state with the geometry + gitk: Handle external diff tool with spaces in the path + gitk: Avoid crash if closed while reading references + +Patrick Welche (1): + NetBSD compilation fix + +Paul Mackerras (4): + gitk: Add a way to mark a commit, plus a "find descendant" command + gitk: Add a command to compare two strings of commits + gitk: Make .gitk a hidden file under windows + gitk: Fix compare-commits function when we have local changes + +Phil Lawrence (1): + Append ampersand to "Target" of lnk files created by do_cygwin_shortcut + +René Scharfe (1): + ctype.c: fix typo in comment + +Sam Hocevar (2): + git-gui: various French translation fixes + git-gui: minor spelling fix and string factorisation. + +Sam Vilain (1): + SubmittingPatches: itemize and reflect upon well written changes + +Stephen Boyd (1): + gitk: Provide a 32x32 window icon based on the git logo + +Uwe Kleine-König (1): + parseopt: fix documentation for --keep-dashdash + + +Version v1.6.3-rc3; changes since v1.6.3-rc2: +--------------------------------------------- + +Benjamin Kramer (1): + connect: replace inet_ntop with getnameinfo + +Brandon Casey (2): + t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-' + t7700-repack: repack -a now works properly, expect success from test + +Johannes Schindelin (1): + Add an option not to use link(src, dest) && unlink(src) when that is unreliable + +Linus Torvalds (1): + t4202: fix typo + +Nicolas Pitre (1): + progress bar: round to the nearest instead of truncating down + +Sitaram Chamarty (1): + Remove obsolete bug warning in man git-update-server-info + +Wesley J. Landaker (2): + Documentation: git-clean: fix minor grammatical errors + Documentation: git-clean: make description more readable + + +Version v1.6.3-rc2; changes since v1.6.3-rc1: +--------------------------------------------- + +Alex Riesen (2): + Wait for git diff to finish in git difftool + Explain seemingly pointless use of system in difftool + +Allan Caffee (3): + t4202-log: extend test coverage of graphing + graph API: fix extra space during pre_commit_line state + graph API: fix a bug in the rendering of octopus merges + +Ben Jackson (1): + Work around ash "alternate value" expansion bug + +Bill Pemberton (1): + Add parsing of elm aliases to git-send-email + +Dan Loewenherz (1): + Convert to use quiet option when available + +Erik Faye-Lund (4): + test-suite: adding a test for fast-export with tag variants + builtin-fast-export.c: turn error into warning + builtin-fast-export.c: fix crash on tagged trees + builtin-fast-export.c: handle nested tags + +Frank Lichtenheld (1): + gitcvs-migration: Link to git-cvsimport documentation + +Holger Weiß (1): + gitweb: Fix snapshots requested via PATH_INFO + +Jeff King (2): + add-interactive: refactor mode hunk handling + t7800: respect NO_PERL + +Johan Herland (1): + Update docs on behaviour of 'core.sharedRepository' and 'git init --shared' + +Johannes Schindelin (1): + Fix off-by-one in read_tree_recursive + +Johannes Sixt (4): + Windows: Work around intermittent failures in mingw_rename + Windows: Skip fstat/lstat optimization in write_entry() + builtin-help: silently tolerate unknown keys + remote.c: do not trigger remote.. codepath for two-level names + +Junio C Hamano (8): + GIT 1.6.2.4 + read-tree A B: do not corrupt cache-tree + Move prime_cache_tree() to cache-tree.c + read-tree -m A B: prime cache-tree from the switched-to tree + checkout branch: prime cache-tree fully + Revert "stat_tracking_info(): only count real commits" + Makefile: ignore perl/ subdirectory under NO_PERL + GIT 1.6.3-rc2 + +Junio Hamano (1): + Speed up reflog pruning of unreachable commits + +Linus Torvalds (1): + Clean up reflog unreachability pruning decision + +Markus Heidelberg (1): + grep: don't support "grep.color"-like config options + +Matthieu Moy (3): + git add -p: new "quit" command at the prompt. + Update git-add.txt according to the new possibilities of 'git add -p'. + clone: add test for push on an empty clone. + +Michael J Gruber (2): + test-lib.sh: Help test_create_repo() find the templates dir + Fix more typos/spelling in comments + +Michał Kiedrowicz (3): + tests: test applying criss-cross rename patch + builtin-apply: keep information about files to be deleted + tests: make test-apply-criss-cross-rename more robust + +Mike Ralphson (3): + builtin-remote: fix typo in option description + Documentation: fix typos / spelling mistakes + Fix typos / spelling in comments + +Nguyễn Thái Ngọc Duy (1): + Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins + +Stephen Boyd (8): + test-genrandom: Add newline to usage string + config.txt: add missing format.{subjectprefix,cc,attach} variables + Documentation: use lowercase for shallow and deep threading + git-show-branch.txt: cleanup example description + git-format-patch.txt: general rewordings and cleanups + config.txt: add missing 'the's and make words plural + config.txt: clarify sentences in the configuration and syntax sections + config.txt: Make configuration paragraph more consistent + +Wesley J. Landaker (2): + Documentation: git-svn: fix spurious bolding that mangles the output + Documentation: git-svn: fix a grammatical error without awkwardness + +Wincent Colaiuta (1): + git add -p: add missing "q" to patch prompt + + +Version v1.6.3-rc1; changes since v1.6.3-rc0: +--------------------------------------------- + +Allan Caffee (1): + graph API: Added logic for colored edges + +Bert Wesarg (3): + shorten_unambiguous_ref(): add strict mode + for-each-ref: utilize core.warnAmbiguousRefs for :short-format + rev-parse: --abbrev-ref option to shorten ref name + +David Aguilar (11): + difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff + difftool: remove the backup file feature + difftool: use perl built-ins when testing for msys + difftool: add a -y shortcut for --no-prompt + difftool: move 'git-difftool' out of contrib + difftool: add various git-difftool tests + difftool: add support for a difftool.prompt config variable + bash completion: add git-difftool + mergetool: use $( ... ) instead of `backticks` + difftool/mergetool: refactor commands to use git-mergetool--lib + mergetool--lib: simplify API usage by removing more global variables + +Erik Broes (1): + git-shell: Add 'git-upload-archive' to allowed commands. + +Ferry Huberts (1): + Fix misspelled mergetool.keepBackup + +Frank Lichtenheld (1): + init: Do not segfault on big GIT_TEMPLATE_DIR environment variable + +Jeff King (7): + doc: clarify --no-track option + doc: refer to tracking configuration as "upstream" + doc/checkout: refer to git-branch(1) as appropriate + doc/checkout: split checkout and branch creation in synopsis + docs/checkout: clarify what "non-branch" means + add-interactive: refactor mode hunk handling + doc/gitattributes: clarify location of config text + +Johannes Sixt (1): + t1301-shared-repo: fix forced modes test + +Junio C Hamano (4): + gitignore git-bisect--helper + unpack-trees: do not muck with attributes when we are not checking out + Describe fixes since 1.6.2.3 + Update draft release notes to 1.6.3 + +Linus Torvalds (3): + Allow users to un-configure rename detection + process_{tree,blob}: show objects without buffering + show_object(): push path_name() call further down + +Markus Heidelberg (5): + doc/merge-config: list ecmerge as a built-in merge tool + git-mergetool/difftool: make (g)vimdiff workable under Windows + git-mergetool: add new merge tool TortoiseMerge + doc/git-daemon: add missing arguments to options + doc/git-daemon: add missing arguments to max-connections option + +Matthieu Moy (2): + git add -p: new "quit" command at the prompt. + Update git-add.txt according to the new possibilities of 'git add -p'. + +Michael J Gruber (1): + remote.c: use shorten_unambiguous_ref + +Michał Kiedrowicz (3): + tests: test applying criss-cross rename patch + builtin-apply: keep information about files to be deleted + Documentation: boolean value may be given by on/off + +Nanako Shiraishi (1): + git-am: teach git-am to apply a patch to an unborn branch + +Nguyễn Thái Ngọc Duy (3): + get_local_heads(): do not return random pointer if there is no head + attr: add GIT_ATTR_INDEX "direction" + archive: do not read .gitattributes in working directory + +Paul Bolle (1): + imap-send: use correct configuration variable in documentation + +Pierre Habouzit (1): + hook/update: example of how to prevent branch creation + +René Scharfe (2): + archive tests: do not use .gitattributes in working directory + archive test: attributes + +Sebastian Pipping (1): + difftool/mergetool: add diffuse as merge and diff tool + +Thomas Jarosch (1): + Fix buffer overflow in config parser + +Ulrich Windl (1): + git-apply: fix option description + + +Version v1.6.3-rc0; changes since v1.6.2.5: +------------------------------------------- + +Alex Riesen (4): + disable post-checkout test on Cygwin + Produce a nicer output in case of sha1_object_info failures in ls-tree -l + Microoptimize strbuf_cmp + Improve error message about fetch into current branch + +Ali Gholami Rudi (2): + builtin-clone.c: make junk_pid static + builtin-clone.c: no need to strdup for setenv + +Amos King (2): + Do not name "repo" struct "remote" in push_http.c + http-push.c: use a faux remote to pass to http_init + +Arjen Laarhoven (2): + Clean up use of ANSI color sequences + builtin-branch.c: Rename branch category color names + +Arto Jonsson (1): + bash completion: add options for 'git fsck' + +Ben Jackson (2): + git-svn: Add per-svn-remote ignore-paths config + git-svn: Save init/clone --ignore-paths in config + +Ben Walton (8): + configure: ensure settings from user are also usable in the script + configure: reorganize flow of argument checks + configure: add macros to stash FLAG variables + configure: wrap some library tests with GIT_STASH_FLAGS + configure: asciidoc version test cleanup + configure: make iconv tests aware of user arguments + configure: rework pthread handling to allow for user defined flags + documentation: Makefile accounts for SHELL_PATH setting + +Benjamin Kramer (4): + Remove unused function scope local variables + Move local variables to narrower scopes + Remove unused assignments + Fix various dead stores found by the clang static analyzer + +Björn Steinbrink (1): + Mailmap: Allow empty email addresses to be mapped + +Boris Byk (1): + git-svn: speed up blame command + +Brandon Casey (1): + builtin-send-pack.c: avoid empty structure initialization + +Brian Gernhardt (2): + Create USE_ST_TIMESPEC and turn it on for Darwin + Makefile: Set compiler switch for USE_NSEC + +Carlos Manuel Duclos Vergara (1): + git-archive: add --output= to send output to a file + +Carlos Rica (1): + config: test for --replace-all with one argument and fix documentation. + +Chris Johnsen (13): + git-push.txt: describe how to default to pushing only current branch + Documentation: remove extra quoting/emphasis around literal texts + Documentation/Makefile: make most operations "quiet" + Documentation/Makefile: break up texi pipeline + Documentation: move callouts.xsl to manpage-{base,normal}.xsl + Documentation: use parametrized manpage-base.xsl with manpage-{1.72,normal}.xsl + Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff + Documentation: move quieting params into manpage-base.xsl + Documentation: move "spurious .sp" code into manpage-base.xsl + Documentation: asciidoc.conf: always use for [blocktext] + Documentation: asciidoc.conf: fix verse block with block titles + Documentation: option to render literal text as bold for manpages + Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set + +Christian Couder (24): + rev-list: estimate number of bisection step left + log-tree: fix patch filename computation in "git format-patch" + quote: implement "sq_dequote_many" to unwrap many args in one string + quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array + refs: add "for_each_ref_in" function to refactor "for_each_*_ref" functions + rev-list: make "bisect_list" variable local to "cmd_rev_list" + rev-list: move bisect related code into its own file + rev-list: move code to show bisect vars into its own function + rev-list: make "show_bisect_vars" non static + rev-list: pass "revs" to "show_bisect_vars" + sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1 + patch-ids: use the new generic "sha1_pos" function to lookup sha1 + bisect: improve error message when branch checkout fails + rev-list: call new "filter_skip" function + bisect: use the new generic "sha1_pos" function to lookup sha1 + bisect--helper: implement "git bisect--helper" + bisect: implement "read_bisect_paths" to read paths in "$GIT_DIR/BISECT_NAMES" + bisect: use "bisect--helper" and remove "filter_skipped" function + t6030: test bisecting with paths + rev-list: pass "int flags" as last argument of "show_bisect_vars" + bisect--helper: string output variables together with "&&" + list-objects: add "void *data" parameter to show functions + rev-list: remove last static vars used in "show_commit" + rev-list: add "int bisect_show_flags" in "struct rev_list_info" + +Dan McGee (1): + Update delta compression message to be less misleading + +Daniel Barkalow (8): + Make clone parse the default refspec with the normal code + Use a single function to match names against patterns + Use the matching function to generate the match results + Keep '*' in pattern refspecs + Support '*' in the middle of a refspec + Use a common function to get the pretty name of refs + Move push matching and reporting logic into transport.c + Include log_config module in apache.conf + +David Aguilar (1): + contrib/difftool: use a separate config namespace for difftool commands + +Deskin Miller (1): + add -i: revisit hunk on editor failure + +Elijah Newren (3): + git-filter-branch: avoid collisions with variables in eval'ed commands + Correct missing SP characters in grammar comment at top of fast-import.c + fast-export: Avoid dropping files from commits + +Emil Sit (1): + config.txt: Describe special 'none' handling in core.gitProxy. + +Eric Wong (1): + git-svn: fix ls-tree usage with dash-prefixed paths + +Erik Faye-Lund (5): + connect.c: remove a few globals by using git_config callback data + test-suite: adding a test for fast-export with tag variants + builtin-fast-export.c: turn error into warning + builtin-fast-export.c: fix crash on tagged trees + builtin-fast-export.c: handle nested tags + +Eugene Letuchy (1): + Make git blame's date output format configurable, like git log + +Felipe Contreras (14): + config: Add new option to open an editor. + git config: codestyle cleanups + git_config(): not having a per-repo config file is not an error + git config: trivial rename in preparation for parseopt + git config: reorganize get_color* + git config: reorganize to use parseopt + git config: don't allow multiple config file locations + git config: don't allow multiple variable types + git config: don't allow extra arguments for -e or -l. + git config: don't allow --get-color* and variable type + Add tests for git log --pretty, --format and --oneline. + user-manual: remove some git-foo usage + docbook: change css style + user-manual: the name of the hash function is SHA-1, not sha1 + +Finn Arne Gangstad (7): + New config push.default to decide default behavior for push + Display warning for default git push with no push.default config + builtin-remote.c: Split out prune_remote as a separate function. + git remote update: New option --prune + git remote update: Report error for non-existing groups + remote: New function remote_is_configured() + git remote update: Fallback to remote if group does not exist + +Giuseppe Bilotta (1): + import-tars: separate author from committer + +Heiko Voigt (3): + Add warning about known issues to documentation of cvsimport + Cleanup warning about known issues in cvsimport documentation + Add configuration variable for sign-off to format-patch + +Janos Laube (1): + MinGW: implement mmap + +Jason Merrill (1): + git-svn: add fetch --parent option + +Jay Soffian (30): + builtin-branch: improve output when displaying remote branches + move duplicated get_local_heads() to remote.c + move duplicated ref_newer() to remote.c + move locate_head() to remote.c + remote: simplify guess_remote_head() + remote: make copy_ref() perform a deep copy + remote: let guess_remote_head() optionally return all matches + remote: make match_refs() copy src ref before assigning to peer_ref + remote: make match_refs() not short-circuit + string-list: new for_each_string_list() function + builtin-remote: refactor duplicated cleanup code + builtin-remote: remove unused code in get_ref_states + builtin-remote: rename variables and eliminate redundant function call + builtin-remote: make get_remote_ref_states() always populate states.tracked + builtin-remote: fix two inconsistencies in the output of "show " + builtin-remote: teach show to display remote HEAD + builtin-remote: add set-head subcommand + builtin-remote: new show output style + builtin-remote: new show output style for push refspecs + send-email: add --confirm option and configuration setting + bash completion: fix completion issues with fetch, pull, and push + bash completion: refactor --strategy completion + bash completion: teach fetch, pull, and push to complete their options + send-email: refactor and ensure prompting doesn't loop forever + send-email: add tests for refactored prompting + send-email: don't attempt to prompt if tty is closed + send-email: ask_default should apply to all emails, not just the first + send-email: correct two tests which were going interactive + send-email: ensure quoted addresses are rfc2047 encoded + send-email: fix nasty bug in ask() function + +Jeff King (26): + valgrind: ignore ldso and more libz errors + branch: clean up repeated strlen + add basic branch display tests + test scripts: refactor start_httpd helper + add basic http clone/fetch tests + refactor find_ref_by_name() to accept const list + remote: make guess_remote_head() use exact HEAD lookup if it is available + clone: run post-checkout hook when checking out + improve missing repository error message + config: set help text for --bool-or-int + t3000: use test_cmp instead of diff + ls-files: fix broken --no-empty-directory + ls-files: require worktree when --deleted is given + make oneline reflog dates more consistent with multiline format + remote: improve sorting of "configure for git push" list + Makefile: turn on USE_ST_TIMESPEC for FreeBSD + t0060: fix whitespace in "wc -c" invocation + tests: remove exit after test_done call + for-each-ref: refactor get_short_ref function + for-each-ref: refactor refname handling + for-each-ref: add "upstream" format field + make get_short_ref a public function + branch: show upstream branch when double verbose + Makefile: allow building without perl + tests: skip perl tests if NO_PERL is defined + add tests for remote groups + +Jens Lehmann (1): + githooks documentation: post-checkout hook is also called after clone + +Jeremy White (2): + Enable setting attach as the default in .gitconfig for git-format-patch. + imap.preformattedHTML to tell Thunderbird to send non-flowed text + +Johannes Schindelin (23): + Add valgrind support in test scripts + Valgrind support: check for more than just programming errors + test-lib.sh: optionally output to test-results/$TEST.out, too + t/Makefile: provide a 'valgrind' target + Add a script to coalesce the valgrind outputs + Tests: let --valgrind imply --verbose and --tee + test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH + valgrind: do not require valgrind 3.4.0 or newer + Avoid segfault with 'git branch' when the HEAD is detached + Turn the flags in struct dir_struct into a single variable + git config: trivial cleanup for editor action + rebase -i: avoid 'git reset' when possible + MinGW: 64-bit file offsets + Brown paper bag fix for MinGW 64-bit stat + Add an (optional, since expensive) test for >2gb clones + MinGW: fix diff --no-index /dev/null ... + winansi: support ESC [ K (erase in line) + test: do not LoadModule log_config_module unconditionally + test-lib: write test results to test-results/- + gc --aggressive: make it really aggressive + t7300: fix clean up on Windows + Guard a few Makefile variables against user environments + git-svn: always initialize with core.autocrlf=false + +Johannes Sixt (30): + recv_sideband: Bands #2 and #3 always go to stderr + test-suite: Make test script numbers unique + t9400, t9401: Do not force hard-linked clone + test suite: Use 'say' to say something instead of 'test_expect_success' + Call 'say' outside test_expect_success + test-lib: Replace uses of $(expr ...) by POSIX shell features. + test-lib: Simplify test counting. + test-lib: Introduce test_chmod and use it instead of update-index --chmod + t2200, t7004: Avoid glob pattern that also matches files + t5300, t5302, t5303: Do not use /dev/zero + t5602: Work around path mangling on MSYS + test-lib: Work around incompatible sort and find on Windows + test-lib: Work around missing sum on Windows + Tests on Windows: $(pwd) must return Windows-style paths + t0050: Check whether git init detected symbolic link support correctly + test-lib: Infrastructure to test and check for prerequisites + t3600: Use test prerequisite tags + Skip tests that fail if the executable bit is not handled by the filesystem + t5302: Use prerequisite tags to skip 64-bit offset tests + t9100, t9129: Use prerequisite tags for UTF-8 tests + Use prerequisite tags to skip tests that depend on symbolic links + t0060: Fix tests on Windows + Skip tests that require a filesystem that obeys POSIX permissions + t3700: Skip a test with backslashes in pathspec + Use prerequisites to skip tests that need unzip + t7004: Use prerequisite tags to skip tests that need gpg + t5503: GIT_DEBUG_SEND_PACK is not supported on MinGW + MinGW: Quote arguments for subprocesses that contain a single-quote + t7005-editor: Use $SHELL_PATH in the editor scripts + t7502-commit: Skip SIGTERM test on Windows + +John Tapsell (4): + Modify description file to say what this file is + Google has renamed the imap folder + Improve error message for git-filter-branch + Documentation - More examples for git bisect + +Junio C Hamano (28): + git-blame: refactor code to emit "porcelain format" output + blame: show "previous" information in --porcelain/--incremental format + Make git-clone respect branch.autosetuprebase + Draft release notes: Carry forward the warning for behaviour changes + Update draft release notes to 1.6.3 + builtin-remote.c: no "commented out" code, please + Not all systems use st_[cm]tim field for ns resolution file timestamp + grep: cast printf %.*s "precision" argument explicitly to int + http.c: style cleanups + Improve "git branch --tracking" output + http_init(): Fix config file parsing + http authentication via prompts + Update release notes to 1.6.3 + http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient versions of cURL + Read attributes from the index that is being checked out + Update draft release notes to 1.6.3 + http tests: Darwin is not that special + Rename interpret/substitute nth_last_branch functions + strbuf_branchname(): a wrapper for branch name shorthands + check-ref-format --branch: give Porcelain a way to grok branch shorthand + Fix branch -m @{-1} newname + strbuf_check_branch_ref(): a helper to check a refname for a branch + check_ref_format(): tighten refname rules + Update draft release notes to 1.6.3 + Update draft release notes to 1.6.3 + sha1-lookup: fix up the assertion message + Update draft release notes to 1.6.3 + GIT 1.6.3-rc0 + +Junio Hamano (1): + Speed up reflog pruning of unreachable commits + +Keith Cascio (2): + Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking + Fix neglect of diff_setup()/diff_setup_done() symmetry. + +Kevin Ballard (1): + builtin-push.c: Fix typo: "anythig" -> "anything" + +Kevin McConnell (1): + Add --staged to bash completion for git diff + +Kjetil Barvik (18): + lstat_cache(): small cleanup and optimisation + lstat_cache(): generalise longest_match_lstat_cache() + lstat_cache(): swap func(length, string) into func(string, length) + unlink_entry(): introduce schedule_dir_for_removal() + create_directories(): remove some memcpy() and strchr() calls + write_entry(): cleanup of some duplicated code + write_entry(): use fstat() instead of lstat() when file is open + show_patch_diff(): remove a call to fstat() + lstat_cache(): print a warning if doing ping-pong between cache types + check_updates(): effective removal of cache entries marked CE_REMOVE + fix compile error when USE_NSEC is defined + make USE_NSEC work as expected + verify_uptodate(): add ce_uptodate(ce) test + write_index(): update index_state->timestamp after flushing to disk + stat_tracking_info(): only count real commits + Record ns-timestamps if possible, but do not use it without USE_NSEC + checkout bugfix: use stat.mtime instead of stat.ctime in two places + Revert "lstat_cache(): print a warning if doing ping-pong between cache types" + +Kristian Amlie (1): + Add a test for checking whether gitattributes is honored by checkout. + +Linus Torvalds (2): + Clean up reflog unreachability pruning decision + Allow users to un-configure rename detection + +Marius Storm-Olsen (2): + Add bare repository indicator for __git_ps1 + Fixup: Add bare repository indicator for __git_ps1 + +Markus Heidelberg (1): + add --html-path to get the location of installed HTML docs + +Martin Storsjö (1): + Allow curl to rewind the read buffers + +Matthieu Moy (2): + git-send-email.txt: clarify which options take an argument. + git-rev-list.txt: make ascii markup uniform with other pages. + +Michael Hendricks (1): + format-patch: add arbitrary email headers + +Michael J Gruber (6): + Typo and language fixes for git-checkout.txt + test-lib.sh: Test for presence of git-init in the right path. + test-lib.sh: Allow running the test suite against installed git + git-branch.txt: document -f correctly + Test for local branches being followed with --track + Make local branches behave like remote branches when --tracked + +Michael Lai (1): + git-svn: support intermediate paths when matching tags/branches + +Michele Ballabio (6): + apply: consistent spelling of "don't" + apply: hide unused options from short help + git log: avoid segfault with --all-match + document --force-rebase + rebase: add options passed to git-am + rebase: fix typo (force_rebas -> force-rebas) + +Mike Hommey (1): + Replace ",<,>,& with their respective XML entities in DAV requests + +Miklos Vajna (11): + parse-opt: migrate builtin-ls-files. + Tests: use test_cmp instead of diff where possible + http-push: using error() and warning() as appropriate + builtin-apply: use warning() instead of fprintf(stderr, "warning: ") + builtin-checkout: use warning() instead of fprintf(stderr, "warning: ") + builtin-fetch-pack: use warning() instead of fprintf(stderr, "warning: ") + builtin-init-db: use warning() instead of fprintf(stderr, "warning: ") + builtin-rm: use warning() instead of fprintf(stderr, "warning: ") + builtin-show-branch: use warning() instead of fprintf(stderr, "warning: ") + builtin-show-ref: use warning() instead of fprintf(stderr, "warning: ") + refs: use warning() instead of fprintf(stderr, "warning: ") + +Nanako Shiraishi (4): + Add --format that is a synonym to --pretty + Give short-hands to --pretty=tformat:%formatstring + Add --oneline that is a synonym to "--pretty=oneline --abbrev-commit" + Documentation/git.txt: GIT 1.6.2.2 has been out for a while + +Nate Case (1): + format-patch: Respect --quiet option + +Nguyễn Thái Ngọc Duy (1): + grep: prefer builtin over external one when coloring results + +Pete Wyckoff (1): + git-p4: remove tabs from usermap file + +Petr Kodl (2): + MinGW: a helper function that translates Win32 API error codes + MinGW: a hardlink implementation + +Ramsay Allan Jones (1): + git-instaweb: fix lighttpd configuration on cygwin + +René Scharfe (12): + grep: micro-optimize hit collection for AND nodes + grep: remove grep_opt argument from match_expr_eval() + grep: add pmatch and eflags arguments to match_one_pattern() + grep: color patterns in output + grep: add support for coloring with external greps + parseopt: add PARSE_OPT_KEEP_UNKNOWN + parseopt: add PARSE_OPT_NO_INTERNAL_HELP + parseopt: make usage optional + archive: use parseopt for local-only options + parseopt: document KEEP_ARGV0, KEEP_UNKNOWN, NO_INTERNAL_HELP + parseopt: prevent KEEP_UNKNOWN and STOP_AT_NON_OPTION from being used together + pickaxe: count regex matches only once + +SZEDER Gábor (1): + rerere: remove duplicated functions + +Santi Béjar (4): + Documentation: enhance branch..{remote,merge} + Documentation: push.default applies to all remotes + Documentation: branch.*.merge can also affect 'git-push' + Documentation: Introduce "upstream branch" + +Shawn O. Pearce (1): + Don't permit ref/branch names to end with ".lock" + +Simon Arlott (2): + git-svn: don't output git commits in quiet mode + git-svn: add a double quiet option to hide git commits + +Stephen Boyd (11): + git-send-email.txt: describe --compose better + pretty.c: add %f format specifier to format_commit_message() + format-patch: construct patch filename in one function + format-patch: pass a commit to reopen_stdout() + format-patch: move get_patch_filename() into log-tree + format-patch: --attach/inline uses filename instead of SHA1 + format-patch: --numbered-files and --stdout aren't mutually exclusive + completion: add --annotate option to send-email + completion: add --cc and --no-attachment option to format-patch + completion: add --thread=deep/shallow to format-patch + format_sanitized_subject: Don't trim past initial length of strbuf + +Sverre Rabbelier (1): + Teach rebase to rebase even if upstream is up to date + +Tay Ray Chuan (1): + http.c: use strbuf API in quote_ref_url + +Ted Pavlic (4): + completion: For consistency, change "git rev-parse" to __gitdir calls + completion: Use consistent if [...] convention, not "test" + completion: Better __git_ps1 support when not in working directory + completion: More fixes to prevent unbound variable errors + +Teemu Likonen (1): + bash completion: add --format= and --oneline options for "git log" + +Thomas Rast (13): + format-patch: threading test reactivation + Support coverage testing with GCC/gcov + Test that diff can read from stdin + Test diff --dirstat functionality + Test log --graph + Test fsck a bit harder + Test log --decorate + Test rev-list --parents/--children + Test git-patch-id + format-patch: track several references + format-patch: thread as reply to cover letter even with in-reply-to + format-patch: support deep threading + Documentation: filter-branch: show --ignore-unmatch in main index-filter example + +Todd Zullinger (1): + bash completion: Update 'git am' options + +Tor Arne Vestbø (2): + git-rebase: Add --stat and --no-stat for producing diffstat on rebase + git-pull: Allow --stat and --no-stat to be used with --rebase + +Wesley J. Landaker (1): + Documentation: git-svn: fix trunk/fetch svn-remote key typo + +Wincent Colaiuta (2): + Grammar fixes to "merge" and "patch-id" docs + Grammar fix for "git merge" man page + + +Version v1.6.2.5; changes since v1.6.2.4: +----------------------------------------- + +Allan Caffee (2): + builtin-merge: fix a typo in an error message + Documentation: fix a grammatical error in api-builtin.txt + +Frank Lichtenheld (1): + gitcvs-migration: Link to git-cvsimport documentation + +Johannes Schindelin (1): + Fix off-by-one in read_tree_recursive + +Junio C Hamano (7): + read-tree A B: do not corrupt cache-tree + Move prime_cache_tree() to cache-tree.c + read-tree -m A B: prime cache-tree from the switched-to tree + checkout branch: prime cache-tree fully + diff -c -p: do not die on submodules + GIT 1.6.1.4 + GIT 1.6.2.5 + +Linus Torvalds (3): + process_{tree,blob}: show objects without buffering + show_object(): push path_name() call further down + grep: fix segfault when "git grep '('" is given + +Michał Kiedrowicz (3): + tests: test applying criss-cross rename patch + builtin-apply: keep information about files to be deleted + tests: make test-apply-criss-cross-rename more robust + +Nicolas Pitre (1): + honor repack.usedeltabaseoffset when fetching packs + +Stephen Boyd (1): + test-genrandom: Add newline to usage string + +Wincent Colaiuta (1): + git add -p: add missing "q" to patch prompt + + +Version v1.6.2.4; changes since v1.6.2.3: +----------------------------------------- + +Björn Steinbrink (1): + tree_entry_interesting: a pathspec only matches at directory boundary + +Clemens Buchacher (3): + add tests for merging with submodules + update cache for conflicting submodule entries + simplify output of conflicting merge + +Erik Faye-Lund (4): + test-suite: adding a test for fast-export with tag variants + builtin-fast-export.c: turn error into warning + builtin-fast-export.c: fix crash on tagged trees + builtin-fast-export.c: handle nested tags + +Frank Lichtenheld (1): + init: Do not segfault on big GIT_TEMPLATE_DIR environment variable + +Jeff King (2): + doc/gitattributes: clarify location of config text + add-interactive: refactor mode hunk handling + +Johan Herland (1): + Update docs on behaviour of 'core.sharedRepository' and 'git init --shared' + +Johannes Schindelin (1): + Fix 'git checkout ' to update the index + +Johannes Sixt (1): + t1301-shared-repo: fix forced modes test + +Junio C Hamano (3): + match_tree_entry(): a pathspec only matches at directory boundaries + Describe fixes since 1.6.2.3 + GIT 1.6.2.4 + +Junio Hamano (1): + Speed up reflog pruning of unreachable commits + +Linus Torvalds (1): + Clean up reflog unreachability pruning decision + +Markus Heidelberg (2): + doc/git-daemon: add missing arguments to options + doc/git-daemon: add missing arguments to max-connections option + +Matthieu Moy (2): + git add -p: new "quit" command at the prompt. + Update git-add.txt according to the new possibilities of 'git add -p'. + +Nguyễn Thái Ngọc Duy (1): + Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins + +Paul Bolle (1): + imap-send: use correct configuration variable in documentation + +Thomas Jarosch (1): + Fix buffer overflow in config parser + +Ulrich Windl (1): + git-apply: fix option description + + +Version v1.6.2.3; changes since v1.6.2.2: +----------------------------------------- + +Björn Steinbrink (1): + process_{tree,blob}: Remove useless xstrdup calls + +Brandon Casey (6): + t7700-repack: add two new tests demonstrating repacking flaws + git-repack.sh: don't use --kept-pack-only option to pack-objects + pack-objects: only repack or loosen objects residing in "local" packs + Remove --kept-pack-only option and associated infrastructure + t7700: demonstrate repack flaw which may loosen objects unnecessarily + pack-objects: don't loosen objects available in alternate or kept packs + +Dan McGee (1): + git-repack: use non-dashed update-server-info + +Daniel Cheng (aka SDiZ) (1): + State the effect of filter-branch on graft explicitly + +Jari Aalto (1): + Change double quotes to single quotes in message + +Jason Merrill (1): + Documentation: clarify .gitattributes search + +Jeff King (2): + t1301: loosen test for forced modes + commit: abort commit if interactive add failed + +Johan Herland (1): + Move chmod(foo, 0444) into move_temp_to_file() + +Julien Danjou (1): + git submodule: fix usage line + +Junio C Hamano (12): + git-repack: resist stray environment variable + has_sha1_pack(): refactor "pretend these packs do not exist" interface + has_sha1_kept_pack(): take "struct rev_info" + Consolidate ignore_packed logic more + Simplify is_kept_pack() + is_kept_pack(): final clean-up + diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged + "core.sharedrepository = 0mode" should set, not loosen + move_temp_to_file(): do not forget to chmod() in "Coda hack" codepath + set_shared_perm(): sometimes we know what the final mode bits should look like + Start 1.6.2.3 preparation + GIT 1.6.2.3 + +Linus Torvalds (1): + process_{tree,blob}: Remove useless xstrdup calls + +Markus Heidelberg (1): + doc/git-pack-refs: fix two grammar issues + +Matthieu Moy (3): + git-checkout.txt: fix incorrect statement about HEAD and index + git-checkout.txt: clarify that applies when no path is given. + git-pull.sh: better warning message for "git pull" on detached head. + + +Version v1.6.2.2; changes since v1.6.2.1: +----------------------------------------- + +Allan Caffee (1): + Documentation: update graph api example. + +Brandon Casey (1): + git-branch: display "was sha1" on branch deletion rather than just "sha1" + +Carlo Marcelo Arenas Belon (1): + documentation: update cvsimport description of "-r" for recent clone + +Daniel Barkalow (1): + Give error when no remote is configured + +Daniel Cheng (aka SDiZ) (1): + Fix bash completion in path with spaces + +David Aguilar (1): + everyday: use the dashless form of git-init + +David J. Mellor (12): + Documentation: minor grammatical fixes in git-archive.txt. + Documentation: reword the "Description" section of git-bisect.txt. + Documentation: minor grammatical fixes in git-blame.txt. + Documentation: minor grammatical fixes in git-branch.txt. + Documentation: reworded the "Description" section of git-bisect.txt. + Documentation: reword example text in git-bisect.txt. + Documentation: remove some uses of the passive voice in git-bisect.txt + Documentation: minor grammatical fixes and rewording in git-bundle.txt + Documentation: minor grammatical fixes in git-cat-file.txt + Documentation: minor grammatical fixes in git-check-attr.txt + Documentation: minor grammatical fix in git-check-ref-format.txt + Documentation: Remove spurious uses of "you" in git-bisect.txt. + +Emil Sit (1): + test-lib: Clean up comments and Makefile. + +Eric Wong (1): + git-svn: fix ls-tree usage with dash-prefixed paths + +Holger Weiß (1): + Documentation: Remove an odd "instead" + +Jeff King (3): + doc: clarify how -S works + ls-files: require worktree when --deleted is given + fix portability problem with IS_RUN_COMMAND_ERR + +Johannes Schindelin (4): + rsync transport: allow local paths, and fix tests + Smudge the files fed to external diff and textconv + import-zips: fix thinko + mailmap: resurrect lower-casing of email addresses + +Johannes Sixt (2): + Propagate --exec-path setting to external commands via GIT_EXEC_PATH + diff --no-index: Do not generate patch output if other output is requested + +Junio C Hamano (6): + read-tree A B C: do not create a bogus index and do not segfault + Remove total confusion from git-fetch and git-push + blame: read custom grafts given by -S before calling setup_revisions() + Update draft release notes to 1.6.2.2 + Update draft release notes to 1.6.2.2 + GIT 1.6.2.2 + +Linus Torvalds (1): + close_sha1_file(): make it easier to diagnose errors + +Michael J Gruber (2): + git submodule: Add test cases for git submodule add + git submodule: Fix adding of submodules at paths with ./, .. and // + +Nico -telmich- Schottelius (1): + git-tag(1): add hint about commit messages + +Nicolas Pitre (1): + avoid possible overflow in delta size filtering computation + +René Scharfe (3): + diffcore-pickaxe: use memmem() + optimize compat/ memmem() + pickaxe: count regex matches only once + +Shawn O. Pearce (1): + Increase the size of the die/warning buffer to avoid truncation + +Stephen Boyd (1): + format-patch: --numbered-files and --stdout aren't mutually exclusive + +Thomas Rast (4): + send-email: respect in-reply-to regardless of threading + send-email: test --no-thread --in-reply-to combination + Documentation: format-patch --root clarifications + bash completion: only show 'log --merge' if merging + + +Version v1.6.2.1; changes since v1.6.2: +--------------------------------------- + +Chris Johnsen (1): + builtin-revert.c: release index lock when cherry-picking an empty commit + +Christian Couder (1): + Documentation: fix badly indented paragraphs in "--bisect-all" description + +Elijah Newren (1): + Ensure proper setup of git_dir for git-hash-object + +Finn Arne Gangstad (1): + Support "\" in non-wildcard exclusion entries + +Jay Soffian (4): + send-email: allow send-email to run outside a repo + send-email: handle multiple Cc addresses when reading mbox message + send-email: --suppress-cc improvements + send-email: don't create temporary compose file until it is needed + +Jeff King (3): + never fallback relative times to absolute + t1300: use test_must_fail as appropriate + document config --bool-or-int + +John Tapsell (1): + Make the 'lock file' exists error more informative + +Junio C Hamano (4): + git-add -i/-p: learn to unwrap C-quoted paths + Beginning of 1.6.2 maintenance track + Update draft release notes for 1.6.2.1 + GIT 1.6.2.1 + +René Scharfe (1): + cleanup: add isascii() + + +Version v1.6.2; changes since v1.6.2-rc2: +----------------------------------------- + +Ben Walton (1): + git-svn - return original format_svn_date semantics + +Christian Couder (2): + bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped + bisect: fix another instance of eval'ed string + +Danijel Tasov (1): + added missing backtick in git-apply.txt + +David J. Mellor (4): + Documentation: minor grammatical fixes. + Documentation: minor grammatical fixes. + Documentation: minor grammatical fixes. + Documentation: minor grammatical fixes. + +Eric Wong (1): + git-svn: disable broken symlink workaround by default + +Jay Soffian (1): + t5540-http-push.sh: avoid non-portable grep -P + +Johannes Sixt (1): + t3400-rebase: Move detached HEAD check earlier + +Junio C Hamano (2): + git-am: make --abort less dangerous + GIT 1.6.2 + +Michael J Gruber (1): + git-am: Keep index in case of abort with dirty index + +Mike Ralphson (4): + Fix odb_mkstemp() on AIX + Documentation: Typos / spelling fixes in RelNotes + Documentation: Expand a couple of abbreviations + Documentation: Typo / spelling / formatting fixes + +Paul Mackerras (1): + gitk: Fix possible infinite loop and display corruption + +Roy Lee (1): + Documentation/git-archive.txt: Note attributes + +Todd Zullinger (1): + git-rebase: Update --whitespace documentation + + +Version v1.6.2-rc2; changes since v1.6.2-rc1: +--------------------------------------------- + +Abhijit Menon-Sen (1): + Convert git-* invocations to "git *" in the svnimport example. + +Alexandre Julliard (3): + git.el: Make sure that file lists are sorted as they are created. + git.el: Improve the confirmation message on remove and revert. + Add a README in the contrib/emacs directory. + +Allan Caffee (1): + trace: Fixed a minor typo in an error message. + +Ben Walton (1): + git-svn fix to avoid using strftime %z + +Brian Gernhardt (1): + git-svn: Create leading directories in create-ignore + +Christian Couder (1): + README: fix path to "gitcvs-migration.txt" and be more consistent + +Eric Wong (1): + git-svn: fix delete+add branch tracking with empty files + +Felipe Contreras (2): + git add: trivial codestyle cleanup + sha1_file.c: fix typo + +Gerrit Pape (3): + Documentation/git-push: --all, --mirror, --tags can not be combined + Install builtins with the user and group of the installing personality + git-quiltimport: preserve standard input to be able to read user input + +Giuseppe Bilotta (1): + gitweb: fix wrong base URL when non-root DirectoryIndex + +Jay Soffian (2): + disallow providing multiple upstream branches to rebase, pull --rebase + Allow HTTP tests to run on Darwin + +Johannes Schindelin (2): + Introduce the function strip_path_suffix() + system_path(): simplify using strip_path_suffix(), and add suffix "git" + +Johannes Sixt (1): + gitattributes.txt: Path matching rules are explained in gitignore.txt + +Junio C Hamano (4): + git-svn: fix parsing of timestamp obtained from svn + tests: fix "export var=val" + Make sure objects/pack exists before creating a new pack + GIT 1.6.2-rc2 + +Lars Noschinski (1): + filter-branch -d: Export GIT_DIR earlier + +Linus Torvalds (1): + Support 'raw' date format + +Marc Branchaud (1): + Docs: Expand explanation of the use of + in git push refspecs. + +Marcel M. Cary (2): + gitweb: Fix warnings with override permitted but no repo override + gitweb: Hyperlink multiple git hashes on the same commit message line + +Matthieu Moy (2): + Document git blame --reverse. + More friendly message when locking the index fails. + +Michael J Gruber (1): + Fix typo in contrib/examples/git-svnimport.txt + +Michael Spang (1): + Skip timestamp differences for diff --no-index + +Pete Wyckoff (1): + git-p4: avoid syncing duplicate changes + +Peter Oberndorfer (1): + git-svn: read the dcommit url from the config file on a per remote basis + +SZEDER Gábor (2): + bash: add missing 'git merge' options + bash: update 'git svn' options + +Thomas Rast (2): + bash completion: refactor common log, shortlog and gitk options + bash completion: only show 'log --merge' if merging + +Todd Zullinger (1): + Documentation: Note file formats send-email accepts + + +Version v1.6.2-rc1; changes since v1.6.2-rc0: +--------------------------------------------- + +Alexandre Julliard (1): + Describe notable git.el changes in the release notes + +Anton Gyllenberg (1): + test case for regression caused by git-svn empty symlink fix + +Christian Couder (1): + rev-list: fix showing distance when using --bisect-all + +Deskin Miller (1): + git-svn: Print revision while searching for earliest use of path + +Dévai Tamás (1): + git-svn: Fix for rewriteRoot URL containing username. + +Elijah Newren (1): + fast-export: ensure we traverse commits in topological order + +Eric Kidd (1): + filter-branch: Add more error-handling + +Eric Wong (2): + git-svn: allow disabling expensive broken symlink checks + git-svn: fix broken symlink workaround when switching branches + +Fabian Franz (1): + submodule: add --no-fetch parameter to update command + +Jacob Helwig (1): + Add 'rm -f' equivalent to 'git rm' example of filter-branch --index-filter + +Jakub Narebski (1): + gitweb: Better regexp for SHA-1 committag match + +Jeff King (1): + symbolic-ref: allow refs/ in HEAD + +Jeremy White (1): + Update documentation to add further information about using Thunderbird with git-imap-send. + +Johannes Schindelin (4): + Let ls-files strip trailing slashes in submodules' paths + submodule: warn about non-submodules + Add two extra tests for git rebase + gc: make --prune useful again by accepting an optional parameter + +Johannes Sixt (4): + Make test-path-utils more robust against incorrect use + Move sanitary_path_copy() to path.c and rename it to normalize_path_copy() + Test and fix normalize_path_copy() + Remove unused normalize_absolute_path() + +Junio C Hamano (16): + Revert "Merge branch 'js/notes'" + Modernize t5400 test script + remote prune: warn dangling symrefs + Warn use of "origin" when remotes/origin/HEAD is dangling + Drop double-semicolon in C + receive-pack: receive.denyDeleteCurrent + builtin-receive-pack.c: do not initialize statics to 0 + revision traversal and pack: notice and die on missing commit + Squelch overzealous "ignoring dangling symref" in an empty repository + Make repack less likely to corrupt repository + Prepare for 1.6.1.4. + Revert "validate_headref: tighten ref-matching to just branches" + Install the default "master" branch configuration after cloning a void + Teach the "@{-1} syntax to "git branch" + Teach @{-1} to git merge + RelNotes Update + +Keith Cascio (1): + Remove redundant bit clears from diff_setup() + +Lars Hjemli (1): + tree.c: allow read_tree_recursive() to traverse gitlink entries + +Marcel M. Cary (1): + git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree + +Marius Storm-Olsen (5): + Add mailmap.file as configurational option for mailmap location + Add find_insert_index, insert_at_index and clear_func functions to string_list + Add map_user() and clear_mailmap() to mailmap + Change current mailmap usage to do matching on both name and email of author/committer. + Move mailmap documentation into separate file + +Mark Burton (1): + git-rebase.txt: --interactive does not work with --whitespace + +Matt Kraai (1): + bash-completion: Complete the values of color.interactive, color.ui, color.pager + +Matt McCutchen (1): + gitweb: add $prevent_xss option to prevent XSS by repository content + +Michael J Gruber (1): + Fix the installation path for html documentation + +Nazri Ramliy (1): + Bugfix: GIT_EXTERNAL_DIFF with more than one changed files + +Pat Notz (1): + Fix contrib/hooks/post-receive-email for new duplicate branch + +René Scharfe (2): + Fix GIT_CEILING_DIRECTORIES on Windows + builtin-receive-pack.c: fix compiler warnings about format string + +SZEDER Gábor (3): + Move 'rev-parse --git-dir' test to t1500 + t1500: more 'git rev-parse --git-dir' tests + bash: fix misspelled 'git svn' option + +Sam Vilain (1): + git-svn: abstract out a block into new method other_gs() + +Santi Béjar (1): + doc/bundle: Use the more conventional suffix '.bundle' + +Shawn O. Pearce (2): + Clear the delta base cache during fast-import checkpoint + Clear the delta base cache if a pack is rebuilt + +Sitaram Chamarty (1): + Documentation: clarify commits affected by gitk --merge + +Stephan Beyer (3): + add -p: get rid of Git.pm warnings about unitialized values + Makefile: resort filenames alphabetically + Generalize and libify index_is_dirty() to index_differs_from(...) + +Tay Ray Chuan (1): + use a hash of the lock token as the suffix for PUT/MOVE + +Ted Pavlic (2): + completion: Fix GIT_PS1_SHOWDIRTYSTATE to prevent unbound variable errors. + completion: Get rid of tabbed indentation in comments. Replace with spaces. + +Thomas Rast (2): + log: do not print ellipses with --abbrev-commit + Documentation: pruning recipe for destructive filter-branch + +Todd Zullinger (1): + git-web--browse: Fix check for /bin/start + + +Version v1.6.2-rc0; changes since v1.6.1.3: +------------------------------------------- + +Adeodato Simó (3): + builtin-shortlog.c: use string_list_append(), and don't strdup unnecessarily + git.c: make autocorrected aliases work + t7501-commit.sh: explicitly check that -F prevents invoking the editor + +Alexander Potashev (4): + remove trailing LF in die() messages + add is_dot_or_dotdot inline function + Allow cloning to an existing empty directory + Replace deprecated dashed git commands in usage + +Alexandre Julliard (8): + git.el: Add a checkout command. + git.el: Add a command to create a new branch. + git.el: Add commands for cherry-pick and revert. + git.el: Make git-run-command-region display the error if any. + git.el: Set a regexp for paragraph-separate in log-edit mode. + git.el: Use integer instead of character constants in case statement. + git.el: Add some notes about Emacs versions compatibility. + emacs: Remove the no longer maintained vc-git package. + +Arjen Laarhoven (1): + t/t4202-log.sh: Add testcases + +Benjamin Kramer (1): + Ignore test-ctype + +Boyd Stephen Smith Jr (2): + color-words: Support diff.wordregex config option + Change the spelling of "wordregex". + +Brandon Casey (2): + t7700: demonstrate misbehavior of 'repack -a' when local packs exist + Makefile: use shell for-loop rather than Make's foreach loop during install + +Charles Bailey (7): + Fix some tab/space inconsistencies in git-mergetool.sh + Add -y/--no-prompt option to mergetool + mergetool: Add prompt to continue after failing to merge a file + mergetool: Don't keep temporary merge files unless told to + mergetool: respect autocrlf by using checkout-index + mergetool: Add a test for running mergetool in a sub-directory + mergetool: fix running mergetool in sub-directories + +Christian Couder (1): + sha1_file: make "read_object" static + +Clemens Buchacher (2): + clean up pathspec matching + remove pathspec_match, use match_pathspec instead + +David Aguilar (4): + contrib: add 'git difftool' for launching common merge tools + difftool: fix documentation problems + difftool: put the cursor on the editable file for Vim + contrib/difftool: Don't repeat merge tool candidates + +David M. Syzdek (1): + autoconf: Enable threaded delta search when pthreads are supported + +Eric Kidd (1): + filter-branch: Fix fatal error on bare repositories + +Eric Wong (6): + git-svn: add --authors-file test + git-svn: handle empty files marked as symlinks in SVN + git-svn: better attempt to handle broken symlink updates + git-svn: fix SVN 1.1.x compatibility + git-svn: avoid importing nested git repos + git-svn: fix memory leak when checking for empty symlinks + +Fabian Emmes (2): + cvsserver: add option to configure commit message + cvsserver: change generation of CVS author names + +Geoffrey Thomas (2): + utf8: add utf8_strwidth() + builtin-blame.c: Use utf8_strwidth for author's names + +Giuseppe Bilotta (16): + gitweb: add patch view + gitweb: change call pattern for git_commitdiff + gitweb: add patches view + gitweb: link to patch(es) view in commit(diff) and (short)log view + gitweb: use href() when generating URLs in OPML + gitweb: don't use pathinfo for global actions + gitweb: suggest name for OPML view + gitweb: channel image in rss feed + gitweb: feed generator metadata + gitweb: rss feed managingEditor + gitweb: rss channel date + gitweb: last-modified time should be commiter, not author + gitweb: check if-modified-since for feeds + gitweb: make static files accessible with PATH_INFO + gitweb: webserver config for PATH_INFO + gitweb: align comments to code + +Jake Goulding (3): + Make opt_parse_with_commit() non-static + Make has_commit() non-static + git-tag: Add --contains option + +Jakub Narebski (4): + gitweb: Move 'lineno' id from link to row element in git_blame + gitweb: A bit of code cleanup in git_blame() + gitweb: cache $parent_commit info in git_blame() + gitweb: Update README that gitweb works better with PATH_INFO + +Jay Soffian (4): + git-am: minor cleanups + builtin-remote: make rm() use properly named variable to hold return value + builtin-remote: make rm operation safer in mirrored repository + Makefile: minor improvements for Mac OS X (Darwin) + +Jeff King (14): + Makefile: clean up TEST_PROGRAMS definition + color: make it easier for non-config to parse color specs + expand --pretty=format color options + diff: refactor tempfile cleanup handling + chain kill signals for cleanup functions + refactor signal handling for cleanup functions + pager: do wait_for_pager on signal death + git: s/run_command/run_builtin/ + run_command(): handle missing command errors more gracefully + run_command(): help callers distinguish errors + git: use run_command() to execute dashed externals + validate_headref: tighten ref-matching to just branches + symbolic ref: refuse non-ref targets in HEAD + t0005: use SIGTERM for sigchain test + +Johannes Gilger (1): + mergetool: Don't repeat merge tool candidates + +Johannes Schindelin (26): + Force t5302 to use a single thread + Introduce commit notes + Add a script to edit/inspect notes + git wrapper: Make while loop more reader-friendly + bundle: allow rev-list options to exclude annotated tags + show : reuse pp_user_info() instead of duplicating code + Implement the patience diff algorithm + Introduce the diff option '--patience' + bash completions: Add the --patience option + Speed up git notes lookup + Add an expensive test for git-notes + Add color_fwrite_lines(), a function coloring each line individually + color-words: refactor word splitting and use ALLOC_GROW() + color-words: change algorithm to allow for 0-character word boundaries + color-words: take an optional regular expression describing words + Fix parsing of @{-1}@{1} + rebase -i --root: fix check for number of arguments + Fix submodule squashing into unrelated commit + t3404 & t3411: undo copy&paste + lib-rebase.sh: Document what set_fake_editor() does + test-lib.sh: introduce test_commit() and test_merge() helpers + Simplify t3410 + Simplify t3411 + Simplify t3412 + Fix 'git diff --no-index' with a non-existing symlink target + filter-branch: do not consider diverging submodules a 'dirty worktree' + +Johannes Sixt (2): + Windows: Fix signal numbers + Windows: Fix intermittent failures of t7701 + +Jon Loeliger (1): + Fix Documentation typos surrounding the word 'handful'. + +Jonas Flodén (1): + git-am: Make it easier to see which patch failed + +Junio C Hamano (29): + Document "git-reset --merge" + Start 1.6.2 cycle + Resurrect "git apply --flags -" to read from the standard input + git-am: add --directory= option + Update 1.6.2 draft release notes + git-am: fix shell quoting + checkout: implement "@{-N}" shortcut name for N-th last branch + git-am: re-fix the diag message printing + interpret_nth_last_branch(): avoid traversing the reflog twice + Fix reflog parsing for a malformed branch switching entry + interpret_nth_last_branch(): plug small memleak + Introduce for_each_recent_reflog_ent(). + Simplify parsing branch switching events in reflog + http-push.c: style fixes + am: Add --committer-date-is-author-date option + rebase -i: correctly remember --root flag across --continue + tests: Avoid single-shot environment export for shell function invocation + revision traversal: allow UNINTERESTING objects to be missing + rebase -i squashes submodule changes into unrelated commit + add -u: do not fail to resolve a path as deleted + Update draft release notes to 1.6.2 + fsck: HEAD is part of refs + fsck: check loose objects from alternate object stores by default + http-push.c: get_remote_object_url() is only used under USE_CURL_MULTI + receive-pack: explain what to do when push updates the current branch + t3412: further simplify setting of GIT_EDITOR + tests: fix test_commit() for case insensitive filesystems + Makefile: fix misdetection of relative pathnames + GIT 1.6.2-rc0 + +Keith Cascio (1): + test more combinations of ignore-whitespace options to diff + +Kirill Smelkov (5): + mailinfo: correctly handle multiline 'Subject:' header + mailinfo: 'From:' header should be unfold as well + mailinfo: add explicit test for mails like ' (A U Thor)' + mailinfo: tests for RFC2047 examples + mailinfo: cleanup extra spaces for complex 'From:' + +Kjetil Barvik (6): + Cleanup of unused symcache variable inside diff-lib.c + lstat_cache(): more cache effective symlink/directory detection + lstat_cache(): introduce has_symlink_or_noent_leading_path() function + lstat_cache(): introduce has_dirs_only_path() function + lstat_cache(): introduce invalidate_lstat_cache() function + lstat_cache(): introduce clear_lstat_cache() function + +Lee Marlow (2): + bash completion: Add '--intent-to-add' long option for 'git add' + bash completion: Use 'git add' completions for 'git stage' + +Linus Torvalds (1): + Add 'merge' mode to 'git reset' + +Marcel Koeppen (1): + git-svn: Show UUID in svn info for added directories with svn 1.5.5 + +Markus Heidelberg (10): + git-cherry: make parameter optional + Documentation: clarify which parameters are optional to git-cherry + contrib/vim: change URL to point to the latest syntax files + Documentation: let asciidoc align related options + mergetool: put the cursor on the editable file for Vim + contrib/difftool: change trap condition from SIGINT to INT + contrib/difftool: remove distracting 'echo' in the SIGINT handler + use uppercase POSIX compliant signals for the 'trap' command + bash completion: add 'rename' subcommand to git-remote + contrib/difftool: add support for Kompare + +Matt Kraai (1): + gitweb: unify boolean feature subroutines + +Michele Ballabio (1): + git-shortlog.txt: fix example about .mailmap + +Miklos Vajna (3): + Add support for a pdf version of the user manual + parse-opt: migrate builtin-apply. + gittutorial: remove misleading note + +Nanako Shiraishi (3): + git-am: Add --ignore-date option + Mention "local convention" rule in the CodingGuidelines + git-bundle doc: update examples + +Nicolas Pitre (2): + autodetect number of CPUs by default when using threads + pack-objects: don't use too many threads with few objects + +Pascal Obry (1): + config.mak.in: define paths without trailing slash + +Pete Harlan (1): + git-svn: Add --localtime option to "fetch" + +Pierre Habouzit (1): + filter-branch: add git_commit_non_empty_tree and --prune-empty. + +Ralf Wildenhues (1): + Fix naming scheme for configure cache variables. + +Ray Chuan (1): + http-push: refactor lock-related headers creation for curl requests + +René Scharfe (9): + diff: add option to show context between close hunks + strbuf: instate cleanup rule in case of non-memory errors + grep -w: forward to next possible position after rejected match + grep: don't call regexec() for fixed strings + Add ctype test + Reformat ctype.c + Change NUL char handling of isspecial() + Add is_regex_special() + Optimize color_parse_mem + +SZEDER Gábor (4): + bash: add '--merge' to 'git reset' + bash: remove unnecessary checks for long options with argument + bash: add missing format-patch command line options + bash: refactor 'git log --pretty=' options + +Santi Béjar (2): + commit: more compact summary and without extra quotes + tutorial-2: Update with the new "git commit" ouput + +Serge van den Boom (1): + Makefile: Make 'configure --with-expat=path' actually work + +Stefan Karpinski (2): + git-cvsserver: handle CVS 'noop' command. + git-cvsserver: run post-update hook *after* update. + +Steffen Prohaska (6): + Move computation of absolute paths from Makefile to runtime (in preparation for RUNTIME_PREFIX) + git_extract_argv0_path(): Move check for valid argv0 from caller to callee + Add calls to git_extract_argv0_path() in programs that call git_config_* + Modify setup_path() to only add git_exec_path() to PATH + Compute prefix at runtime if RUNTIME_PREFIX is set + Windows: Revert to default paths and convert them by RUNTIME_PREFIX + +Stephan Beyer (5): + checkout: don't crash on file checkout before running post-checkout hook + Move run_hook() from builtin-commit.c into run-command.c (libgit) + api-run-command.txt: talk about run_hook() + run_hook(): check the executability of the hook before filling argv + run_hook(): allow more than 9 hook arguments + +Steve Haslam (1): + Refactor git_set_argv0_path() to git_extract_argv0_path() + +Sverre Rabbelier (1): + Allow cloning an empty repository + +Tay Ray Chuan (3): + http-push: refactor request url creation + http-push: add back underscore separator before lock token + http-push: wrap signature of get_remote_object_url + +Ted Pavlic (4): + bash-completion: Support running when set -u is enabled + bash-completion: Try bash completions before simple filetype + bash-completion: Add comments to remind about required arguments + make: Remove -pthread on Darwin (it is included by cstdlib). + +Teemu Likonen (3): + Fix the building of user-manual.texi and gitman.texi documents + Fix the building of gitman.info document + diff-options.txt: Fix asciidoc markup issue + +Thomas Rast (23): + rebase -i: execute hook only after argument checking + rebase: learn to rebase root commit + rebase -i: learn to rebase root commit + rebase: update documentation for --root + notes: fix core.notesRef documentation + color-words: enable REG_NEWLINE to help user + color-words: expand docs with precise semantics + color-words: make regex configurable via attributes + sha1_name: tweak @{-N} lookup + sha1_name: support @{-N} syntax in get_sha1() + checkout: implement "-" abbreviation, add docs and tests + bash completion: move pickaxe options to log + bash completion: refactor diff options + t1505: remove debugging cruft + t3412: clean up GIT_EDITOR usage + t3412: use log|name-rev instead of log --graph + bash: offer to show (un)staged changes + add -p: change prompt separator for 'g' + add -p: trap Ctrl-D in 'goto' mode + contrib git-resurrect: find traces of a branch name and resurrect it + add -p: prompt for single characters + add -p: print errors in separate color + add -p: import Term::ReadKey with 'require' + +Tor Arne Vestbø (1): + git-notes: fix printing of multi-line notes + +Vitaly \"_Vi\" Shukela (3): + git-svn: add --ignore-paths option for fetching + git-svn: documented --ignore-paths + git-svn: Add test for --ignore-paths parameter + +William Pursell (5): + Add subroutine to display one-line summary of hunks + Add 'g' command to go to a hunk + git-add -i/-p: Change prompt separater from slash to comma + Add / command in add --patch + In add --patch, Handle K,k,J,j slightly more gracefully. + +jidanni@jidanni.org (1): + git-show-branch doc: show -g as synonym to --reflog in the list + +martin f. krafft (1): + git-am: implement --reject option passed to git-apply + + +Version v1.6.1.3; changes since v1.6.1.2: +----------------------------------------- + +Anders Melchiorsen (2): + Documentation: more git push examples + Documentation: rework src/dst description in git push + +David J. Mellor (1): + Fixed broken git help -w when installing from RPM + +Guanqun Lu (2): + fix typo in Documentation + add test-dump-cache-tree in Makefile + +Johannes Schindelin (2): + revision walker: include a detached HEAD in --all + apply: fix access to an uninitialized mode variable, found by valgrind + +Junio C Hamano (6): + bundle: allow the same ref to be given more than once + Documentation: simplify refspec format description + diff.c: output correct index lines for a split diff + builtin-apply.c: do not set bogus mode in check_preimage() for deleted path + grep: pass -I (ignore binary) down to external grep + GIT 1.6.1.3 + +Keith Cascio (2): + test more combinations of ignore-whitespace options to diff + Fix combined use of whitespace ignore options to diff + +Linus Torvalds (1): + Wrap inflate and other zlib routines for better error reporting + +Matthieu Moy (3): + Missing && in t/t7001.sh. + Add a testcase for "git mv -f" on untracked files. + builtin-mv.c: check for unversionned files before looking at the destination. + +René Scharfe (1): + merge: fix out-of-bounds memory access + +SZEDER Gábor (1): + Fix gitdir detection when in subdir of gitdir + +Stefan Naewe (1): + urls.txt: document optional port specification in git URLS + +William Pursell (1): + User-manual: "git stash " form is long gone + + +Version v1.6.1.2; changes since v1.6.1.1: +----------------------------------------- + +Björn Steinbrink (1): + Rename detection: Avoid repeated filespec population + +Jeff King (1): + avoid 31-bit truncation in write_loose_object + +Johannes Schindelin (2): + get_sha1_basic(): fix invalid memory access, found by valgrind + test-path-utils: Fix off by one, found by valgrind + +Junio C Hamano (4): + ls-tree: add --full-tree option + Teach format-patch to handle output directory relative to cwd + send-pack: do not send unknown object name from ".have" to pack-objects + GIT 1.6.1.2 + +Marcel M. Cary (1): + git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X + +Markus Heidelberg (2): + git-commit: color status output when color.ui is set + git-status -v: color diff output when color.ui is set + +Nanako Shiraishi (1): + Document git-ls-tree --full-tree + +Nguyễn Thái Ngọc Duy (2): + grep: support --no-ext-grep to test builtin grep + grep: grep cache entries if they are "assume unchanged" + +Nicolas Pitre (1): + objects to be pruned immediately don't have to be loosened + + +Version v1.6.1.1; changes since v1.6.1: +--------------------------------------- + +Adeodato Simó (2): + git-shortlog.txt: improve documentation about .mailmap files + git-send-email.txt: move --format-patch paragraph to a proper location + +Anders Melchiorsen (4): + Documentation: git push repository can also be a remote + Documentation: remove a redundant elaboration + Documentation: mention branches rather than heads + Documentation: avoid using undefined parameters + +Boyd Stephen Smith Jr (1): + Fix Documentation for git-describe + +Christian Couder (1): + builtin-fsck: fix off by one head count + +Clemens Buchacher (4): + modify/delete conflict resolution overwrites untracked file + unpack-trees: handle failure in verify_absent + unpack-trees: fix path search bug in verify_absent + unpack-trees: remove redundant path search in verify_absent + +Devin Doucette (1): + gitweb: Fix export check in git_get_projects_list + +Felipe Contreras (1): + fast-import: Cleanup mode setting. + +Henrik Austad (2): + Use capitalized names where appropriate + Be consistent in switch usage for tar + +Jay Soffian (1): + Git.pm: call Error::Simple() properly + +Joey Hess (1): + README: tutorial.txt is now called gittutorial.txt + +Johannes Schindelin (7): + merge-recursive: mark rename/delete conflict as unmerged + bisect view: call gitk if Cygwin's SESSIONNAME variable is set + git add: do not add files from a submodule + http-push: fix off-by-path_len + http-push: when making directories, have a trailing slash in the path name + t5540: clarify that http-push does not handle packed-refs on the remote + Rename diff.suppress-blank-empty to diff.suppressBlankEmpty + +Junio C Hamano (8): + merge-recursive: do not clobber untracked working tree garbage + Prepare for v1.6.1.1 maintenance release + builtin-apply: prevent non-explicit permission changes + git checkout: do not allow switching to a tree-ish that is not a commit + format-patch: show patch text for the root commit + Update draft release notes to 1.6.1.1 + Update draft release notes for 1.6.1.1 + GIT 1.6.1.1 + +Kirill A. Korinskiy (1): + http-push: support full URI in handle_remote_ls_ctx() + +Lars Noschinski (1): + shell: Document that 'cvs server' is a valid command + +Markus Heidelberg (2): + doc/git-send-email: mention sendemail.cc config variable + Documentation: let asciidoc align related options + +Michael J Gruber (2): + add test cases for "git mv -k" + fix handling of multiple untracked files for git mv -k + +Miklos Vajna (2): + fast-export: print usage when no options specified + Make t3411 executable + +Paul Jarc (1): + configure clobbers LDFLAGS + +Philippe Bruhat (1): + Git.pm: correctly handle directory name that evaluates to "false" + +Pierre Habouzit (1): + Avoid spurious error messages on error mistakes. + +René Scharfe (8): + daemon: handle freopen() failure + daemon: cleanup: replace loop with if + daemon: cleanup: factor out xstrdup_tolower() + merge-file: handle freopen() failure + pretty: factor out skip_empty_lines() + pretty: factor out format_subject() + pretty: support multiline subjects with format: + shortlog: handle multi-line subjects like log --pretty=oneline et. al. do + +Shawn O. Pearce (1): + describe: Avoid unnecessary warning when using --all + +Stephan Beyer (5): + t3501: check that commits are actually done + t3404: Add test case for aborted --continue after "edit" + t3404: Add test case for auto-amending only edited commits after "edit" + builtin-commit.c: do not remove COMMIT_EDITMSG + githooks.txt: add missing word + +Thomas Rast (3): + diff: accept -- when using --no-index + diff --no-index: test for pager after option parsing + diff --no-index -q: fix endless loop + +jidanni@jidanni.org (4): + Documentation/diff-options.txt: unify options + Documentation/git-tag.txt: minor typo and grammar fix + Documentation/git-push.txt: minor: compress one option + contrib/examples/README: give an explanation of the status of these files + + +Version v1.6.1; changes since v1.6.0.6: +--------------------------------------- + +Abhijit Menon-Sen (1): + Make cherry-pick use rerere for conflict resolution. + +Alex Riesen (14): + Extend "checkout --track" DWIM to support more cases + Remove calculation of the longest command name from where it is not used + Remove useless memset of static command name lists in builtin-merge.c + Make main_cmds and other_cmds local to builtin-help.c + Allow git help work without PATH set + list_commands: only call git_exec_path if it is needed + Add help.autocorrect to enable/disable autocorrecting + Cleanup remove_path + Fix potentially dangerous uses of mkpath and git_path + Fix handle leak in sha1_file/unpack_objects if there were damaged object data + Fix t4030-diff-textconv.sh + Make some of fwrite/fclose/write/close failures visible + Make chdir failures visible + Report symlink failures in merge-recursive + +Alexander Gavrilov (63): + git-gui: Support starting gitk from Gui Blame + git-gui: Support passing blame to a parent commit. + git-gui: Better positioning in Blame Parent Commit + git-gui: Allow specifying an initial line for git gui blame. + gitk: Add option to specify the default commit on command line + gitk: Add menu item for calling git gui blame + git-gui: Support resolving conflicts via the diff context menu. + git-gui: Support calling merge tools. + git-gui: Don't allow staging files with conflicts. + git-gui: Support more merge tools. + git-gui: Support conflict states _U & UT. + git-gui: Reimplement and enhance auto-selection of diffs. + git-gui: Make F5 reselect a diff, if an untracked file is selected. + git-gui: Show special diffs for complex conflict cases. + git-gui: Fix Blame Parent & Context for working copy lines. + git-gui: Restore ability to Stage Working Copy for conflicts. + gitk: Fix a bug in collapsing deeply nested trees + git-gui: Add more integration options to citool. + git-gui: Cleanup handling of the default encoding. + git-gui: Add a menu of available encodings. + git-gui: Allow forcing display encoding for diffs using a submenu. + git-gui: Optimize encoding name resolution using a lookup table. + git-gui: Support the encoding menu in gui blame. + git-gui: Reenable staging unmerged files by clicking the icon. + git-gui: Make Ctrl-T safe to use for conflicting files. + git-gui: Fix the blame window shape. + git-gui: Add a search command to the blame viewer. + git-gui: Fix the blame viewer destroy handler. + gitk: Enhance file encoding support + gitk: Implement batch lookup and caching of encoding attrs + gitk: Allow forcing branch creation if it already exists + gitk: Fix file list context menu for merge commits + builtin-blame: Reencode commit messages according to git-log rules. + gitk: Allow starting gui blame for a specific line + git-gui: Add a dialog that shows the OpenSSH public key. + git-gui: Add a simple implementation of SSH_ASKPASS. + Windows: Make OpenSSH properly detect tty detachment. + gitweb: Use single implementation of export_ok check. + gitweb: Add a per-repository authorization hook. + gitweb: Fix mod_perl support. + gitk: Add Return and Escape bindings to dialogs + gitk: Make gitk dialog windows transient + gitk: Make cherry-pick call git-citool on conflicts + gitk: Implement a user-friendly Edit View dialog + git-gui: Fix focus transition in the blame viewer. + git-gui: Add the Show SSH Key item to the clone dialog. + git-gui: Request blame metadata in utf-8. + gitk: Add accelerators to frequently used menu commands + gitk: Fix transient windows on Win32 and MacOS + gitk: Fix commit encoding support + Documentation: New GUI configuration and command-line options. + git-gui: Implement system-wide configuration handling. + git-gui: Fix the after callback execution in rescan. + git-gui: Add a Tools menu for arbitrary commands. + git-gui: Allow Tools request arguments from the user. + git-gui: Implement automatic rescan after Tool execution. + git-gui: Fix the search bar destruction handler. + gitk: Avoid handling the Return key twice in Add Branch + gitk: Make line origin search update the busy status + gitk: Add a menu option to start git gui + git-gui: Fix handling of relative paths in blame. + git-gui: Fix commit encoding handling. + Documentation: Describe git-gui Tools menu configuration options. + +Alexander Potashev (2): + Fix typos in documentation + Fix typo in comment in builtin-add.c + +Alexandre Julliard (9): + git.el: Improve error handling for commits. + git.el: Remove the env parameter in git-call-process and git-call-process-string. + git.el: Simplify handling of merge heads in the commit log-edit buffer. + git.el: Properly handle merge commits in git-amend-commit. + git.el: Fix git-amend-commit to support amending an initial commit. + git.el: Never clear the status buffer, only update the files. + git.el: Add an insert file command. + git.el: Add possibility to mark files directly in git-update-status-files. + git.el: Allow to commit even if there are no marked files. + +Alexey Borzenkov (1): + Define linkgit macro in [macros] section + +Anders Melchiorsen (2): + wt-status: Split header generation into three functions + wt-status: Teach how to discard changes in the working directory + +Andreas Ericsson (3): + Teach "git diff -p" to locate PHP class methods + git commit: Reformat output somewhat + rebase: Support preserving merges in non-interactive mode + +Arjen Laarhoven (2): + t6023-merge-file: Work around non-portable sed usage + Enable threaded delta search on Mac OS X/Darwin + +Bert Wesarg (1): + for-each-ref: `:short` format for `refname` + +Boyd Stephen Smith Jr (1): + git-revert documentation: refer to new HOWTO on reverting faulty merges + +Brandon Casey (10): + remote.c: add a function for deleting a refspec array and use it (twice) + dir.c: Avoid c99 array initialization + t4018-diff-funcname: test syntax of builtin xfuncname patterns + diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785 + xdiff-interface.c: strip newline (and cr) from line before pattern matching + Replace xmalloc/memset(0) pairs with xcalloc + t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-' + Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer + t4018-diff-funcname: add objective-c xfuncname pattern to syntax test + git-branch: display sha1 on branch deletion + +Brian Downing (4): + Make xdi_diff_outf interface for running xdiff_outf diffs + Use strbuf for struct xdiff_emit_state's remainder + Always initialize xpparam_t to 0 + Allow alternate "low-level" emit function from xdl_diff + +Brian Gernhardt (2): + format-patch: autonumber by default + Avoid using non-portable `echo -n` in tests. + +Cheng Renquan (2): + git-remote: match usage string with the manual pages + git-remote: add verbose mode to git remote update + +Christian Couder (12): + merge-base: teach "git merge-base" to drive underlying merge_bases_many() + bisect: test merge base if good rev is not an ancestor of bad rev + bisect: only check merge bases when needed + bisect: remove "checkout_done" variable used when checking merge bases + refs: improve comments about "reading" argument of "resolve_ref" + bisect: fix missing "exit" + Documentation: user-manual: add information about "git help" at the beginning + Documentation: tutorial: add information about "git help" at the beginning + git-gui: french translation update + bisect: teach "skip" to accept special arguments like "A..B" + bisect: fix "git bisect skip " and add tests cases + Documentation: describe how to "bisect skip" a range of commits + +Christian Stimming (9): + git-gui: Mark forgotten strings for translation. + git-gui: I18n fix sentence parts into full sentences for translation again. + git-gui: Updated German translation. + gitk: Add untranslated error messages to translation + git-gui: Update German translation. + gitk: Update German translation + git-gui: Update German (completed) translation. + gitk: Mark forgotten strings (header sentence parts in color chooser) for translation + gitk: Update German translation + +Dan Hensgen (1): + git-merge documentation: more details about resolving conflicts + +Daniel Lowe (1): + Fix non-literal format in printf-style calls + +David Aguilar (3): + git-submodule: replace duplicated code with a module_list function + git-submodule: add "sync" command + tests: add a testcase for "git submodule sync" + +David Bryson (1): + Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" is set + +David M. Syzdek (5): + Build: add NO_UINTMAX_T to support ancient systems + Add Makefile check for FreeBSD 4.9-SECURITY + autoconf: Add link tests to each AC_CHECK_FUNC() test + Make Pthread link flags configurable + Add autoconf tests for pthreads + +David Soria Parra (1): + cast pid_t's to uintmax_t to improve portability + +David Symonds (1): + git-diff: Add --staged as a synonym for --cached. + +Davide Libenzi (1): + xdiff: give up scanning similar lines early + +Deskin Miler (1): + git-svn: testcase for partial rebuild + +Deskin Miller (4): + git-svn: do a partial rebuild if rev_map is out-of-date + git-svn: proper detection of bare repositories + git-svn: proper detection of bare repositories + git-svn: Make branch use correct svn-remote + +Dmitry Potapov (14): + teach index_fd to work with pipes + correct argument checking test for git hash-object + correct usage help string for git-hash-object + use parse_options() in git hash-object + add --path option to git hash-object + add --no-filters option to git hash-object + mingw: remove use of _getdrive() from lstat/fstat + add have_git_dir() function + mingw: move common functionality to win32.h + cygwin: Use native Win32 API for stat + do not segfault if make_cache_entry failed + print an error message for invalid path + check-attr: add an internal check_attr() function + check-attr: Add --stdin option + +Dotan Barak (1): + Use xmalloc() and friends to catch allocation failures + +Eric Wong (7): + git-svn: check error code of send_txstream + t9124: clean up chdir usage + git-svn: fix handling of even funkier branch names + git-svn: don't escape tilde ('~') for http(s) URLs + git-svn: respect i18n.commitencoding config + git-svn: don't escape tilde ('~') for http(s) URLs + git-svn: respect i18n.commitencoding config + +Florian Ragwitz (1): + Add git-svn branch to allow branch creation in SVN repositories + +Florian Weimer (3): + git-svn: extract base blob in generate_diff + git-svn: Introduce SVN::Git::Editor::_chg_file_get_blob + git-svn: Send deltas during commits + +Fredrik Skolmli (2): + Documentation: Spelling fix + git-gui: Starting translation for Norwegian + +Garry Dolley (1): + Fixed some grammatical errors in git-rebase.txt documentation. + +Giovanni Funchal (1): + configure: auto detect dynamic library path switches + +Giuseppe Bilotta (15): + gitweb: ref markers link to named shortlogs + gitweb: shortlog now also obeys $hash_parent + gitweb: refactor input parameters parse/validation + gitweb: parse project/action/hash_base:filename PATH_INFO + gitweb: generate project/action/hash URLs + gitweb: use_pathinfo filenames start with / + gitweb: parse parent..current syntax from PATH_INFO + gitweb: generate parent..current URLs + gitweb: make the supported snapshot formats array global + gitweb: retrieve snapshot format from PATH_INFO + gitweb: embed snapshot format parameter in PATH_INFO + git-gui: try to provide a window icon under X + gitweb: make gitweb_check_feature a boolean wrapper + Update comment on gitweb_check/get_feature + gitk: Map / to focus the search box + +Gustaf Hendeby (2): + Update .gitignore to ignore git-help + git-gui: Teach git gui about file type changes + +Heikki Orsila (1): + diff --dirstat-by-file: count changed files, not lines + +Jakub Narebski (3): + gitweb: Better processing format string in custom links in navbar + gitweb: Fix handling of non-ASCII characters in inserted HTML files + gitweb: Fix bug in insert_file() subroutine + +Jan Krüger (1): + Introduce receive.denyDeletes + +Jeff King (34): + run-command: add pre-exec callback + spawn pager via run_command interface + format-patch: use default diff format even with patch options + tests: grep portability fixes + reformat informational commit message + tutorial: update output of git commit + tests: shell negation portability fix + t4012: use test_cmp instead of cmp + diff: unify external diff and funcname parsing code + diff: introduce diff..binary + diff: add filter for converting binary to text + document "intent to add" option to git-add + rm: loosen safety valve for empty files + submodule: fix some non-portable grep invocations + diff: add missing static declaration + document the diff driver textconv feature + refactor userdiff textconv code + userdiff: require explicitly allowing textconv + only textconv regular files + wt-status: load diff ui config + add userdiff textconv tests + enable textconv for diff in verbose status/commit + t5400: expect success for denying deletion + t5516: refactor oddball tests + receive-pack: detect push to current branch of non-bare repo + define empty tree sha1 as a macro + wt-status: refactor initial commit printing + status: show "-v" diff even for initial commit + add stage to gitignore + reorder ALLOW_TEXTCONV option setting + diff: allow turning on textconv explicitly for plumbing + diff: fix handling of binary rewrite diffs + diff: respect textconv in rewrite diffs + rebase: improve error messages about dirty state + +Jim Meyering (4): + add boolean diff.suppress-blank-empty config option + SubmittingPatches: fix a typo + reword --full-index description + xdiff-interface.c: remove 10 duplicated lines + +Joey Hess (2): + git-daemon: set REMOTE_ADDR to client address + sha1_file: avoid bogus "file exists" error message + +Johan Herland (3): + Teach "git diff -p" HTML funcname patterns + Fix AsciiDoc errors in merge documentation + Fix submodule sync with relative submodule URLs + +Johannes Schindelin (10): + t9700: remove useless check + tests: Clarify dependencies between tests, 'aggregate-results' and 'clean' + Enable parallel tests + checkout --track: make up a sensible branch name if '-b' was omitted + test-lib: do not remove trash_directory if called with --debug + git wrapper: DWIM mistyped commands + Document levenshtein.c + Get rid of the last remnants of GIT_CONFIG_LOCAL + git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL + rebase -i -p: leave a --cc patch when a merge could not be redone + +Johannes Sixt (17): + Revert "Windows: Use a customized struct stat that also has the st_blocks member." + filter-branch: Grok special characters in tag names + Windows: git-shell can be compiled again + compat/mingw: Support a timeout in the poll emulation if no fds are given + git-gui: Do not automatically stage file after merge tool finishes + git-gui: Remove space from the end of aspell's reply before processing + git-gui: Fix switch statement in lib/merge.tcl + git-gui: Show a round number of bytes of large untracked text files + git-gui: Mark-up strings in show_{other,unmerged}_diff() for localization + git-remote: list branches in vertical lists + git-gui: Do not munge conflict marker lines in a normal diff + t4030-diff-textconv: Make octal escape sequence more portable + Show a failure of rebase -p if the merge had a conflict + rebase -i -p: Fix --continue after a merge could not be redone + gitk: Use check-buttons' -text property instead of separate labels + gitk: Ensure that "Reset branch" menu entry is enabled + gitk: Force the focus to the main window on Windows + +John Chapman (2): + git-p4: Support purged files and optimize memory usage + git-p4: Cache git config for performance + +Jonas Fonseca (1): + git-check-attr(1): use 'verse' for multi-line synopsis sections + +Jonathan del Strother (3): + Revert "Convert output messages in merge-recursive to past tense." + Add OS X support to the pre-auto-gc example hook + Teach git diff about Objective-C syntax + +Joshua Williams (1): + git-gui: Add support for calling out to the prepare-commit-msg hook + +Junio C Hamano (105): + builtin-add.c: restructure the code for maintainability + builtin-add.c: optimize -A option and "git add ." + imap-send.c: more style fixes + documentation: merge-base: explain "git merge-base" with more than 2 args + merge-base-many: add trivial tests based on the documentation + git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge + revision.c: whitespace fix + revision traversal: show full history with merge simplification + Topo-sort before --simplify-merges + update-index: refuse to add working tree items beyond symlinks + add: refuse to add working tree items beyond symlinks + xdiff-interface: hide the whole "xdiff_emit_state" business from the caller + revision --simplify-merges: use decoration instead of commit->util field + index: future proof for "extended" index entries + tests: use $TEST_DIRECTORY to refer to the t/ directory + Start 1.6.1 cycle + Makefile: Allow CC_LD_DYNPATH to be overriden + revision --simplify-merges: do not leave commits unprocessed + revision --simplify-merges: make it a no-op without pathspec + compat: introduce on_disk_bytes() + shell: do not play duplicated definition games to shrink the executable + Build-in "git-shell" + Update draft release notes for 1.6.1 + Fix "git-merge -s bogo" help text + templates/Makefile: install is unnecessary, just use mkdir -p + t7606: fix custom merge test + Revert "Build-in "git-shell"" + daemon.c: minor style fixup + checkout -f: allow ignoring unmerged paths when checking out of the index + checkout --ours/--theirs: allow checking out one side of a conflicting merge + xdl_fill_merge_buffer(): separate out a too deeply nested function + xdiff-merge: optionally show conflicts in "diff3 -m" style + xmerge.c: minimum readability fixups + xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less + rerere.c: use symbolic constants to keep track of parsing states + rerere: understand "diff3 -m" style conflicts with the original + merge.conflictstyle: choose between "merge" and "diff3 -m" styles + git-merge-recursive: learn to honor merge.conflictstyle + checkout -m: recreate merge when checking out of unmerged index + diff: vary default prefix depending on what are compared + git commit --author=$name: look $name up in existing commits + git-add --intent-to-add (-N) + checkout --conflict=