- 10 10月, 2008 17 次提交
-
-
由 Shawn O. Pearce 提交于
* js/objc-funchdr: Teach git diff about Objective-C syntax
-
由 Shawn O. Pearce 提交于
* pb/gitweb: gitweb: Support for simple project search form gitweb: Make the by_tag filter delve in forks as well gitweb: Support for tag clouds gitweb: Add support for extending the action bar with custom links gitweb: Sort the list of forks on the summary page by age gitweb: Clean-up sorting of project list
-
由 Shawn O. Pearce 提交于
* dm/svn-branch: Add git-svn branch to allow branch creation in SVN repositories
-
由 Shawn O. Pearce 提交于
* bc/xdiffnl: xdiff-interface.c: strip newline (and cr) from line before pattern matching
-
由 Shawn O. Pearce 提交于
* dp/cywginstat: cygwin: Use native Win32 API for stat mingw: move common functionality to win32.h add have_git_dir() function
-
由 Shawn O. Pearce 提交于
* lt/time-reject-fractional-seconds: date/time: do not get confused by fractional seconds
-
由 Shawn O. Pearce 提交于
* jc/add-ita: git-add --intent-to-add (-N)
-
由 Shawn O. Pearce 提交于
* mw/sendemail: bash completion: Add --[no-]validate to "git send-email" send-email: signedoffcc -> signedoffbycc, but handle both Docs: send-email: Create logical groupings for man text Docs: send-email: Create logical groupings for --help text Docs: send-email: Remove unnecessary config variable description Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to send-email: change --no-validate to boolean --[no-]validate Docs: send-email: Man page option ordering Docs: send-email usage text much sexier Docs: send-email's usage text and man page mention same options
-
由 Shawn O. Pearce 提交于
* mv/merge-refresh: builtin-merge: refresh the index before calling a strategy
-
由 Shawn O. Pearce 提交于
* ph/parseopt: parse-opt: migrate builtin-merge-file. parse-opt: migrate git-merge-base. parse-opt: migrate fmt-merge-msg.
-
由 Shawn O. Pearce 提交于
* rz/grepz: git grep: Add "-z/--null" option as in GNU's grep.
-
由 Shawn O. Pearce 提交于
* mg/verboseprune: make prune report removed objects on -v
-
由 Shawn O. Pearce 提交于
* maint: builtin-apply: fix typo leading to stack corruption git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1) builtin-merge.c: allocate correct amount of memory Makefile: do not set NEEDS_LIBICONV for Solaris 8 rebase -i: remove leftover debugging rebase -i: proper prepare-commit-msg hook argument when squashing
-
由 Shawn O. Pearce 提交于
* sg/maint-intrebase-msghook: rebase -i: remove leftover debugging rebase -i: proper prepare-commit-msg hook argument when squashing
-
由 Imre Deak 提交于
This typo led to stack corruption for lines with whitespace fixes and length > 1024. Signed-off-by: NImre Deak <imre.deak@gmail.com> Looks-good-by: NJunio C Hamano <gitster@pobox.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Brandon Casey 提交于
The referenced commit tried to fix a flaw in stash's handling of a user supplied invalid ref. i.e. 'git stash apply fake_ref@{0}' should fail instead of applying stash@{0}. But, it did so in a naive way by avoiding the use of the --default option of rev-parse, and instead manually supplied the default revision if the user supplied an empty command line. This prevented a common usage scenario of supplying flags on the stash command line (i.e. non-empty command line) which would be parsed by lower level git commands, without supplying a specific revision. This should fall back to the default revision, but now it causes an error. e.g. 'git stash show -p' The correct fix is to use the --verify option of rev-parse, which fails properly if an invalid ref is supplied, and still allows falling back to a default ref when one is not supplied. Convert stash-drop to use --verify while we're at it, since specifying multiple revisions for any of these commands is also an error and --verify makes it so. Signed-off-by: NBrandon Casey <casey@nrlssc.navy.mil> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Shawn O. Pearce 提交于
* jk/maint-soliconv: Makefile: do not set NEEDS_LIBICONV for Solaris 8
-
- 09 10月, 2008 2 次提交
-
-
由 Miklos Vajna 提交于
This patch just removes an unnecessary goto which makes the code easier to read and shorter. Signed-off-by: NMiklos Vajna <vmiklos@frugalware.org> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Brandon Casey 提交于
Fix two memory allocation errors which allocate space for a pointer rather than enough space for the structure itself. This: struct commit_list *parent = xmalloc(sizeof(struct commit_list *)); should have been this: struct commit_list *parent = xmalloc(sizeof(struct commit_list)); But while we're at it, change the allocation to reference the variable it is allocating memory for to try to prevent a similar mistake, for example if the type is changed, in the future. Signed-off-by: NBrandon Casey <casey@nrlssc.navy.mil> Acked-by: NMiklos Vajna <vmiklos@frugalware.org> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 08 10月, 2008 7 次提交
-
-
由 Shawn O. Pearce 提交于
* maint: Do not use errno when pread() returns 0 git init: --bare/--shared overrides system/global config git-push.txt: Describe --repo option in more detail git rm: refresh index before up-to-date check Fix a few typos in relnotes
-
由 Samuel Tardieu 提交于
If we use pread() while at the end of the file, it will return 0, which is not an error from the operating system point of view. In this case, errno has not been set and must not be used. Signed-off-by: NSamuel Tardieu <sam@rfc1149.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Brandon Casey 提交于
Many call sites immediately initialize allocated memory with zero after calling xmalloc. A single call to xcalloc can replace this two-call sequence. Signed-off-by: NBrandon Casey <casey@nrlssc.navy.mil> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Deskin Miller 提交于
If core.bare or core.sharedRepository are set in /etc/gitconfig or ~/.gitconfig, then 'git init' will read the values when constructing a new config file; reading them, however, will override the values specified on the command line. In the case of --bare, this ends up causing a segfault, without the repository being properly initialised; in the case of --shared, the permissions are set according to the existing config settings, not what was specified on the command line. This fix saves any specified values for --bare and --shared prior to reading existing config settings, and restores them after reading but before writing the new config file. core.bare is ignored in all situations, while core.sharedRepository will only be used if --shared is not specified to git init. Also includes testcases which use a specified global config file override, demonstrating the former failure scenario. Signed-off-by: NDeskin Miller <deskinm@umich.edu> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Johannes Sixt 提交于
The --repo option was described in a way that the reader would have to assume that it is the same as the <repository> parameter. But it actually servers a purpose, which is now written down. Furthermore, the --mirror option was missing from the synopsis. Signed-off-by: NJohannes Sixt <johannes.sixt@telecom.at> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Johannes Schindelin 提交于
Since "git rm" is supposed to be porcelain, we should convince it to be user friendly by refreshing the index itself. Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Mikael Magnusson 提交于
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 07 10月, 2008 2 次提交
-
-
由 Jonathan del Strother 提交于
Add support for recognition of Objective-C class & instance methods, C functions, and class implementation/interfaces. Signed-off-by: NJonathan del Strother <jon.delStrother@bestbefore.tv> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Florian Ragwitz 提交于
[ew: fixed a warning to stderr causing t9108 to fail] Signed-off-by: NFlorian Ragwitz <rafl@debian.org> Signed-off-by: NDeskin Miller <deskinm@umich.edu> Acked-by: NEric Wong <normalperson@yhbt.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 06 10月, 2008 11 次提交
-
-
由 Shawn O. Pearce 提交于
* maint: Update release notes for 1.6.0.3 Teach rebase -i to honor pre-rebase hook docs: describe pre-rebase hook do not segfault if make_cache_entry failed make prefix_path() never return NULL fix bogus "diff --git" header from "diff --no-index" Fix fetch/clone --quiet when stdout is connected builtin-blame: Fix blame -C -C with submodules. bash: remove fetch, push, pull dashed form leftovers Conflicts: diff.c
-
由 Shawn O. Pearce 提交于
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>
-
由 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 1 次提交
-
-
由 Miklos Vajna 提交于
In case a file is touched but has no real changes then we just have to update the index and should not error out. Signed-off-by: NMiklos Vajna <vmiklos@frugalware.org> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-