summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* atomic write for sideband remote messagesNicolas Pitre2006-10-114-17/+19
| | | | | | | | | | | | | | | | | | | | | It has been a few times that I ended up with such a confusing display: |remote: Generating pack... |remote: Done counting 17 objects. |remote: Result has 9 objects. |remote: Deltifying 9 objects. |remote: 100% (9/9) done |remote: Unpacking 9 objects |Total 9, written 9 (delta 8), reused 0 (delta 0) | 100% (9/9) done The confusion can be avoided in most cases by writing the remote message in one go to prevent interleacing with local messages. The buffer declaration has been moved inside recv_sideband() to avoid extra string copies. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git.spec.in: perl subpackage is installed in perl_vendorlib not vendorarchJunio C Hamano2006-10-111-1/+1
| | | | Signed-off-by: Junio C Hamano <junio@hera.kernel.org>
* git-pull: we say commit X, not X commit.Junio C Hamano2006-10-101-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-fetch --update-head-ok typofixJunio C Hamano2006-10-101-3/+3
| | | | | | | | Martin Waitz noticed that one of the case arms had an impossible choice. It turns out that what it was checking was redundant and the typo did not have any effect. Signed-off-by: Junio C Hamano <junkio@cox.net>
* paginate git-diff by defaultMartin Waitz2006-10-101-1/+1
|
* add commit count options to git-shortlogv1.4.3-rc2Nicolas Pitre2006-10-092-7/+54
| | | | | | | | | | | | | | | | | | | This patch does 3 things: 1) Output the number of commits along with the name for each author (nice to know for long lists spending more than a screen worth of commit lines). 2) Provide a switch (-n) to sort authors according to their number of commits instead of author alphabetic order. 3) Provide a switch (-s) to supress commit lines and only keep a summary of authors and the number of commits for each of them. And for good measure a short usage is displayed with -h. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix git-revertJunio C Hamano2006-10-091-1/+3
| | | | | | | | | Defaulting to $replay for the sake of fixing cherry-pick was not done conditionally, which broke git-revert. Noticed by Luben. Signed-off-by: Junio C Hamano <junkio@cox.net>
* gitweb: Cleanup Git logo and Git logo target generationJakub Narebski2006-10-082-8/+14
| | | | | | | | | | | | | | | | | | Rename $githelp_url and $githelp_label to $logo_url and $logo_label to be more obvious what they refer to; while at it add commented out previous contents (git documentation at kernel.org). Add comment about logo size. Use $cgi->a(...) to generate Git logo link; it automatically escapes attribute values when it is needed. Escape href attribute using esc_url instead of (incorrect!) esc_html. Move styling of git logo <img> element from "style" attribute to CSS via setting class to "logo". Perhaps we should set it by id rather than by class. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-tar-tree: don't RUN_SETUPRene Scharfe2006-10-081-1/+1
| | | | | | | | | | Noted by Jiri Slaby, git-tar-tree --remote doesn't need to be run from inside of a git archive. Since git-tar-tree is now only a wrapper for git-archive, which calls setup_git_directory() as needed, we should drop the flag RUN_SETUP. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* test-lib: separate individual test better in verbose mode.Martin Waitz2006-10-071-0/+3
| | | | | | | | | | When running tests with --verbose it is difficult to see where one test starts and where it ends because everything is printed in one big lump. Fix that by printing one single newline between each test. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-commit: fix coding style.Martin Waitz2006-10-071-231/+233
| | | | | | | | | git-commit.sh was using a mixture of spaces and tabs for indentation. This is changed to one tab per indentation level. No code changes. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* gitweb: [commit view] Do not suppress commitdiff link in root commitPetr Baudis2006-10-071-1/+1
| | | | | | | | There's no reason for that, the commitdiff view is meaningful for the root commit as well and we link to it everywhere else. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* gitweb: Handle commits with empty commit messages more reasonablyPetr Baudis2006-10-071-0/+3
| | | | | | | | Currently those look very weird, you can't get easily at the commit view etc. This patch makes their title '(no commit message)'. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* gitweb: Separate (new) and (deleted) in commitdiff by a spacePetr Baudis2006-10-071-2/+2
| | | | | | | Currently it's pasted to the sha1 of the blob and looks ugly. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Show snapshot link in shortlog only if have_snapshoPetr Baudis2006-10-071-2/+4
| | | | | Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* gitweb: refactor decode() for utf8 conversionYasushi SHOJI2006-10-061-7/+13
| | | | | | | | we already had a few place using decode() to convert perl internal encode to utf8. added a new thin wrapper to do just that. Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add default values for --window and --depth to the docsDennis Stosberg2006-10-062-4/+6
| | | | | | | | | Currently, you actually have to read the source to find out the default values. While at it, fix two typos and suggest that these options actually take a parameter in git-pack-objects.txt. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* cherry-pick: make -r the defaultJunio C Hamano2006-10-052-12/+23
| | | | | | | And introduce -x to expose (possibly) private commit object name for people who cherry-pick between public branches. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-send-email: avoid uninitialized variable warning.Junio C Hamano2006-10-051-1/+1
| | | | | | | The code took length of $reply_to when it was not even defined, causing -w to warn. Signed-off-by: Junio C Hamano <junkio@cox.net>
* gitweb: Make the Git logo link target to point to the homepageJunio C Hamano2006-10-051-1/+6
| | | | | | | | | | | It provides more useful information for causual Git users than the Git docs (especially about where to get Git and such). People can override with GITWEB_CONFIG if they want to. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> Acked-by: Petr Baudis <pasky@suse.cz>
* gitweb: blame: Minimize vertical table row paddingLuben Tuikov2006-10-051-0/+6
| | | | | | | | | | | | | | | | | | Minimize vertical table row padding for blame only. I discovered this while having the browser's blame output right next to my editor's window, only to notice how much vertically stretched the blame output was. Blame most likely shows source code and is in this way more "spartan" than the rest of the tables gitweb shows. This patch makes the blame table more vertically compact, thus being closer to what you'd see in your editor's window, as well as reusing more window estate to show more information (which in turn minimizes scrolling). Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* gitweb: Do not print "log" and "shortlog" redundantly in commit viewLuben Tuikov2006-10-051-5/+0
| | | | | | | | | | | | Do not print "log" and "shortlog" redundantly in commit view. This is passed into the $extra argument of git_print_page_nav from git_commit, but git_print_page_nav prints "log" and "shortlog" already with the same head. Noticed by Junio. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* vc-git.el: Switch to using git-blame instead of git-annotate.Alexandre Julliard2006-10-051-2/+2
| | | | | Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git.el: Fixed inverted "renamed from/to" message.Alexandre Julliard2006-10-051-2/+2
| | | | | | | | The deleted file should be labeled "renamed to" and the added file "renamed from", not the other way around (duh!) Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* tar-tree deprecation: we eat our own dog food.Junio C Hamano2006-10-052-5/+9
| | | | | | | | | | | It is silly to keep using git-tar-tree in dist target when the command gives a big deprecation warning when called. Instead, use "git-archive --format=tar" which we recommend to our users. Update gitweb's snapshot feature to use git-archive for the same reason. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add git-upload-archive to the main git man pageFranck Bui-Huu2006-10-051-0/+3
| | | | | Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-commit: cleanup unused function.Martin Waitz2006-10-031-27/+0
| | | | | | | The report() function is not used anymore. Kill it. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix usage string to match that given in the man pageAlan Chandler2006-10-031-1/+1
| | | | | | | | Still not managed to understand git-send-mail sufficiently well to not accidently miss of this list when I sending it to Junio Signed-off-by: Alan Chandler <alan@chandlerfamily.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update the gitweb/README file to include setting the GITWEB_CONFIG environmentAlan Chandler2006-10-031-0/+7
| | | | | Signed-off-by: Alan Chandler <alan@chandlerfamily.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* gitweb: document webserver configuration for common gitweb/repo URLs.Martin Waitz2006-10-031-1/+25
| | | | | | | | Add a small apache configuration which shows how to use apache to put gitweb and GIT repositories at the same URL. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* gitweb: Escape ESCAPE (\e) characterLuben Tuikov2006-10-031-0/+1
| | | | | | | | Take a look at commit 20a3847d8a5032ce41f90dcc68abfb36e6fee9b1 using gitweb before this patch. This patch fixes this. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* escape tilde in Documentation/git-rev-parse.txtJunio C Hamano2006-10-032-1/+2
| | | | | | | | | | | | Fixes a failure to build the git-rev-parse manpage, seen with asciidoc 8.0.0 We would love to use nicer quoting $$~$$ but alas asciidoc 7 does not know about it. So use asciidoc.conf and define {tilde} to be &#126;. Signed-off-by: Junio C Hamano <junkio@cox.net> Acked-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
* Error in test description of t1200-tutorialRobin Rosenberg2006-10-031-1/+1
| | | | | Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* lock_ref_sha1_basic does not remove empty directories on BSDDennis Stosberg2006-10-031-0/+6
| | | | | | | | | | lock_ref_sha1_basic relies on errno beeing set to EISDIR by the call to read() in resolve_ref() to detect directories. But calling read() on a directory under NetBSD returns EPERM, and even succeeds for local filesystems on FreeBSD. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'maint'Junio C Hamano2006-10-023-4/+24
|\ | | | | | | | | | | * maint: git-push: .git/remotes/ file does not require SP after colon git-mv: invalidate the removed path properly in cache-tree
| * git-push: .git/remotes/ file does not require SP after colonv1.4.2.3Junio C Hamano2006-10-021-4/+4
| | | | | | | | | | | | | | | | Although most people would have one after colon if only for readability, we never required it in git-parse-remote, so let's not require one only in git-push. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-mv: invalidate the removed path properly in cache-treeJunio C Hamano2006-10-012-0/+20
| | | | | | | | | | | | | | The command updated the cache without invalidating the cache tree entries while removing an existing entry. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Makefile: install and clean merge-recur, still.Junio C Hamano2006-10-011-3/+3
| | | | | | | | | | | | | | | | | | We advertised git-merge-recur for some time, and we planned to support it for one release after we made it the 'recursive'. However we forgot to install it nor have "make clean" clean it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 1.4.3-rc1v1.4.3-rc1Junio C Hamano2006-10-011-1/+1
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2006-10-010-0/+0
|\ \ | |/ | | | | | | | | | | * maint: git-diff -B output fix. Fix git-am safety checks Fix duplicate xmalloc in builtin-add
| * git-diff -B output fix.v1.4.2.2Junio C Hamano2006-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | Geert noticed that complete rewrite diff missed the usual a/ and b/ leading paths. Pickaxe says it never worked, ever. Embarrassing. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from bc1a5807575b2f34538d4158834da6524a4fc1f7 commit)
| * Fix git-am safety checksJunio C Hamano2006-09-171-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An earlier commit cbd64af added a check that prevents "git-am" to run without its standard input connected to a terminal while resuming operation. This was to catch a user error to try feeding a new patch from its standard input while recovery. The assumption of the check was that it is an indication that a new patch is being fed if the standard input is not connected to a terminal. It is however not quite correct (the standard input can be /dev/null if the user knows the operation does not need any input, for example). This broke t3403 when the test was run with its standard input connected to /dev/null. When git-am is given an explicit command such as --skip, there is no reason to insist that the standard input is a terminal; we are not going to read a new patch anyway. Credit goes to Gerrit Pape for noticing and reporting the problem with t3403-rebase-skip test. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Fix duplicate xmalloc in builtin-addLiu Yubao2006-09-171-1/+0
| | | | | | | | | | | | [jc: patch came without sign-off but it was too obvious and trivial.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'jc/gitpm'Junio C Hamano2006-09-3013-77/+1819
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/gitpm: (52 commits) Remove -fPIC which was only needed for Git.xs Git.pm: Kill Git.xs for now Revert "Make it possible to set up libgit directly (instead of from the environment)" Revert "Git.pm: Introduce fast get_object() method" Revert "Convert git-annotate to use Git.pm" Fix compilation with Sun CC pass DESTDIR to the generated perl/Makefile Eliminate Scalar::Util usage from private-Error.pm Convert git-annotate to use Git.pm Git.pm: Introduce fast get_object() method Make it possible to set up libgit directly (instead of from the environment) Work around sed and make interactions on the backslash at the end of line. Git.pm: Introduce ident() and ident_person() methods Convert git-send-email to use Git.pm Git.pm: Add config() method Use $GITPERLLIB instead of $RUNNING_GIT_TESTS and centralize @INC munging INSTALL: a tip for running after building but without installing. Perly Git: make sure we do test the freshly built one. Git.pm: Don't #define around die Git.xs: older perl do not know const char * ...
| * | Remove -fPIC which was only needed for Git.xsJunio C Hamano2006-09-294-22/+1
| | | | | | | | | | | | | | | | | | | | | | | | The distinction between BASIC_ vs ALL_ is still kept, since it is not Git.xs specific -- we could face the same issue when we do other language bindings (e.g. Python). Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Git.pm: Kill Git.xs for nowPetr Baudis2006-09-235-224/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes Git.xs from the repository for the time being. This should hopefully enable Git.pm to finally make its way to master. Git.xs is not going away forever. When the Git libification makes some progress, it will hopefully return (but most likely as an optional component, due to the portability woes) since the performance boosts are really important for applications like Gitweb or Cogito. It needs to go away now since it is not really reliable in case you use it for several repositories in the scope of a single process, and that is not possible to fix without some either very ugly or very intrusive core changes. Rest in peace. (While you can.) Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Revert "Make it possible to set up libgit directly (instead of from the ↵Junio C Hamano2006-09-027-114/+24
| | | | | | | | | | | | | | | | | | environment)" This reverts commit 0270083ded143fd49841e3d3d0cac5eb06081d2a.
| * | Revert "Git.pm: Introduce fast get_object() method"Junio C Hamano2006-09-022-42/+0
| | | | | | | | | | | | This reverts commit 3c479c37f8651d09e1d08b8d6ea9757164ee1235.
| * | Revert "Convert git-annotate to use Git.pm"Junio C Hamano2006-09-021-32/+151
| | | | | | | | | | | | This reverts commit 7fb39d5f58efd05e982fe148630edc97ded753b6.
| * | Fix compilation with Sun CCDennis Stosberg2006-08-153-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add the CFLAGS variable to config.mak.in to override the Makefile's default, which is gcc-specific and won't work with Sun CC. - Prefer "cc" over "gcc", because Pasky's Git.pm will not compile with gcc on Solaris at all. On Linux and the free BSDs "cc" is linked to "gcc" anyway. - Set correct flag to generate position-independent code. - Add "-xO3" (= use default optimization level) to CFLAGS. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status