Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
GIT 1.5.1 Signed-off-by: Junio C Hamano <junkio@cox.net>
Tags
v1.5.1
Junio C Hamano
Merge 1.5.0.7 in Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
GIT 1.5.0.7 Not that this release really matters, as we will be doing 1.5.1 tomorrow. This commit is to tie the loose ends and merge all of "maint" branch into "master" in preparation. Signed-off-by: Junio C Hamano <junkio@cox.net>
Tags
v1.5.0.7
Jakub Narębski
Documentation: A few minor fixes to Git User's Manual Mainly consistent usage of "git command" and not "git-command" syntax Signed-off-by: Jakub Narebski <jnareb@gmail.com> Acked-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nicolas Pitre
Plug memory leak in index-pack collision checking codepath.
Junio C Hamano
rerere should not repeat the earlier hunks in later ones When a file has more then one conflicting hunks, it repeated the contents of previous hunks in output for later ones. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Hopefully final update to the draft Release Notes, preparing for 1.5.1 Signed-off-by: Junio C Hamano <junkio@cox.net>
Frank Lichtenheld
cvsserver: Don't lie about binary mode in asciidoc documentation The git-cvsserver documentation claims that the server will set -k modes if appropriate which is not really the case. On the other hand the available gitcvs.allbinary variable is not documented at all. Fix both these issues by rewording the related paragraph. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong
git-svn: fail on rebase if we are unable to find a ref to rebase against If we're on an invalid HEAD, we should detect this and avoid attempting to continue. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Alex Riesen
Keep rename/rename conflicts of intermediate merges while doing recursive merge This patch leaves the base name in the resulting intermediate tree, to propagate the conflict from intermediate merges up to the top-level merge. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Julian Phillips
contrib/workdir: add a simple script to create a working directory Add a simple script to create a working directory that uses symlinks to point at an exisiting repository. This allows having different branches in different working directories but all from the same repository. Based on a description from Junio of how he creates multiple working directories[1]. With the following caveat: "This risks confusion for an uninitiated if you update a ref that is chec…
Andy Parkins
Reimplement emailing part of hooks--update in contrib/hooks/post-receive-email The update hook is no longer the correct place to generate emails; there is now the hooks/post-receive script which is run automatically after a ref has been updated. This patch is to make use of that new location, and to address some faults in the old update hook. The primary problem in the conversion was that in the update hook, the ref has not actually been changed, but is about to be. In th…
Eric Wong
git-svn: avoid respewing similar error messages for missing paths We ignore errors if the path we're tracking did not exist for a particular revision range, but we still print out warnings telling the user about that. As pointed out by Seth Falcon, this amounts to a lot of warnings that could confuse and worry users. I'm not entirely comfortable completely silencing the warnings, but showing one warning per path that we track should be reasonable. Signed-off-…
Theodore Ts'o
Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS This fixes a problem reported by Randal Schwartz: >I finally tracked down all the (albeit inconsequential) errors I was getting >on both OpenBSD and OSX. It's the warn() function in usage.c. There's >warn(3) in BSD-style distros. It'd take a "great rename" to change it, but if >someone with better C skills than I have could do that, my linker and I would >appreciate it. It was annoying to me,…
Don Zickus
git-mailinfo fixes for patch munging Don't translate the patch to UTF-8, instead preserve the data as is. This also reverts a test case that was included in the original patch series. Also allow overwriting the authorship and title information we gather from RFC2822 mail headers with additional in-body headers, which was pointed out by Linus. Signed-off-by: Don Zickus <dzickus@redhat.com> Signed-off-by: Junio C Hamano <junkio@cox.…
Jakub Narębski
gitweb: Support comparing blobs (files) with different names Fix the bug that caused "blobdiff" view called with new style URI for a rename with change diff to be show as new (added) file diff. New style URI for "blobdiff" for rename means with $hash_base ('hb') and $hash_parent_base ('hpb') paramaters denoting tree-ish (usually commit) of a blobs being compared, together with both $file_name ('f') and $file_parent ('fp') parameters. It is done by adding …
Junio C Hamano
Do not bother documenting fetch--tool Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Update draft release notes for 1.5.1 Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'maint' * maint: git-upload-pack: make sure we close unused pipe ends Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES. Documentation/git-svnimport.txt: fix typo.
Francis Daly
git-quiltimport /bin/sh-ism fix Bryan Wu reported /usr/local/bin/git-quiltimport: 114: Syntax error: Missing '))' Most bourne-ish shells I have here accept x=$((echo x)|cat) but all bourne-ish shells I have here accept x=$( (echo x)|cat) because $(( might mean arithmetic expansion. Signed-off-by: Francis Daly <francis@daoine.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Christian Couder
Bisect: Improve error message in "bisect_next_check". So we can remove the specific message in "bisect_run". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git/mergetool.git * 'master' of git://repo.or.cz/git/mergetool.git: mergetool: Clean up description of files and prompts for merge resolutions mergetool: Make git-rm quiet when resolving a deleted file conflict mergetool: Add support for Apple Mac OS X's opendiff command mergetool: Fix abort command when resolving symlinks and deleted files mergetool: Remove spurious error message if merge.tool config opt…
Theodore Ts'o
mergetool: Clean up description of files and prompts for merge resolutions This fixes complaints from Junio for how messages and prompts are printed when resolving symlink and deleted file merges. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Theodore Ts'o
mergetool: Make git-rm quiet when resolving a deleted file conflict Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Theodore Ts'o
mergetool: Add support for Apple Mac OS X's opendiff command Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Theodore Ts'o
mergetool: Fix abort command when resolving symlinks and deleted files Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Theodore Ts'o
mergetool: Remove spurious error message if merge.tool config option not set Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Theodore Ts'o
mergetool: factor out common code Create common function check_unchanged(), save_backup() and remove_backup(). Also fix some minor whitespace issues while we're at it. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Theodore Ts'o
mergetool: portability fix: don't use reserved word function Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Theodore Ts'o
mergetool: portability fix: don't assume true is in /bin Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
  1. Prev
  2. Next