- 06 10月, 2008 8 次提交
-
-
由 Nanako Shiraishi 提交于
The original git-rebase honored pre-rebase hook so that public branches can be protected from getting rebased, but rebase --interactive ignored the hook entirely. This fixes it. Signed-off-by: NNanako Shiraishi <nanako3@lavabit.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Nanako Shiraishi 提交于
Documentation/git-rebase.txt talks about pre-rebase hook, but it appears that Documentation/git-hooks.txt does not have corresponding entry for it. Signed-off-by: NNanako Shiraishi <nanako3@lavabit.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Dmitry Potapov 提交于
Signed-off-by: NDmitry Potapov <dpotapov@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Dmitry Potapov 提交于
There are 9 places where prefix_path is called, and only in one of them the returned pointer was checked to be non-zero and only to call exit(128) as it is usually done by die(). In other 8 places, the returned value was not checked and it caused SIGSEGV when a path outside of the working tree was used. For instance, running git update-index --add /some/path/outside caused SIGSEGV. This patch changes prefix_path() to die if the path is outside of the repository, so it never returns NULL. Signed-off-by: NDmitry Potapov <dpotapov@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Linus Torvalds 提交于
When "git diff --no-index" is given an absolute pathname, it would generate a diff header with the absolute path prepended by the prefix, like: diff --git a/dev/null b/foo Not only is this nonsensical, and not only does it violate the description of diffs given in git-diff(1), but it would produce broken binary diffs. Unlike text diffs, the binary diffs don't contain the filenames anywhere else, and so "git apply" relies on this header to figure out the filename. This patch just refuses to use an invalid name for anything visible in the diff. Now, this fixes the "git diff --no-index --binary a /dev/null" kind of case (and we'll end up using "a" as the basename), but some other insane cases are impossible to handle. If you do git diff --no-index --binary a /bin/echo you'll still get a patch like diff --git a/a b/bin/echo old mode 100644 new mode 100755 index ... and "git apply" will refuse to apply it for a couple of reasons, and the diff is simply bogus. And that, btw, is no longer a bug, I think. It's impossible to know whethe the user meant for the patch to be a rename or not. And as such, refusing to apply it because you don't know what name you should use is probably _exactly_ the right thing to do! Original problem reported by Imre Deak. Test script and problem description by Jeff King. Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Tuncer Ayaz 提交于
Fixes the `git clone --quiet` issue raised by Dave Jones in http://marc.info/?l=git&m=121529226023180&w=2 With this simple patch applied we no longer see the following remote messages as no-progress is correctly sent to the remote site: remote: Counting objects: 84102, done. remote: Compressing objects: 100% (24720/24720), done. remote: Total 84102 (delta 60949), reused 80810 (delta 57900) Signed-off-by: NTuncer Ayaz <tuncer.ayaz@gmail.com> Acked-by: NDaniel Barkalow <barkalow@iabervon.org> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Alexander Gavrilov 提交于
When performing copy detection, git-blame tries to read gitlinks as blobs, which causes it to die. This patch adds a check to skip them. Signed-off-by: NAlexander Gavrilov <angavrilov@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 SZEDER Gábor 提交于
We don't provide complation for git-commands in dashed form anymore, so there is no need to keep those cases. Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de> Tested-by: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 03 10月, 2008 4 次提交
-
-
由 Jakub Narebski 提交于
Note that those tests only check that there are no errors nor warnings from Perl; they do not check for example if gitweb doesn't use ARRAY(0x8e3cc20) instead of correct value in links, etc. Signed-off-by: NJakub Narebski <jnareb@gmail.com> Acked-by: NPetr Baudis <pasky@suse.cz> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Jakub Narebski 提交于
If we did try to access nonexistent directory or file, which means that git_get_hash_by_path() returns `undef`, uninitialized $hash variable was passed to 'open' call. Now we fail early with "404 Not Found - No such tree" error. (If we try to access something which does not resolve to tree-ish, for example a file / 'blob' object, the error will be caught later, as "404 Not Found - Reading tree failed" error). If we tried to use 'tree' action without $file_name ('f' parameter) set, which means either tree given by hash or a top tree (and we currently cannot distinguish between those two cases), we cannot print path breadcrumbs with git_print_page_path(). Fix this by moving call to git_print_page_path() inside conditional. Signed-off-by: NJakub Narebski <jnareb@gmail.com> Acked-by: NPetr Baudis <pasky@suse.cz> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 David Soria Parra 提交于
Solaris systems use the old styled iconv(3) call and therefore the OLD_ICONV variable should be set. Otherwise we get annoying compile warnings. Signed-off-by: NDavid Soria Parra <dsp@php.net> Acked-by: NJeff King <peff@peff.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Giuseppe Bilotta 提交于
This patch fixes PATH_INFO handling by removing the relevant part from $my_url and $my_uri, thus making it unnecessary to specify them by hand in the gitweb configuration. Signed-off-by: NGiuseppe Bilotta <giuseppe.bilotta@gmail.com> Acked-by: NJakub Narebski <jnareb@gmail.com> Acked-by: NPetr Baudis <pasky@suse.cz> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 01 10月, 2008 5 次提交
-
-
由 martin f. krafft 提交于
The need for "--" in the git-log synopsis was previously unclear and confusing. This patch makes it a little clearer. Thanks to hyy <yiyihu@gmail.com> for his help. [sp: Changed -- to \-- per prior commit e1ccf53a.] Signed-off-by: Nmartin f. krafft <madduck@madduck.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 SZEDER Gábor 提交于
... because they show up in the man and html outputs. This escaping is only needed for double dashes to be compatible with older asciidoc versions; see commit e1ccf53a ([PATCH] Escape asciidoc's built-in em-dash replacement, 2005-09-12). Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Luc Heinrich 提交于
When doing a set-tree and there is no revision to commit to, the following unrelated error message is displayed: "Undefined subroutine &Git::SVN::fatal called at /opt/local/libexec/git-core/git-svn line 2575." The following patch fixes the problem and allows the real error message to be shown. Signed-off-by: NLuc Heinrich <luc@honk-honk.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Michael Prokop 提交于
foo.org is an existing domain, use RFC 2606 complying example.com instead as used in other docs as well. Signed-off-by: NMichael Prokop <mika@grml.org> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 SZEDER Gábor 提交于
Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 30 9月, 2008 3 次提交
-
-
由 Shawn O. Pearce 提交于
* bc/maint-diff-hunk-header-fix: t4018-diff-funcname: test syntax of builtin xfuncname patterns diff hunk pattern: fix misconverted "\{" tex macro introducers diff: use extended regexp to find hunk headers diff.*.xfuncname which uses "extended" regex's for hunk header selection diff.c: associate a flag with each pattern and use it for compiling regex diff.c: return pattern entry pointer rather than just the hunk header pattern Conflicts: Documentation/gitattributes.txt
-
由 Shawn O. Pearce 提交于
* mg/maint-remote-fix: make "git remote" report multiple URLs
-
由 Rafael Garcia-Suarez 提交于
Currently, trying to use git-commit with unmerged files in the index will show the message "Error building trees", which can be a bit obscure to the end user. This patch makes the error message clearer, and consistent with what git-write-tree reports in a similar situation. Signed-off-by: NRafael Garcia-Suarez <rgarciasuarez@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 29 9月, 2008 5 次提交
-
-
由 Johan Herland 提交于
Also gets rid of a C++ comment. Signed-off-by: NJohan Herland <johan@herland.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Alex Riesen 提交于
Besides, it fixes a memleak (builtin-rm.c) and accidental change of the input const argument (builtin-merge-recursive.c). Signed-off-by: NAlex Riesen <raa.lkml@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Alex Riesen 提交于
The function has two potential users which both managed to get wrong their implementations (the one in builtin-rm.c one has a memleak, and builtin-merge-recursive.c scribles over its const argument). Signed-off-by: NAlex Riesen <raa.lkml@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Ping Yin 提交于
Since commit 55218("checkout: do not lose staged removal"), in cmd_add/cmd_update, "git checkout <commit>" following "git clone -n" may fail if <commit> is different from HEAD. So Use "git checkout -f <commit>" to fix this. Signed-off-by: NPing Yin <pkufranky@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Stephen Haberman 提交于
Signed-off-by: NStephen Haberman <stephen@exigencecorp.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 26 9月, 2008 2 次提交
-
-
由 Alex Riesen 提交于
The code was actually supposed to do that, but was accidentally broken. Noticed by Anders Melchiorsen. Signed-off-by: NAlex Riesen <raa.lkml@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Chris Frey 提交于
The process of overriding the default LESS options using only git-specific methods is rather obscure. Show the end user how to do it in a step-by-step manner. Signed-off-by: NChris Frey <cdfrey@foursquare.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 25 9月, 2008 4 次提交
-
-
由 Shawn O. Pearce 提交于
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Jonas Fonseca 提交于
Signed-off-by: NJonas Fonseca <fonseca@diku.dk> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Johan Herland 提交于
'git for-each-ref --format=%(subject)' currently returns an empty string if the log message does not contain a newline. This patch teaches 'git for-each-ref' to return the entire log message (instead of an empty string) if there is no newline in the log message. Signed-off-by: NJohan Herland <johan@herland.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Brandon Casey 提交于
apply_stash() and show_stash() each call rev-parse with '--default refs/stash' as an argument. This option causes rev-parse to operate on refs/stash if it is not able to successfully operate on any element of the command line. This includes failure to supply a "valid" revision. This has the effect of causing 'stash apply' and 'stash show' to operate as if stash@{0} had been supplied when an invalid revision is supplied. e.g. 'git stash apply stash@{1}' would fall back to 'git stash apply stash@{0}' This patch modifies these two functions so that they avoid using the --default option of rev-parse. Signed-off-by: NBrandon Casey <casey@nrlssc.navy.mil> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 24 9月, 2008 1 次提交
-
-
由 Deskin Miller 提交于
As the testcase demonstrates, it's possible for split_cmdline to return -1 and deallocate any memory it's allocated, if the config string is missing an end quote. In both the cases below, which are the only calling sites, the return isn't checked, and using the pointer causes a pretty immediate segfault. Signed-off-by: NDeskin Miller <deskinm@umich.edu> Acked-by: NMiklos Vajna <vmiklos@frugalware.org> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 23 9月, 2008 6 次提交
-
-
由 Brandon Casey 提交于
Signed-off-by: NBrandon Casey <casey@nrlssc.navy.mil> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Brandon Casey 提交于
Signed-off-by: NBrandon Casey <casey@nrlssc.navy.mil> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Petr Baudis 提交于
A comment on top of create_tmpfile() describes caveats ('can have problems on various systems (FAT, NFS, Coda)') that should apply in this situation as well. This in the end did not end up solving any of my personal problems, but it might be a useful cleanup patch nevertheless. Signed-off-by: NPetr Baudis <pasky@suse.cz> Acked-by: NLinus Torvalds <torvalds@linux-foundation.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Todd Zullinger 提交于
Signed-off-by: NTodd Zullinger <tmz@pobox.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Johannes Sixt 提交于
'git remote show' substituted the remote name into a string that was later used as a printf format string. If a remote name contains a printf format specifier like this: $ git remote add foo%sbar . then the command $ git remote show foo%sbar would print garbage (if you are lucky) or crash. This fixes it. Signed-off-by: NJohannes Sixt <johannes.sixt@telecom.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michael J Gruber 提交于
This patch makes "git remote -v" and "git remote show" report multiple URLs rather than warn about them. Multiple URLs are OK for pushing into multiple repos simultaneously. Without "-v" each repo is shown once only. Signed-off-by: NMichael J Gruber <git@drmicha.warpmail.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 21 9月, 2008 1 次提交
-
-
由 Junio C Hamano 提交于
Pointed out by Brandon Casey. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 20 9月, 2008 1 次提交
-
-
由 Junio C Hamano 提交于
Using ERE elements such as "|" (alternation) by backquoting in BRE is a GNU extension and should not be done in portable programs. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-