summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Whip post 1.5.3.3 maintenance series into shape.Junio C Hamano2007-10-014-8/+30
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git stash: document apply's --index switchMiklos Vajna2007-10-011-1/+6
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* post-receive-hook: Remove the From field from the generated email header so ↵Andy Parkins2007-10-011-1/+0
| | | | | | | | | | | | | that the pusher's name is used Using the name of the committer of the revision at the tip of the updated ref is not sensible. That information is available in the email itself should it be wanted, and by supplying a "From", we were effectively hiding the person who performed the push - which is useful information in itself. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-remote: exit with non-zero status after detecting errors.Jari Aalto2007-09-291-4/+10
| | | | | | | | | Some subcommands of "git-remote" detected and issued error messages but did not signal that to the calling process with exit status. Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* rebase -i: squash should retain the authorship of the _first_ commitJohannes Schindelin2007-09-293-3/+3
| | | | | | | | | | | It was determined on the mailing list, that it makes more sense for a "squash" to keep the author of the first commit as the author for the result of the squash. Make it so. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-add--interactive: Improve behavior on bogus inputJean-Luc Herren2007-09-291-4/+3
| | | | | | | | | | | | | | 1) Previously, any menu would cause a perl error when entered '0', which is never a valid option. 2) Entering a bogus choice (like 998 or 4-2) surprisingly caused the same behavior as if the user had just hit 'enter', which means to carry out the selected action on the selected items. Entering such bogus input is now a no-op and the sub-menu doesn't exit. Signed-off-by: Jean-Luc Herren <jlh@gmx.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-add--interactive: Allow Ctrl-D to exitJean-Luc Herren2007-09-291-1/+6
| | | | | | | | | | Hitting Ctrl-D (EOF) is a common way to exit shell-like tools. When in a sub-menu it will still behave as if an empty line had been entered, carrying out the action on the selected items and returning to the previous menu. Signed-off-by: Jean-Luc Herren <jlh@gmx.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.3.3v1.5.3.3Junio C Hamano2007-09-292-1/+38
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Fix revision log diff setup, avoid unnecessary diff generationLinus Torvalds2007-09-291-2/+8
| | | | | | | | | | | | | | | | | | | | | | We used to incorrectly start calculating diffs whenever any argument but '-z' was recognized by the diff options parsing. That was bogus, since not all arguments result in diffs being needed, so we just waste a lot of time and effort on calculating diffs that don't matter. This actually also fixes another bug in "git log". Try this: git log -C and notice how it prints an extra empty line in between log entries, even though it never prints the actual diff (because we didn't ask for any diff format, so the diff machinery never prints anything). With this patch, that bogus empty line is gone, because "revs->diff" is never set. So this isn't just a "wasted time and effort" issue, it's also a slight semantic fix. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-bundle: fix commandline examples in the manpageMiklos Vajna2007-09-291-0/+8
| | | | | | | Multiple commands were displayed in one line, making the manpage hard to read. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maintJunio C Hamano2007-09-291-7/+8
|\ | | | | | | | | | | | | * 'mergetool' of git://repo.or.cz/git/mergetool: mergetool: Fix typo in options passed to kdiff3 mergetool: fix emerge when running in a subdirectory Mergetool generating blank files (1.5.3)
| * mergetool: Fix typo in options passed to kdiff3Theodore Ts'o2007-09-281-2/+2
| | | | | | | | | | | | Fix missing double hyphens in "-L1" and "-L2" Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
| * mergetool: fix emerge when running in a subdirectoryTheodore Ts'o2007-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | Only pass the basename of the output filename when to emerge, since emerge interprets non-absolute pathnames relative to the containing directory of the output buffer. Thanks to Kelvie Wong for pointing this out. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
| * Mergetool generating blank files (1.5.3)Junio C Hamano2007-09-281-3/+4
| | | | | | | | | | | | | | | | | | | | When mergetool is run from a subdirectory, "ls-files -u" nicely limits the output to conflicted files in that directory, but we need to give the full path to cat-file plumbing to grab the contents of stages. Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* | quiltimport: Skip non-existent patchesDan Nicholson2007-09-271-0/+4
|/ | | | | | | | When quiltimport encounters a non-existent patch in the series file, just skip to the next patch. This matches the behavior of quilt. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin2007-09-263-21/+31
| | | | | | | | | | | | | | | | | | | | git-am used "git apply -z --index-info" to find the original versions of the files touched by the diff, to be able to do an inexpensive three-way merge. This operation makes only sense in a repository, since the index information in the diff refers to blobs, which have to be present in the current repository. Therefore, teach "git apply" a mode to write out the result as an index file to begin with, obviating the need for scripts to do it themselves. The sole user for --index-info is "git am" is converted to use --build-fake-ancestor in this patch. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Move make_cache_entry() from merge-recursive.c into read-cache.cCarlos Rica2007-09-263-24/+26
| | | | | | | | The function make_cache_entry() is too useful to be hidden away in merge-recursive. So move it to libgit.a (exposing it via cache.h). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* core-tutorial: correct URLRandy Dunlap2007-09-251-1/+2
| | | | | | | | | | | | | | The tinyurl is incorrect -- it attempts to go to groups.osdl.org, which is gone. Either use the full URL (in patch) or create a new tinyurl for this URL. Is the web page (where I first saw this problem) generated from this txt file? http://www.kernel.org/pub/software/scm/git/docs/core-tutorial.html If not, it needs to be updated also. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Fix spelling of overridden in documentationShawn Bohrer2007-09-252-2/+2
| | | | | Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* gitattributes.txt: Be more to the point in the filter driver description.Johannes Sixt2007-09-251-5/+4
| | | | | | | | | The description was meant to emphasizes that the project should remain usable even if the filter driver was not used. This makes it more explicit and removes the "here is rope to hang yourself" paraphrase. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'crlf' ↵Johannes Sixt2007-09-251-11/+0
| | | | | | | | | | interaction. The order in which 'ident' and 'crlf' are carried out is documented a few paragraphs later again, after 'filter' was introduced. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* user-manual: Explain what submodules are good for.Michael Smith2007-09-251-12/+42
| | | | | | | | | | Rework the introduction to the Submodules section to explain why someone would use them, and fix up submodule references from the tree-object and todo sections. Signed-off-by: Michael Smith <msmith@cbnco.com> Acked-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'jn/web' into maintJunio C Hamano2007-09-251-36/+2
|\ | | | | | | | | | | * jn/web: gitweb: No difftree output for trivial merge gitweb: Remove parse_from_to_diffinfo code from git_patchset_body
| * gitweb: No difftree output for trivial mergeJakub Narebski2007-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | In 'commitdiff' view, for the merge commit, there is an extra header for the difftree table, with links to commitdiffs to individual parents. Do not show such header when there is nothing to show, for trivial merges. This means that for trivial merge you have to go to 'commit' view to get links to diffs to each parent. Signed-off-by: Jakub Narebski <jnareb@gmail.com>
| * gitweb: Remove parse_from_to_diffinfo code from git_patchset_bodyJakub Narebski2007-09-231-35/+1
| | | | | | | | | | | | | | | | | | | | | | | | In commit 90921740bd00029708370673fdc537522aa48e6f "gitweb: Split git_patchset_body into separate subroutines" a part of git_patchset_body code was separated into parse_from_to_diffinfo subroutine. But instead of replacing the separated code by the call to mentioned subroutine, the call to subroutine was placed before the separated code. This patch removes parse_from_to_diffinfo code from git_patchset_body subroutine. Signed-off-by: Jakub Narebski <jnareb@gmail.com>
* | Do not over-quote the -f envelopesender value.Jim Meyering2007-09-251-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | Without this, the value passed to sendmail would have an extra set of single quotes. At least exim's sendmail emulation would object to that: exim: bad -f address "'list-addr@example.org'": malformed address: ' \ may not follow 'list-addr@example.org error: hooks/post-receive exited with error code 1 Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | unexpected Make output (e.g. from --debug) causes build failureJim Meyering2007-09-251-1/+1
| | | | | | | | | | | | | | | | Without this, the extra output produced e.g., by "make --debug" would go into $INSTLIBDIR and then cause the sed command to fail. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Fixed minor typo in t/t9001-send-email.sh test command line.Glenn Rempe2007-09-241-1/+1
|/ | | | | | | The git-send-email command line in the test was missing a single hyphen. Signed-off-by: Glenn Rempe <glenn@rempe.us> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maintJunio C Hamano2007-09-231-7/+213
|\ | | | | | | | | | | * 'maint' of git://linux-nfs.org/~bfields/git: User Manual: add a chapter for submodules user-manual: don't assume refs are stored under .git/refs
| * User Manual: add a chapter for submodulesMiklos Vajna2007-09-231-0/+202
| | | | | | | | | | | | Signed-off-by: Michael Smith <msmith@cbnco.com> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| * user-manual: don't assume refs are stored under .git/refsJ. Bruce Fields2007-09-231-7/+11
| | | | | | | | | | | | | | | | | | | | | | The scripts taken from Tony Luck's howto assume all refs can be found under .git/refs, but this is not necessarily true, especially since git-gc runs git-pack-refs. Also add a note warning of this in the chapter that introduces refs, and fix the same incorrect assumption in one other spot. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
* | git-svn: don't attempt to spawn pager if we don't want oneEric Wong2007-09-231-1/+1
| | | | | | | | | | | | | | | | | | Even though config_pager() unset the $pager variable, we were blindly calling exec() on it through run_pager(). Noticed-by: Chris Moore <christopher.ian.moore@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Supplant the "while case ... break ;; esac" idiomDavid Kastrup2007-09-2319-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of shell scripts contained stuff starting with while case "$#" in 0) break ;; esac and similar. I consider breaking out of the condition instead of the body od the loop ugly, and the implied "true" value of the non-matching case is not really obvious to humans at first glance. It happens not to be obvious to some BSD shells, either, but that's because they are not POSIX-compliant. In most cases, this has been replaced by a straight condition using "test". "case" has the advantage of being faster than "test" on vintage shells where "test" is not a builtin. Since none of them is likely to run the git scripts, anyway, the added readability should be worth the change. A few loops have had their termination condition expressed differently. Signed-off-by: David Kastrup <dak@gnu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Detect exec bit in more cases.David Brown2007-09-221-1/+9
| | | | | | | | | | | | | | git-p4 was missing the execute bit setting if the file had other attribute bits set. Acked-By: Simon Hausmann <simon@lst.de>
* | Conjugate "search" correctly in the git-prune-packed man page.Matt Kraai2007-09-211-1/+1
| | | | | | | | | | Signed-off-by: Matt Kraai <kraai@ftbfs.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Move the paragraph specifying where the .idx and .pack files should beMatt Kraai2007-09-211-4/+4
| | | | | | | | | | Signed-off-by: Matt Kraai <kraai@ftbfs.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation/git-lost-found.txt: drop unnecessarily duplicated name.Junio C Hamano2007-09-211-1/+1
|/ | | | | | | | I only did this back when I wanted to make sure git-log and gitk work properly with non Occidental characters. There is really no reason to keep it around. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.3.2v1.5.3.2Junio C Hamano2007-09-193-2/+60
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Fixed update-hook example allow-users format.Väinö Järvelä2007-09-181-4/+4
| | | | | | | | | | | | | | | | | | The example provided with the update-hook-example does not work on either bash 2.05b.0(1)-release nor 3.1.17(1)-release. The matcher did not match the lines that it advertised to match, such as: refs/heads/bw/ linus refs/heads/tmp/* * In POSIX 1003.2 regular expressions, the star (*), is not an wildcard meaning "match everything", it matches 0 or more matches of the atom preceding it. So to match "refs/heads/bw/topic-branch", the matcher should be written as "refs/heads/bw/.*" to match "refs/heads/bw/" and everything after it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation/git-svn: updated design philosophy notesEric Wong2007-09-181-5/+6
| | | | | | | | | This section has not been updated in a while and --branches/--tags/--trunk options are commonly used nowadays. Noticed-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* t/t4014: test "am -3" with mode-only change.Junio C Hamano2007-09-181-2/+5
| | | | | | | | Earlier commit ece7b74903007cee8d280573647243d46a6f3a95 added a test for rebase that uses "am -3", but this adds a test to check "am -3" itself. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Fix lapsus in builtin-apply.cPierre Habouzit2007-09-181-1/+1
| | | | | Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-push: documentation and tests for pushing only branchesJeff King2007-09-183-4/+14
| | | | | | | | | Commit 098e711e caused git-push to match only branches when considering which refs to push. This patch updates the documentation accordingly and adds a test for this behavior. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-svnimport: Use separate arguments in the pipe for git-rev-parseMatthias Urlichs2007-09-181-1/+1
| | | | | | | | Some people seem to create SVN branch names with spaces or other shell metacharacters. Signed-off-by: Matthias Urlichs <smurf@smurf.noris.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Document ls-files --with-tree=<tree-ish>Junio C Hamano2007-09-171-1/+8
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-commit: partial commit of paths only removed from the indexJunio C Hamano2007-09-172-3/+14
| | | | | | | | | | Because a partial commit is meant to be a way to ignore what are staged in the index, "git rm --cached A && git commit A" should just record what is in A on the filesystem. The previous patch made the command sequence to barf, saying that A has not been added yet. This fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-commit: Allow partial commit of file removal.Junio C Hamano2007-09-173-1/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When making a partial commit, git-commit uses git-ls-files with the --error-unmatch option to expand and sanity check the user supplied path patterns. When any path pattern does not match with the paths known to the index, it errors out, in order to catch a common mistake to say "git commit Makefiel cache.h" and end up with a commit that touches only cache.h (notice the misspelled "Makefile"). This detection however does not work well when the path has already been removed from the index. If you drop a path from the index and try to commit that partially, i.e. $ git rm COPYING $ git commit -m 'Remove COPYING' COPYING the command complains because git does not know anything about COPYING anymore. This introduces a new option --with-tree to git-ls-files and uses it in git-commit when we build a temporary index to write a tree object for the partial commit. When --with-tree=<tree-ish> option is specified, names from the given tree are added to the set of names the index knows about, so we can treat COPYING file in the example as known. Of course, there is no reason to use "git rm" and git-aware people have long time done: $ rm COPYING $ git commit -m 'Remove COPYING' COPYING which works just fine. But this caused a constant confusion. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'jc/grep-c' into maintJunio C Hamano2007-09-172-14/+80
|\ | | | | | | | | * jc/grep-c: Split grep arguments in a way that does not requires to add /dev/null.
| * Split grep arguments in a way that does not requires to add /dev/null.Junio C Hamano2007-09-142-14/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to (almost) always show the name of the file without relying on "-H" option of GNU grep, we used to add /dev/null to the argument list unless we are doing -l or -L. This caused "/dev/null:0" to show up when -c is given in the output. It is not enough to add -c to the set of options we do not pass /dev/null for. When we have too many files, we invoke grep multiple times and we need to avoid giving a widow filename to the last invocation -- otherwise we will not see the name. This keeps two filenames when the argv[] buffer is about to overflow and we have not finished iterating over the index, so that the last round will always have at least two paths to work with (and not require /dev/null). An obvious and the only exception is when there is only 1 file that is given to the underlying grep, and in that case we avoid passing /dev/null and let the external "grep -c" report only the number of matches. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano2007-09-178-45/+293
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'maint' of git://repo.or.cz/git-gui: git-gui: Disable native platform text selection in "lists" git-gui: Paper bag fix "Commit->Revert" format arguments git-gui: Provide 'uninstall' Makefile target to undo an installation git-gui: Font chooser to handle a large number of font families git-gui: Make backporting changes from i18n version easier git-gui: Don't delete send on Windows as it doesn't exist git-gui: Trim trailing slashes from untracked submodule names git-gui: Assume untracked directories are Git submodules git-gui: handle "deleted symlink" diff marker git-gui: show unstaged symlinks in diff viewer git-gui: Avoid use of libdir in Makefile git-gui: Disable Tk send in all git-gui sessions git-gui: lib/index.tcl: handle files with % in the filename properly git-gui: Properly set the state of "Stage/Unstage Hunk" action git-gui: Fix detaching current branch during checkout git-gui: Correct starting of git-remote to handle -w option
View Lorry Controller Status