- 20 1月, 2011 7 次提交
-
-
由 Junio C Hamano 提交于
* rj/maint-test-fixes: t9501-*.sh: Fix a test failure on Cygwin lib-git-svn.sh: Add check for mis-configured web server variables lib-git-svn.sh: Avoid setting web server variables unnecessarily t9142: Move call to start_httpd into the setup test t3600-rm.sh: Don't pass a non-existent prereq to test #15
-
由 Junio C Hamano 提交于
* jn/maint-gitweb-pathinfo-fix: gitweb: Fix handling of whitespace in generated links
-
由 Junio C Hamano 提交于
* ak/describe-exact: describe: Delay looking up commits until searching for an inexact match describe: Store commit_names in a hash table by commit SHA1 describe: Do not use a flex array in struct commit_name describe: Use for_each_rawref
-
由 Junio C Hamano 提交于
* jn/maint-fast-import-object-reuse: fast-import: insert new object entries at start of hash bucket
-
由 Junio C Hamano 提交于
* jn/submodule-b-current: git submodule: Remove now obsolete tests before cloning a repo git submodule -b ... of current HEAD fails
-
由 Junio C Hamano 提交于
* jc/maint-svn-info-test-fix: t9119: do not compare "Text Last Updated" line from "svn info"
-
由 Junio C Hamano 提交于
* nd/maint-relative: get_cwd_relative(): do not misinterpret root path
-
- 13 1月, 2011 1 次提交
-
-
由 Matthieu Moy 提交于
Since the message advises to fix the configuration first, the advantage of using this command is that it is cut-and-paste ready, while using --author='...' requires the user to type his name and email again. Signed-off-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Acked-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 11 1月, 2011 5 次提交
-
-
由 Junio C Hamano 提交于
* maint-1.7.2: Documentation/githooks: post-rewrite-copy-notes never existed Documentation/git-archive: spell --worktree-attributes correctly
-
由 Junio C Hamano 提交于
* maint-1.7.1: Documentation/githooks: post-rewrite-copy-notes never existed Documentation/git-archive: spell --worktree-attributes correctly
-
由 Junio C Hamano 提交于
* maint-1.7.0: Documentation/git-archive: spell --worktree-attributes correctly
-
由 Thomas Rast 提交于
The documentation for the post-rewrite hook contains a paragraph from its early development, where the automatic notes copying facilities were not part of the series and thus this had to be a hook. Later versions of the series implemented notes copying as a core feature. Thus mentioning post-rewrite-copy-notes was never correct. As the other hooks do not have a "there is no default hook, but..." sentence unless they ship a sample hook in either templates or contrib, we simply remove the whole paragraph. Signed-off-by: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Rast 提交于
The --worktree-attributes option was correctly documented in ba053ea9 (archive: do not read .gitattributes in working directory, 2009-04-18). However, later in 9b4c8b0a (archive documentation: attributes are taken from the tree by default, 2010-02-10) the misspelling "--work-tree-attributes" was used to refer to it. Fix this. Noticed-by: NJeffrey Phillips Freeman <jeffrey.freeman@syncleus.com> Signed-off-by: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 09 1月, 2011 1 次提交
-
-
由 Anders Kaseorg 提交于
The executable bit on gitk-git/gitk was lost (accidentally it seems) by commit 62ba5143. Put it back, so that gitk can be run directly from a git.git checkout. Note that the script is already executable in gitk.git, just not in git.git. Signed-off-by: NAnders Kaseorg <andersk@mit.edu> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 06 1月, 2011 1 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 05 1月, 2011 1 次提交
-
-
由 Jonathan Nieder 提交于
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: NEric Wong <normalperson@yhbt.net> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Acked-by: NJakub Narebski <jnareb@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 30 12月, 2010 1 次提交
-
-
由 Robin H. Johnson 提交于
Add in missing Perl prerequisites for new tests of send-email. Signed-off-by: NRobin H. Johnson <robbat2@gentoo.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 29 12月, 2010 7 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* jk/commit-die-on-bogus-ident: commit: die before asking to edit the log message ident: die on bogus date format
-
由 Junio C Hamano 提交于
* 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
-
由 Junio C Hamano 提交于
* jc/maint-rebase-rewrite-last-skip: rebase --skip: correctly wrap-up when skipping the last patch
-
由 Junio C Hamano 提交于
* jc/maint-am-abort-safely: am --abort: keep unrelated commits since the last failure and warn
-
由 Junio C Hamano 提交于
* kb/maint-status-cquote: status: Quote paths with spaces in short format
-
由 Robin H. Johnson 提交于
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: N"Robin H. Johnson" <robbat2@gentoo.org> X-Gentoo-Bug: 349083 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=349083Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 27 12月, 2010 2 次提交
-
-
由 Junio C Hamano 提交于
* rs/maint-diff-fd-leak: close file on error in read_mmfile()
-
由 René Scharfe 提交于
Reported in http://qa.debian.org/daca/cppcheck/sid/git_1.7.2.3-2.2.html and in http://thread.gmane.org/gmane.comp.version-control.git/123042. Signed-off-by: NRene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 23 12月, 2010 2 次提交
-
-
由 Brandon Casey 提交于
POSIX awk seems to explicitly not support hexadecimal escape sequences. From http://pubs.opengroup.org/onlinepubs/009695399/: Regular expressions in awk have been extended somewhat... One sequence that is not supported is hexadecimal value escapes beginning with '\x'. This affects the awk on IRIX 6.5, and causes t4015.56 to fail. Use octal instead. Signed-off-by: NBrandon Casey <casey@nrlssc.navy.mil> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
When "rebase --skip" is used to skip the last patch in the series, the code to wrap up the rewrite by copying the notes from old to new commits and also by running the post-rewrite hook was bypassed. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 22 12月, 2010 3 次提交
-
-
由 Jonathan Nieder 提交于
Unlike bash and ksh, dash passes through hexadecimal \xcc escapes. So when run with dash, these tests *pass* (since '\xcc' is a perfectly reasonable filename) but they are not testing what was intended. Use octal escapes instead, in the spirit of v1.6.1-rc1~55^2 (2008-11-09). Reported-by: NRamsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Ramsay Jones 提交于
Some shells, for example dash versions older than 0.5.4, need to spell a variable reference as '$N' rather than 'N' in an arithmetic expansion. In order to avoid the syntax error, we change the offending variable reference from 'i' to '$i' in function scramble. There is nothing bash specific to this test script (and we shouldn't have any bash dependent test). Fix its shebang line. Signed-off-by: NRamsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
After making commits (either by pulling or doing their own work) after a failed "am", the user will be reminded by next "am" invocation that there was a failed "am" that the user needs to decide to resolve or to get rid of the old "am" attempt. The "am --abort" option was meant to help the latter. However, it rewinded the HEAD back to the beginning of the failed "am" attempt, discarding commits made (perhaps by mistake) since. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 21 12月, 2010 2 次提交
-
-
由 Junio C Hamano 提交于
When determine_author_info() returns to the calling prepare_to_commit(), we already know the pieces of information necessary to determine what author ident will be used in the final message, but deferred making a call to fmt_ident() before the final commit_tree(). Most importantly, we would open the editor to ask the user to compose the log message before it. As one important side effect of fmt_ident() is to error out when the given information is malformed, this resulted in us spawning the editor first and then refusing to commit due to error, even though we had enough information to detect the error before starting the editor, which was annoying. Move the fmt_ident() call to the end of determine_author_info() where we have final determination of author info to rectify this. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jeff King 提交于
If the user gives "git commit --date=foobar", we silently ignore the --date flag. We should note the error. This patch puts the fix at the lowest level of fmt_ident, which means it also handles GIT_AUTHOR_DATE=foobar, as well. There are two down-sides to this approach: 1. Technically this breaks somebody doing something like "git commit --date=now", which happened to work because bogus data is the same as "now". Though we do explicitly handle the empty string, so anybody passing an empty variable through the environment will still work. If the error is too much, perhaps it can be downgraded to a warning? 2. The error checking happens _after_ the commit message is written, which can be annoying to the user. We can put explicit checks closer to the beginning of git-commit, but that feels a little hack-ish; suddenly git-commit has to care about how fmt_ident works. Maybe we could simply call fmt_ident earlier? Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 20 12月, 2010 2 次提交
-
-
由 Kirill Smelkov 提交于
When blaming files in the working tree, the filespec is marked with !sha1_valid, as we have not given the contents an object name yet. The function to cache textconv results (keyed on the object name), however, didn't check this condition, and ended up on storing the cached result under a random object name. Cc: Axel Bonnet <axel.bonnet@ensimag.imag.fr> Cc: Clément Poulain <clement.poulain@ensimag.imag.fr> Cc: Diane Gasselin <diane.gasselin@ensimag.imag.fr> Cc: Jeff King <peff@peff.net> Signed-off-by: NKirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Kirill Smelkov 提交于
I have a git repository with lots of .doc and .pdf files. There diff works ok, but blaming is painfully slow without textconv cache, and with textconv cache, blame says lots of lines are 'Not Yet Committed' which is wrong. Here is a test that demonstrates the problem. Cc: Axel Bonnet <axel.bonnet@ensimag.imag.fr> Cc: Clément Poulain <clement.poulain@ensimag.imag.fr> Cc: Diane Gasselin <diane.gasselin@ensimag.imag.fr> Cc: Jeff King <peff@peff.net> Signed-off-by: NKirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 19 12月, 2010 3 次提交
-
-
由 Jakub Narebski 提交于
To do that, generating "<link />"s to feeds were refactored into print_feed_meta() subroutine, to keep nesting (indent) level in git_header_html() low. This has also the advantage of making code more clear. Signed-off-by: NJakub Narebski <jnareb@gmail.com> Signed-off-by: NJohn 'Warthog9' Hawley <warthog9@eaglescrag.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Mark Lodato 提交于
In git-fsck(1), there was a reference to the warning "<tree> has full pathnames in it". This exact wording has not been used since 2005 (commit f1f0d088), when the wording was changed slightly. More importantly, the description of that warning was useless, and there were many other similar warning messages which were not document at all. Since all these warnings are fairly obvious, there is no need for them to be in the man page. Signed-off-by: NMark Lodato <lodatom@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Rast 提交于
Both had an unclosed ] that ruined the safeguard against not matching a non-space char. Signed-off-by: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 18 12月, 2010 2 次提交
-
-
由 Vasyl' Vavrychuk 提交于
Signed-off-by: NVasyl' Vavrychuk <vvavrychuk@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jiang Xin 提交于
The variable gc.packrefs for git-gc can be set to true, false and "notbare", not "nobare". Signed-off-by: NJiang Xin <jiangxin@ossxp.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-