AgeCommit message (Collapse)Author
2007-08-31git-filter-branch: more detailed USAGEGiuseppe Bilotta
Signed-off-by: Giuseppe Bilotta <> Signed-off-by: Junio C Hamano <>
2007-08-31Makefile: do not allow gnu make to remove test-*.o filesJunio C Hamano
It appears parallel build (-j) gets confused. Signed-off-by: Junio C Hamano <>
2007-08-31Temporary fix for stack smashing in mailinfoAlex Riesen
Signed-off-by: Alex Riesen <> Signed-off-by: Junio C Hamano <>
2007-08-31Fixing comment in merge strategiesTom Clarke
Comments in both these strategies refer to the wrong number of remotes Signed-off-by: Tom Clarke <> Signed-off-by: Junio C Hamano <>
2007-08-30ls-files --error-unmatch: do not barf if the same pattern is given twice.Junio C Hamano
This is most visible when you do "git commit Makefile Makefile"; it may be a stupid request, but that is not a reason to fail the command. Signed-off-by: Junio C Hamano <>
2007-08-29Merge branch 'master' of git:// C Hamano
* 'master' of git:// gitk: Fix bug causing undefined variable error when cherry-picking
2007-08-29completion: also complete git-log's --left-right and --cherry-pick optionJohannes Schindelin
Both --left-right and --cherry-pick are particularly long to type, so help the user there. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2007-08-29gitk: Fix bug causing undefined variable error when cherry-pickingPaul Mackerras
When "Show nearby tags" is turned off and the user did a cherry-pick, we were trying to access variables relating to the descendent/ancestor tag & head computations in addnewchild though they hadn't been set. This makes sure we don't do that. Reported by Johannes Sixt. Signed-off-by: Paul Mackerras <>
2007-08-29git-daemon(1): assorted improvements.Junio C Hamano
Jari Aalto noticed a handful places in git-daemon documentation that need to be improved. * --inetd makes --pid-file to be ignored, in addition to --user and --group * receive-pack service was not described at all. We should, if only to warn about the security implications of it. * There was no example of per repository configuration. Signed-off-by: Junio C Hamano <>
2007-08-29GIT 1.5.3-rc7v1.5.3-rc7Junio C Hamano
Signed-off-by: Junio C Hamano <>
2007-08-29git-svn.txt: fix an obvious misspelling.David Kastrup
Signed-off-by: David Kastrup <> Signed-off-by: Junio C Hamano <>
2007-08-29git.el: Added colors for dark backgroundDavid Kågedal
Signed-off-by: Junio C Hamano <>
2007-08-29format-patch documentation: reword to hint "--root <one-commit>" more clearlyJunio C Hamano
Signed-off-by: Junio C Hamano <>
2007-08-29Merge branch 'jc/logsemantics'Junio C Hamano
* jc/logsemantics: "format-patch --root rev" is the way to show everything. Porcelain level "log" family should recurse when diffing.
2007-08-29Documentation/git-diff: A..B and A...B cannot take tree-ishesJunio C Hamano
As pointed out by Linus, these notations require the endpoints given by the end user to be commits. Clarify. Also, three-dots in AsciiDoc are turned into ellipses unless quoted with bq. Be careful. Signed-off-by: Junio C Hamano <>
2007-08-29git-add: Make the filename globbing note a bit clearerPetr Baudis
I think the trick with Git-side filename globbing is important and perhaps not that well known. Clarify a bit in git-add documentation what it means. Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2007-08-29git-add: Make the "tried to add ignored file" error message less confusingPetr Baudis
Currently the error message seems to imply (at least to me) that only the listed files were withheld and the rest of the files was added to the index, even though that's obviously not the case. Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2007-08-29gitweb: Fix escaping HTML of project owner in 'projects_list' andJakub Narebski
'summary' views This for example allows to put email address in the project owner field in the projects index file (when $projects_list points to a file, and not to a directory), in the form of: path/to/repo.git Random+J+Developer+<> Noticed-by: Jon Smirl <> Signed-off-by: Jakub Narebski <> Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2007-08-28"format-patch --root rev" is the way to show everything.Junio C Hamano
We used to trigger the special case "things not in origin" semantics only when one and only one positive ref is given, and no number (e.g. "git format-patch -4 origin") was specified, and used the general revision range semantics for everything else. This narrows the special case a bit more, by making: git format-patch --root this_version to show everything that leads to the named commit. More importantly, document the two different semantics better. The generic revision range semantics came later and bolted on without being clearly documented. Signed-off-by: Junio C Hamano <>
2007-08-28Porcelain level "log" family should recurse when diffing.Junio C Hamano
Most notably, "git log --name-status" stopped at top level directory changes without "-r" option. Signed-off-by: Junio C Hamano <>
2007-08-28git-merge: do up-to-date check also for all strategiesJunio C Hamano
This clarifies the logic to omit fast-forward check and omit trivial merge before running the specified strategy. The "index_merge" variable started out as a flag to say "do not do anything clever", but when recursive was changed to skip the trivial merge, the semantics were changed and the variable alone does not make sense anymore. This splits the variable into two, allow_fast_forward (which is almost always true, and avoids making a merge commit when the other commit is a descendant of our branch, but is set to false for ours and subtree) and allow_trivial_merge (which is false for ours, recursive and subtree). Unlike the earlier implementation, the "ours" strategy allows an up-to-date condition. When we are up-to-date, the result will be our commit, and by definition, we will have our tree as the result. Signed-off-by: Junio C Hamano <>
2007-08-28git --bare cmd: do not unconditionally nuke GIT_DIRJunio C Hamano
"GIT_DIR=some.where git --bare cmd" and worse yet "git --git-dir=some.where --bare cmd" were very confusing. They both ignored git-dir specified, and instead made $cwd as GIT_DIR. This changes --bare not to override existing GIT_DIR. This has been like this for a long time. Let's hope nobody sane relied on this insane behaviour. Signed-off-by: Junio C Hamano <>
2007-08-28Fix initialization of a bare repositoryJunio C Hamano
Here is my attempt to fix this with a minimally intrusive patch. * As "git --bare init" cannot tell if it was called with --bare or just "GIT_DIR=. git init", I added an explicit assignment of is_bare_repository_cfg on the codepath for "git --bare". * GIT_WORK_TREE alone without GIT_DIR does not make any sense, nor GIT_WORK_TREE with an explicit "git --bare". Catch that mistake. It might make sense to move this check to "git.c" side as well, but I tried to shoot for the minimum change for now. * Some scripts, especially from the olden days, rely on traditional GIT_DIR behaviour in "git init". Namely, these are some notable patterns: (create a bare repository) - mkdir some.git && cd some.git && GIT_DIR=. git init - mkdir some.git && cd some.git && git --bare init (create a non-bare repository) - mkdir .git && GIT_DIR=.git git init - mkdir .git && GIT_DIR=`pwd`/.git git init This comes with a new test script and also passes the existing test suite, but there may be cases that are still broken with the current tip of master and this patch does not yet fix. I'd appreciate help in straightening this mess out. Signed-off-by: Junio C Hamano <>
2007-08-28name-rev: Fix non-shortest descriptionJohannes Schindelin
Uwe Kleine-König noticed that under certain circumstances, name-rev picked a non-optimal tag. Jeff King analyzed that name-rev only takes into account the number of merge traversals, and then the _last_ number in the description. As an easy way to fix it, use a weighting factor for merge traversals: A merge traversal is now made 65535 times more expensive than a first-parent traversal. Signed-off-by: Johannes Schindelin <> Acked-by: Uwe Kleine-König <> Signed-off-by: Junio C Hamano <>
2007-08-28Describe two-dot and three-dot notation for diff endpoints.Mike Hommey
Signed-off-by: Junio C Hamano <>
2007-08-27git-tag(1): Remove duplicate textJari Aalto
Options -d, -l, -v have already been explained in OPTIONS below. Signed-off-by: Jari Aalto <> Signed-off-by: Junio C Hamano <>
2007-08-27gitweb: Lift any characters restriction on searched stringsPetr Baudis
Everything is already fully quoted along the way so I believe this to be unnecessary at this point. It would pose trouble for regexp searches. Signed-off-by: Petr Baudis <> Acked-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
2007-08-27RelNotes draft for 1.5.3 update.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2007-08-27Merge branch 'master' of git:// C Hamano
* 'master' of git:// git-gui: Correct 'git gui blame' in a subdirectory git-gui: Do not offer to stage three-way diff hunks into the index git-gui: Refactor diff pane popup support for future improvements git-gui: Fix "unoptimized loading" to not cause git-gui to crash git-gui: Paper bag fix "Stage Hunk For Commit" in diff context menu git-gui: Allow git-merge to use branch names in conflict markers git-gui: Fix window manager problems on ion3
2007-08-26When nothing to git-commit, honor the git-status color setting.Brian Hetro
Instead of disabling color all of the time during a git-commit, allow the user's config preference in the situation where there is nothing to commit. In this situation, the status is printed to the terminal and not sent to COMMIT_EDITMSG, so honoring the status color setting is expected. Signed-off-by: Brian Hetro <> Signed-off-by: Junio C Hamano <>
2007-08-26gitweb: Fix searchbox positioningPetr Baudis
Currently, searchbox is CSS'd to have position: absolute, which has the unfortunate consequence that if the viewport is too small and can't fit into the page width together with the navbar, it gets overlapped and part of the navbar gets obscured. This makes searchbox float: right instead, thus the navbar simply gets wrapped. Discovered and fix pointed out by Michael Olson <>. Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2007-08-26Merge branch 'master' of git:// C Hamano
* 'master' of git:// Documentation/user-manual.txt: fix a few omissions of gitlink commands. user-manual: fix incorrect header level user-manual: use pithier example commit user-manual: introduce the word "commit" earlier user-manual: minor editing for conciseness user-manual: edit "ignoring files" for conciseness Documentation/user-manual.txt: fix a few omissions of gitlink commands.
2007-08-26Merge branch 'maint'J. Bruce Fields
Conflicts: Documentation/user-manual.txt
2007-08-26Documentation/user-manual.txt: fix a few omissions of gitlink commands.David Kastrup
Signed-off-by: David Kastrup <>
2007-08-26user-manual: fix incorrect header levelJ. Bruce Fields
This section is a subsection of the "Examples" section. Signed-off-by: J. Bruce Fields <>
2007-08-26user-manual: use pithier example commitJ. Bruce Fields
Actually, we should have a competition for the favorite example commit. Criteria: - length: one-line changes with one-line comments preferred, and no long lines - significance/memorability - comic value Signed-off-by: J. Bruce Fields <>
2007-08-26user-manual: introduce the word "commit" earlierJ. Bruce Fields
Use the word "commit" as a synonym for "version" from the start. Signed-off-by: J. Bruce Fields <>
2007-08-26user-manual: minor editing for concisenessJ. Bruce Fields
Just cutting out a few unnecessary words. Signed-off-by: J. Bruce Fields <>
2007-08-26user-manual: edit "ignoring files" for concisenessJ. Bruce Fields
The immediate motivation for writing this section was to explain the various places ignore patterns could be used. However, I still think .gitignore is the case most people will want to learn about first. It also makes it a bit more concrete to introduce ignore patterns in the context of .gitignore first. And the existance of gitignore(5) relieves the pressure to explain it all here. So, stick to the .gitignore example, with only a brief mention of the others, explain the syntax only by example, and leave the rest to gitignore(5). Signed-off-by: J. Bruce Fields <> Cc: Johan Herland <>
2007-08-26Documentation/user-manual.txt: fix a few omissions of gitlink commands.David Kastrup
Signed-off-by: David Kastrup <>
2007-08-26Make usage documentation for git-add consistent.Brian Hetro
The usage string for the executable was missing --refresh. In addition, the documentation referred to "file", but the usage string referred to "filepattern". Updated the documentation to "filepattern", as git-add does handle patterns. Signed-off-by: Brian Hetro <> Signed-off-by: Junio C Hamano <>
2007-08-26Make usage documentation for git-am consistent.Brian Hetro
The usage information in now matches that of the documentation. Signed-off-by: Brian Hetro <> Signed-off-by: Junio C Hamano <>
2007-08-25Don't segfault if we failed to inflate a packed deltaShawn O. Pearce
Under some types of packfile corruption the zlib stream holding the data for a delta within a packfile may fail to inflate, due to say a CRC failure within the compressed data itself. When this occurs the unpack_compressed_entry function will return NULL as a signal to the caller that the data is not available. Unfortunately we then tried to use that NULL as though it referenced a memory location where a delta was stored and tried to apply it to the delta base. Loading a byte from the NULL address typically causes a SIGSEGV. cate on #git noticed this failure in `git fsck --full` where the call to verify_pack() first noticed that the packfile was corrupt by finding that the packfile's SHA-1 did not match the raw data of the file. After finding this fsck went ahead and tried to verify every object within the packfile, even though the packfile was already known to be bad. If we are going to shovel bad data at the delta unpacking code, we better handle it correctly. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2007-08-25pack-objects: check return value from read_sha1_file()Junio C Hamano
Signed-off-by: Junio C Hamano <>
2007-08-25blame: check return value from read_sha1_file()Junio C Hamano
Signed-off-by: Junio C Hamano <>
2007-08-25git-gui: Correct 'git gui blame' in a subdirectorygitgui-0.8.2Shawn O. Pearce
David Kastrup pointed out that the following sequence was not working as we had intended: $ cd lib $ git gui blame console.tcl fatal: cannot stat path lib/console.tcl: No such file or directory The problem here was we disabled the chdir to the root of the working tree when we are running with a "bare allowed" feature such as blame or browser, but we still kept the prefix we found via `git rev-parse --show-prefix`. This caused us to try and look for the file "console.tcl" within the subdirectory but also include the subdirectory's own path from the root of the working tree. This is unlikely to succeed, unless the user just happened to have a "lib/lib/console.tcl" file in the repository, in which case we would produce the wrong result. In the case of a bare repository we shouldn't get back a value from `rev-parse --show-prefix`, so really $_prefix should only be set to the non-empty string if we are in a working tree and we are in a subdirectory of that working tree. If this is true we really want to always be at the top level of the working tree, as all paths are accessed as though they were relative to the top of the working tree. Converting $_prefix to a ../ sequence is a fairly simple approach to moving up the requisite levels. Signed-off-by: Shawn O. Pearce <>
2007-08-25git-p4: Fix warnings about non-existant refs/remotes/p4/HEAD ref when ↵Simon Hausmann
running git-p4 sync the first time after a git clone. Don't create the p4/HEAD symbolic ref if p4/master doesn't exist yet. Signed-off-by: Simon Hausmann <> Signed-off-by: Junio C Hamano <>
2007-08-25git-p4: Make 'git-p4 branches' work after an initial clone with git clone ↵Simon Hausmann
from an origin-updated repository. After a clone with "git clone" of a repository the p4 branches are only in remotes/origin/p4/* and not in remotes/p4/*. Separate the code for detection and creation out of the P4Sync command class into standalone methods and use them from the P4Branches command. Signed-off-by: Simon Hausmann <> Signed-off-by: Junio C Hamano <>
2007-08-25Documentation: Correct various misspellings and typos.Brian Hetro
Fix minor typos throughout the documentation. Signed-off-by: Brian Hetro <> Signed-off-by: Junio C Hamano <>
2007-08-25Documentation: For consistency, use CVS instead of cvs.Brian Hetro
When not referring to the cvs command, CVS makes more sense. Signed-off-by: Brian Hetro <> Signed-off-by: Junio C Hamano <>