aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Add --quiet option to suppress output of "rm" commands for removed files.Steven Grimm2007-04-16
| | | | | Signed-off-by: Steven Grimm <koreth@midwinter.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Display the subject of the commit just made.Michael S. Tsirkin2007-04-16
| | | | | | | | | Useful e.g. to figure out what I did from screen history, or to make sure subject line is short enough and makes sense on its own. Signed-off-by: Michael S. Tsirkin <mst@dev.mellanox.co.il> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add policy on user-interface changesAndrew Ruder2007-04-15
| | | | | | | | Documentation/SubmittingPatches: Add note that all user interface changes should include associated documentation updates. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'maint'Junio C Hamano2007-04-15
|\ | | | | | | | | | | | | | | | | * maint: Document -g (--walk-reflogs) option of git-log sscanf/strtoul: parse integers robustly git-blame: Fix overrun in fake_working_tree_commit() [PATCH] Improve look-and-feel of the gitk tool. [PATCH] Teach gitk to use the user-defined UI font everywhere.
| * Document -g (--walk-reflogs) option of git-logAlex Riesen2007-04-15
| | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * sscanf/strtoul: parse integers robustlyJim Meyering2007-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | * builtin-grep.c (strtoul_ui): Move function definition from here, to... * git-compat-util.h (strtoul_ui): ...here, with an added "base" parameter. * builtin-grep.c (cmd_grep): Update use of strtoul_ui to include base, "10". * builtin-update-index.c (read_index_info): Diagnose an invalid mode integer that is out of range or merely larger than INT_MAX. (cmd_update_index): Use strtoul_ui, not sscanf. * convert-objects.c (write_subdirectory): Likewise. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Merge git://git2.kernel.org/pub/scm/gitk/gitk into maintJunio C Hamano2007-04-14
| |\ | | | | | | | | | | | | | | | * git://git2.kernel.org/pub/scm/gitk/gitk: [PATCH] Improve look-and-feel of the gitk tool. [PATCH] Teach gitk to use the user-defined UI font everywhere.
| | * [PATCH] Improve look-and-feel of the gitk tool.Eygene Ryabinkin2007-04-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made the default buttons on the dialog active and focused upon the dialog appearence. Bound 'Escape' and 'Return' keys to the dialog dismissal where it was appropriate: mainly for dialogs with only one button and no editable fields. Unified the look of the "About gitk" and "Key bindings" dialogs. Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru> Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * [PATCH] Teach gitk to use the user-defined UI font everywhere.Eygene Ryabinkin2007-04-01
| | | | | | | | | | | | | | | | | | | | | | | | Some parts of gitk were not respecting the default GUI font. Most of them were catched and fixed. Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | git-blame: Fix overrun in fake_working_tree_commit()Michael Spang2007-04-14
| | | | | | | | | | | | | | | | | | | | | git-blame would overflow commit->buffer when annotating files with long paths. Signed-off-by: Michael Spang <mspang@uwaterloo.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | ident.c: Use size_t (instead of int) to store sizesLuiz Fernando N. Capitulino2007-04-15
| | | | | | | | | | | | | | | Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | ident.c: Use const qualifier for 'struct passwd' parametersLuiz Fernando N. Capitulino2007-04-15
| | | | | | | | | | | | | | | Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint'Junio C Hamano2007-04-14
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: git-quiltimport complaining yet still working config.txt: Fix grammatical error in description of http.noEPSV config.txt: Change pserver to server in description of gitcvs.* config.txt: Document core.autocrlf config.txt: Document gitcvs.allbinary Do not default to --no-index when given two directories. Use rev-list --reverse in git-rebase.sh
| * | git-quiltimport complaining yet still workingLinus Torvalds2007-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two bugs: "stop_here" doesn't exist, but the bug that causes this code to trigger in the *first* place is the wrong use of "$dotest". It should be ".dotest" This is essentially the same bug introduced by 87ab7992, one was fixed with 0d38ab25 but this was somehow left behind. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | config.txt: Fix grammatical error in description of http.noEPSVFrank Lichtenheld2007-04-13
| | | | | | | | | | | | | | | | | | | | | s/doesn't/don't/ since "ftp servers" is plural Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | config.txt: Change pserver to server in description of gitcvs.*Frank Lichtenheld2007-04-13
| | | | | | | | | | | | | | | | | | | | | | | | These variables apply to the SSH access as well, so don't use pserver here which might confuse users. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | config.txt: Document core.autocrlfFrank Lichtenheld2007-04-13
| | | | | | | | | | | | | | | | | | | | | Text shamelessly stolen from the 1.5.1 release notes. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | config.txt: Document gitcvs.allbinaryFrank Lichtenheld2007-04-13
| | | | | | | | | | | | | | | Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Do not default to --no-index when given two directories.Junio C Hamano2007-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-diff -- a/ b/ always defaulted to --no-index, primarily because the function is_in_index() was implemented quite incorrectly. Noticed by Patrick Maaß and Simon Schubert independently, initial patch was provided by Patrick but I fixed it differently. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Use rev-list --reverse in git-rebase.shAlex Riesen2007-04-13
| | | | | | | | | | | | | | | | | | | | | ...and drop the last perl dependency in the script. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'jc/cherry'Junio C Hamano2007-04-12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/cherry: Documentation: --cherry-pick git-log --cherry-pick A...B Refactor patch-id filtering out of git-cherry and git-format-patch. Add %m to '--pretty=format:'
| * | | Documentation: --cherry-pickJunio C Hamano2007-04-11
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | git-log --cherry-pick A...BJunio C Hamano2007-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is meant to be a saner replacement for "git-cherry". When used with "A...B", this filters out commits whose patch text has the same patch-id as a commit on the other side. It would probably most useful to use with --left-right. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Refactor patch-id filtering out of git-cherry and git-format-patch.Junio C Hamano2007-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the patch-id computation and recording library, patch-ids.c, and rewrites the get_patch_ids() function used in cherry and format-patch to use it, so that they do not pollute the object namespace. Earlier code threw non-objects into the in-core object database, and hoped for not getting bitten by SHA-1 collisions. While it may be practically Ok, it still was an ugly hack. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Add %m to '--pretty=format:'Junio C Hamano2007-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When used with '--boundary A...B', this shows the -/</> marker you would get with --left-right option to 'git-log' family. When symmetric diff is not used, everybody is shown to be on the "right" branch. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'maint'Junio C Hamano2007-04-12
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * maint: handle_options in git wrapper miscounts the options it handled.
| * | | handle_options in git wrapper miscounts the options it handled.Matthias Lederhofer2007-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handle_options did not count the number of used arguments correctly. When --git-dir was used the extra argument was not added to the number of handled arguments. Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Fix git {log,show,...} --pretty=emailJunio C Hamano2007-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An earlier --subject-prefix patch forgot that format-patch is not the only codepath that adds the "[PATCH]" prefix, and broke everybody else in the log family. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Don't yap about merge-subtree during makeShawn O. Pearce2007-04-12
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default we are pretty quiet about the actual commands that we are running. So we should continue to be quiet about the new merge-subtree hardlink to merge-recursive. Technically this is not a builtin, but it is close because subtree is actually builtin to a non-builtin. So lets just make things easy and call it a builtin. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | sscanf/strtoul: parse integers robustlyJim Meyering2007-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * builtin-grep.c (strtoul_ui): Move function definition from here, to... * git-compat-util.h (strtoul_ui): ...here, with an added "base" parameter. * builtin-grep.c (cmd_grep): Update use of strtoul_ui to include base, "10". * builtin-update-index.c (read_index_info): Diagnose an invalid mode integer that is out of range or merely larger than INT_MAX. (cmd_update_index): Use strtoul_ui, not sscanf. * convert-objects.c (write_subdirectory): Likewise. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Add testcase for format-patch --subject-prefix (take 3)Robin H. Johnson2007-04-11
| | | | | | | | | | | | | | | | | | | | | Add testcase for format-patch --subject-prefix support. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Add custom subject prefix support to format-patch (take 3)Robin H. Johnson2007-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new option to git-format-patch, entitled --subject-prefix that allows control of the subject prefix '[PATCH]'. Using this option, the text 'PATCH' is replaced with whatever input is provided to the option. This allows easily generating patches like '[PATCH 2.6.21-rc3]' or properly numbered series like '[-mm3 PATCH N/M]'. This patch provides the implementation and documentation. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint'Junio C Hamano2007-04-11
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * maint: GIT 1.5.1.1 cvsserver: Fix handling of diappeared files on update fsck: do not complain on detached HEAD. (encode_85, decode_85): Mark source buffer pointer as "const".
| * | GIT 1.5.1.1v1.5.1.1Junio C Hamano2007-04-11
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | cvsserver: Fix handling of diappeared files on updateFrank Lichtenheld2007-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only send a modified response if the client sent a "Modified" entry. This fixes the case where the file was locally deleted on the client without being removed from CVS. In this case the client will only have sent the Entry for the file but nothing else. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Acked-by: Martin Langhoff <martin@catalyst.net.nz> Acked-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | fsck: do not complain on detached HEAD.Junio C Hamano2007-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detached HEAD is just a normal state of a repository. Do not say anything about it. Do not give worrying "error:" messages when we let the user know that the HEAD points at nothing (i.e. yet to be born branch), nor we do not have any default refs to start following the objects chain. Reword them as "notice:". Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | (encode_85, decode_85): Mark source buffer pointer as "const".Jim Meyering2007-04-11
| | | | | | | | | | | | | | | Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | gitweb: Allow configuring the default projects order and add order 'none'Frank Lichtenheld2007-04-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce new configuration variable $default_projects_order that can be used to specify the default order of projects on the index page if no 'o' parameter is given. Allow a new value 'none' for order that will cause the projects to be in the order we learned about them. In case of reading the list of projects from a file, this should be the order as they are listed in the file. In case of reading the list of projects from a directory this will probably give random results depending on the filesystem in use. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Acked-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | gitweb: Allow forks with project list fileFrank Lichtenheld2007-04-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to use the forks feature even when reading the list of projects from a file, by creating a list of known prefixes as we go. Forks have to be listed after the main project in order to be recognised as such. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Acked-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint'Junio C Hamano2007-04-10
|\ \ \ | |/ / | | | | | | | | | | | | * maint: Documentation: show-ref: document --exclude-existing cvsexportcommit -p : fix the usage of git-apply -C.
| * | Documentation: show-ref: document --exclude-existingJulian Phillips2007-04-09
| | | | | | | | | | | | | | | | | | | | | | | | Use the comment in the code to document the --exclude-existing function to git-show-ref. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | cvsexportcommit -p : fix the usage of git-apply -C.Tomash Brechko2007-04-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike 'patch --fuzz=NUM', which specifies the number of lines allowed to mismatch, 'git-apply -CNUM' requests the match of NUM lines of context. Omitting -C requests full context match, and that's what should be used for cvsexportcommit -p. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | git-archive: make tar the default formatRené Scharfe2007-04-09
| | | | | | | | | | | | | | | | | | | | | | | | As noted by Junio, --format=tar should be assumed if no format was specified. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'jc/push'Junio C Hamano2007-04-08
|\ \ \ | | | | | | | | | | | | | | | | | | | | * jc/push: git-push to multiple locations does not stop at the first failure git-push reports the URL after failing.
| * | | git-push to multiple locations does not stop at the first failureJunio C Hamano2007-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When pushing into multiple repositories with git push, via multiple URL in .git/remotes/$shorthand or multiple url variables in [remote "$shorthand"] section, we used to stop upon the first failure. Continue the operation and report the failure at the end. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | git-push reports the URL after failing.Junio C Hamano2007-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This came up on #git when somebody was getting 'unable to create ./objects/tmp_oXXXX' but sweared he had write permission to that directory. It turned out that the repository URL was changed and he was accessing a repository he does not have a write permission anymore. I am not sure how much this would have helped somebody who believed he was accessing location when the permission of that location was changed while he was looking the other way, though. But giving more information on the error path would be better, and the next change would be helped with this as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'jc/merge-subtree'Junio C Hamano2007-04-08
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/merge-subtree: A new merge stragety 'subtree'. It is safe to merge this early as this is a feature that user explicitly needs to ask for and would not trigger otherwise. A known issue with the current implementation is that the subtree matching heuristics is very stupid. It could run ls-tree twice and try to count intersection. Giving it wider audience would help it to get improved by motivated volunteers. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | A new merge stragety 'subtree'.Junio C Hamano2007-04-07
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merge strategy largely piggy-backs on git-merge-recursive. When merging trees A and B, if B corresponds to a subtree of A, B is first adjusted to match the tree structure of A, instead of reading the trees at the same level. This adjustment is also done to the common ancestor tree. If you are pulling updates from git-gui repository into git.git repository, the root level of the former corresponds to git-gui/ subdirectory of the latter. The tree object of git-gui's toplevel is wrapped in a fake tree object, whose sole entry has name 'git-gui' and records object name of the true tree, before being used by the 3-way merge code. If you are merging the other way, only the git-gui/ subtree of git.git is extracted and merged into git-gui's toplevel. The detection of corresponding subtree is done by comparing the pathnames and types in the toplevel of the tree. Heuristics galore! That's the git way ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'js/fetch-progress'Junio C Hamano2007-04-08
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * js/fetch-progress: git-fetch: add --quiet
| * | | | git-fetch: add --quietJunio C Hamano2007-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass it to underlying fetch-pack, and also have it affect if -v is passed to http-fetch and rsync. Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 00:58:50 +0000