user/sven/git.git, branch v1.7.3.5Git
https://git.stealer.net/cgit.cgi/user/sven/git.git/atom?h=v1.7.3.52011-01-05T22:49:19ZGit 1.7.3.52011-01-05T22:49:19ZJunio C Hamanogitster@pobox.com2011-01-05T22:49:19Zurn:sha1:6e97ef31ce20ff93a4cc0e3c6ab5171fd6dda5f3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
gitweb: skip logo in atom feed when there is none2011-01-04T18:48:37ZJonathan Niederjrnieder@gmail.com2010-09-04T00:44:39Zurn:sha1:9d9f5e72dc5959750498acc81b3e2c8ca76ad499
With v1.5.0-rc0~169 (gitweb: Fix Atom feed <logo>: it is $logo,
not $logo_url, 2006-12-04), the logo URI to be written to Atom
feeds was corrected but the case of no logo forgotten.
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t9001: Fix test prerequisites2010-12-29T21:39:05ZRobin H. Johnsonrobbat2@gentoo.org2010-12-29T21:02:31Zurn:sha1:57da20426417cd0834e7fc442096d1c18924228a
Add in missing Perl prerequisites for new tests of send-email.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Prepare for 1.7.3.52010-12-28T21:48:54ZJunio C Hamanogitster@pobox.com2010-12-28T21:48:54Zurn:sha1:17367939ebd64f5e6eb4fa5a32ece513f497e6e6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jk/commit-die-on-bogus-ident' into maint2010-12-28T21:45:12ZJunio C Hamanogitster@pobox.com2010-12-28T21:45:12Zurn:sha1:a121d53fa6ce711e695d65ecff300127ff8e1047
* jk/commit-die-on-bogus-ident:
commit: die before asking to edit the log message
ident: die on bogus date format
Merge branch 'ks/blame-worktree-textconv-cached' into maint2010-12-28T21:44:58ZJunio C Hamanogitster@pobox.com2010-12-28T21:44:58Zurn:sha1:359f34f6cc948a2ddd2c99239f24a78d560bafd0
* ks/blame-worktree-textconv-cached:
fill_textconv(): Don't get/put cache if sha1 is not valid
t/t8006: Demonstrate blame is broken when cachetextconv is on
Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint2010-12-28T21:43:10ZJunio C Hamanogitster@pobox.com2010-12-28T21:43:10Zurn:sha1:58c58c8624d77ff4087ad93e515402db218684f6
* jc/maint-rebase-rewrite-last-skip:
rebase --skip: correctly wrap-up when skipping the last patch
Merge branch 'jc/maint-am-abort-safely' into maint2010-12-28T21:42:55ZJunio C Hamanogitster@pobox.com2010-12-28T21:42:55Zurn:sha1:2f739695700e4a9d9de640ff623fe4e728f5b23a
* jc/maint-am-abort-safely:
am --abort: keep unrelated commits since the last failure and warn
Merge branch 'kb/maint-status-cquote' into maint2010-12-28T21:23:20ZJunio C Hamanogitster@pobox.com2010-12-28T21:23:20Zurn:sha1:0ec9ee3bcf5c926df9d54f63ff3ed8b97e19bb0d
* kb/maint-status-cquote:
status: Quote paths with spaces in short format
Fix false positives in t3404 due to SHELL=/bin/false2010-12-28T19:22:16ZRobin H. Johnsonrobbat2@gentoo.org2010-12-27T08:03:43Zurn:sha1:5cd3e10737135163f47e97e0338dbf33f4772511
If the user's shell in NSS passwd is /bin/false (eg as found during Gentoo's
package building), the git-rebase exec tests will fail, because they call
$SHELL around the command, and in the existing testcase, $SHELL was not being
cleared sufficently.
This lead to false positive failures of t3404 on systems where the package
build user was locked down as noted above.
Signed-off-by: "Robin H. Johnson" <robbat2@gentoo.org>
X-Gentoo-Bug: 349083
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=349083
Signed-off-by: Junio C Hamano <gitster@pobox.com>