AgeCommit message (Collapse)Author
2007-08-23git-svn init/clone --stdlayout option to default-init trunk/tags/branchesmartin f. krafft
The --stdlayout option to git-svn init/clone initialises the default Subversion values of trunk,tags,branches: -T trunk -b branches -t tags. If any of the -T/-t/-b options are given in addition, they are given preference. [ew: fixed whitespace and added "-s" shortcut] Signed-off-by: martin f. krafft <> Signed-off-by: Eric Wong <>
2007-08-23diff-delta.c: Fix broken skip calculation.David Kastrup
A particularly bad case was HASH_LIMIT <= hash_count[i] < 2*HASH_LIMIT: in that case, only a single hash survived. For larger cases, 2*HASH_LIMIT was the actual limiting value after pruning. Signed-off-by: David Kastrup <> Acked-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2007-08-23Merge branch 'master' of git:// C Hamano
* 'master' of git:// Teach bash about git-submodule and its subcommands Teach bash to complete ref arguments to git-describe Update bash completion with new 1.5.3 command line options
2007-08-23git-svn: dcommit prints out the URL to be committed toEric Wong
This will print out the URL that dcommit will operate on. If used with --dry-run this will print out the URL without making changes to the repository. Signed-off-by: Eric Wong <>
2007-08-23Teach bash about git-submodule and its subcommandsShawn O. Pearce
The git-submodule command is new in 1.5.3 and contains a number of useful subcommands for working on submodules. We usually try to offer the subcommands of a git command in the bash completion, so here they are for git-submodule. Signed-off-by: Shawn O. Pearce <>
2007-08-23Teach bash to complete ref arguments to git-describeShawn O. Pearce
I'm often finding that I need to run git-describe on very long remote tracking branch names, to find out what tagged revision the remote tracking branch is now at (or not at). Typing out the ref names is painful, so bash completion on them is a very useful feature. Signed-off-by: Shawn O. Pearce <>
2007-08-23Update bash completion with new 1.5.3 command line optionsShawn O. Pearce
A number of commands have learned new tricks as part of git 1.5.3. If these are long options (--foo) we tend to support them in the bash completion, as it makes the user's task of using the option slightly easier. Signed-off-by: Shawn O. Pearce <>
2007-08-22git-svn: update documentation with CAVEATS sectionEric Wong
Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2007-08-22Reset terminal attributes when terminating git send-emailSean Estabrooks
If you break out of the prompts presented to you by git send-email your terminal can be left in an inconsistent state. Here we trap the interrupt signal and reset the terminal before exiting. Signed-off-by: Sean Estabrooks <> Signed-off-by: Junio C Hamano <>
2007-08-22Document -u option in git-svnimport man pageStefan Sperling
Signed-off-by: Junio C Hamano <>
2007-08-22Fix breakage in git-rev-list.txtQuy Tonthat
Also fix some innocent missing of quotes. Signed-off-by: Quy Tonthat <> Signed-off-by: Junio C Hamano <>
2007-08-22git.el: Avoid a lisp error when there's no current branch (detached HEAD).Alexandre Julliard
Signed-off-by: Alexandre Julliard <> Signed-off-by: Junio C Hamano <>
2007-08-22Fix git-remote for ActiveState PerlAlex Riesen
For reason unknown a package in ActiveState Perl 5.8.7 must implement READLINE method differently for scalar and array context. The code tested to work for more sane and recent version of perl (5.8.8 shipped with Ubuntu), so maybe it was always a requirement. Signed-off-by: Alex Riesen <> Signed-off-by: Junio C Hamano <>
2007-08-22Documentation: update tar.umask defaultRené Scharfe
As noted by Mike Hommey, the documentation for the config setting tar.umask is not up-to-date. Commit f08b3b0e2e9ad87767d80ff03b013c686e08ba4b changed the default from 0 to 2; this patch finally documents it. Signed-off-by: Rene Scharfe <> Signed-off-by: Junio C Hamano <>
2007-08-22Suggest unsetting core.bare when using new-workdir on a bare repositoryShawn O. Pearce
If core.bare is set to true in the config file of a repository that the user is trying to create a working directory from we should abort and suggest to the user that they remove the option first. If we leave the core.bare=true setting in the config file then working tree operations will get confused when they attempt to execute in the new workdir, as it shares its config file with the bare repository. The working tree operations will assume that the workdir is bare and abort, which is not what the user wants. If we changed core.bare to be false then working tree operations will function in the workdir but other operations may fail in the bare repository, as it claims to not be bare. If we remove core.bare from the config then Git can fallback on the legacy guessing behavior. This allows operations in the bare repository to work as though it were bare, while operations in the workdirs to act as though they are not bare. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2007-08-22Fix new-workdir (again) to work on bare repositoriesShawn O. Pearce
My day-job workflow involves using multiple workdirs attached to a bunch of bare repositories. Such repositories are stored inside of a directory called "foo.git", which means `git rev-parse --git-dir` will return "." and not ".git". Under such conditions new-workdir was getting confused about where the Git repository it was supplied is actually located. If we get "." for the result of --git-dir query it means we should use the user supplied path as-is, and not attempt to perform any magic on it, as the path is directly to the repository. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2007-08-21GIT 1.5.3-rc6v1.5.3-rc6Junio C Hamano
Hopefully last rc of 1.5.3 cycle, except a few documentation and message wording changes, and git-gui 0.8.2. Signed-off-by: Junio C Hamano <>
2007-08-21Merge branch 'master' of git:// C Hamano
* 'master' of git:// gitk: Add a window to list branches, tags and other references [PATCH] gitk: Handle 'copy from' and 'copy to' in diff headers. gitk: Fix bug in fix for warning when removing a branch
2007-08-21Avoid using va_copy in fast-import: it seems to be unportable.Alex Riesen
[sp: minor change to use fputs, thus reducing the patch size] Signed-off-by: Alex Riesen <> Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2007-08-20git clone: do not issue warning while cloning locally across filesystemsJunio C Hamano
Unless the user explicitly asked hardlinking with the '-l' option, we should not say "oops we cannot hardlink as you asked so we are copying". Signed-off-by: Junio C Hamano <>
2007-08-20gitk: Add a window to list branches, tags and other referencesPaul Mackerras
This adds an entry to the File menu labelled "List references" which pops up a window showing a sorted list of branches, tags, and other references, with a little icon beside each to indicate what sort it is. The list only shows refs that point to a commit that is included in the graph, and if you click on a ref, the corresponding commit is selected in the main window. The list of refs gets updated dynamically. Signed-off-by: Paul Mackerras <>
2007-08-20Fix misspelling of 'suppress' in docsDave Watson
Signed-off-by: Junio C Hamano <>
2007-08-20Document what the stage numbers in the :$n:path syntax mean.Steven Grimm
The git-rev-parse manpage talks about the :$n:path notation (buried deep in a list of other syntax) but it just says $n is a "stage number" -- someone who is not familiar with the internals of git's merge implementation is never going to be able to figure out that "1", "2", and "3" means. Signed-off-by: Junio C Hamano <>
2007-08-20Don't allow combination of -g and --reverse as it doesn't workShawn O. Pearce
The --walk-reflogs logic and the --reverse logic are completely incompatible with one another. Attempting to use both at the same time leads to confusing results that sometimes violates the user's formatting options or ignores the user's request to see the reflog message and timestamp. Unfortunately the implementation of both of these features is glued onto the side of the revision walking machinary in such a way that they are probably not going to be easy to make them compatible with each other. Rather than offering the user confusing results we are better off bailing out with an error message until such a time as the implementations can be refactored to be compatible. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2007-08-19Add the word reflog to Documentation/config.txt:core.logAllRefUpdatesLukas Sandström
This makes it easier to find out how to enable the reflog for a bare repository by searching the documentation for "reflog". Signed-off-by: Lukas Sandström <> Signed-off-by: Junio C Hamano <>
2007-08-19Add and document a global --no-pager option for git.Matthieu Moy
To keep the change small, this is done by setting GIT_PAGER to "cat". Signed-off-by: Matthieu Moy <> Acked-by: Linus Torvalds <> Acked-by: Brian Gernhardt <> Signed-off-by: Junio C Hamano <>
2007-08-19Take binary diffs into account for "git rebase"Linus Torvalds
We used to not generate a patch ID for binary diffs, but that means that some commits may be skipped as being identical to already-applied diffs when doing a rebase. So just delete the code that skips the binary diff. At the very least, we'd want the filenames to be part of the patch ID, but we might also want to generate some hash for the binary diff itself too. This fixes an issue noticed by Torgil Svensson. Tested-by: Torgil Svensson <> Signed-off-by: Linus Torvalds <> Signed-off-by: Junio C Hamano <>
2007-08-19Make thin-pack generation subproject aware.Linus Torvalds
When a thin pack wants to send a tree object at "sub/dir", and the commit that is common between the sender and the receiver that is used as the base object has a subproject at that path, we should not try to use the data at "sub/dir" of the base tree as a tree object. It is not a tree to begin with, and more importantly, the commit object there does not have to even exist. Signed-off-by: Junio C Hamano <>
2007-08-19Correct documentation of 'reflog show' to explain it shows HEADShawn O. Pearce
By default 'git reflog show' will show the reflog of 'HEAD' and not the reflog of the current branch. This is most likely due to the work done a while ago as part of the detached HEAD series to allow HEAD to have its own reflog independent of each branch's reflog. Since 'git reflog show' is really just an obscure alias for 'git log -g --abbrev-commit --pretty=oneline' it should behave the same way and its documentation should match. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2007-08-19Merge branch 'master' of git:// C Hamano
* 'master' of git:// git-gui: Added support for OS X right click git-gui: Avoid Tcl error in popup menu on diff viewer
2007-08-19Merge branch 'master' of git:// C Hamano
* 'master' of git:// [PATCH] gitk: Make the date/time display configurable [PATCH] gitk: Let user easily specify lines of context in diff view gitk: Fix warning when removing a branch
2007-08-19fast-import pull requestJunio C Hamano
* skip_optional_lf() decl is old-style -- please say static skip_optional_lf(void) { ... } * t9300 #14 fails, like this: * expecting failure: git-fast-import <input fatal: Branch name doesn't conform to GIT standards: .badbranchname fast-import: dumping crash report to .git/fast_import_crash_14354 ./ line 143: 14354 Segmentation fault git-fast-import <input -- >8 -- Subject: [PATCH] fastimport: Fix re-use of va_list The va_list is designed to be used only once. The current code reuses va_list argument may cause segmentation fault. Copy and release the arguments to avoid this problem. While we are at it, fix old-style function declaration of skip_optional_lf(). Signed-off-by: Junio C Hamano <> Signed-off-by: Shawn O. Pearce <>
2007-08-19Include recent command history in fast-import crash reportsShawn O. Pearce
When we crash the frontend developer (or end-user) may need to know roughly around what part of the input stream we had a problem with and aborted on. Because line numbers aren't very useful in this sort of application we instead just keep the last 100 commands in a FIFO queue and print them as part of the crash report. Currently one problem with this design is a commit that has more than 100 modified files in it will flood the FIFO and any context regarding branch/from/committer/mark/comments will be lost. We really should save only the last few (10?) file changes for the current commit, ensuring we have some prior higher level commands in the FIFO when we crash on a file M/D/C/R command. Another issue with this approach is the FIFO only includes the commands, it does not include the commit messages. Yet having a commit message may be useful to help locate the relevant change in the source material. In practice I don't think this is going to be a major concern as the frontend can always embed its own source change set identifier as a comment (which will appear in the crash report) and the commit message(s) for the most recent commits of any given branch should be obtainable from the (packed) commit objects. Signed-off-by: Shawn O. Pearce <>
2007-08-19Generate crash reports on die in fast-importShawn O. Pearce
As fast-import is quite strict about its input and die()'s anytime something goes wrong it can be difficult for a frontend developer to troubleshoot why fast-import rejected their input, or to even determine what input command it rejected. This change introduces a custom handler for Git's die() routine. When we receive a die() for any reason (fast-import or a lower level core Git routine we called) the error is first dumped onto stderr and then a more extensive crash report file is prepared in GIT_DIR. Finally we exit the process with status 128, just like the stock builtin die handler. An internal flag is set to prevent any further die()'s that may be invoked during the crash report generator from causing us to enter into an infinite loop. We shouldn't die() from our crash report handler, but just in case someone makes a future code change we are prepared to gaurd against small mistakes turning into huge problems for the end-user. Signed-off-by: Shawn O. Pearce <>
2007-08-19Allow frontends to bidirectionally communicate with fast-importShawn O. Pearce
The existing checkpoint command is very useful to force fast-import to dump the branches out to disk so that standard Git tools can access them and the objects they refer to. However there was not a way to know when fast-import had finished executing the checkpoint and it was safe to read those refs. The progress command can be used to make fast-import output any message of the frontend's choosing to standard out. The frontend can scan for these messages using select() or poll() to monitor a pipe connected to the standard output of fast-import. Signed-off-by: Shawn O. Pearce <>
2007-08-19Make trailing LF optional for all fast-import commandsShawn O. Pearce
For the same reasons as the prior change we want to allow frontends to omit the trailing LF that usually delimits commands. In some cases these just make the input stream more verbose looking than it needs to be, and its just simpler for the frontend developer to get started if our parser is slightly more lenient about where an LF is required and where it isn't. To make this optional LF feature work we now have to buffer up to one line of input in command_buf. This buffering can happen if we look at the current input command but don't recognize it at this point in the code. In such a case we need to "unget" the entire line, but we cannot depend upon the stdio library to let us do ungetc() for that many characters at once. Signed-off-by: Shawn O. Pearce <>
2007-08-19Make trailing LF following fast-import `data` commands optionalShawn O. Pearce
A few fast-import frontend developers have found it odd that we require the LF following a `data` command, especially in the exact byte count format. Technically we don't need this LF to parse the stream properly, but having it here does make the stream more readable to humans. We can easily make the LF optional by peeking at the next byte available from the stream and pushing it back into the buffer if its not LF. Signed-off-by: Shawn O. Pearce <>
2007-08-19Teach fast-import to ignore lines starting with '#'Shawn O. Pearce
Several frontend developers have asked that some form of stream comments be permitted within a fast-import data stream. This way they can include information from their own frontend program about where specific data was taken from in the source system, or about a decision that their frontend may have made while creating the fast-import data stream. This change introduces comments in the Bourne-shell/Tcl/Perl style. Lines starting with '#' are ignored, up to and including the LF. Unlike the above mentioned three languages however we do not look for and ignore leading whitespace. This just simplifies the definition of the comment format and the code that parses them. To make comments work we had to stop using read_next_command() within cmd_data() and directly invoke read_line() during the inline variant of the function. This is necessary to retain any lines of the input data that might otherwise look like a comment to fast-import. Signed-off-by: Shawn O. Pearce <>
2007-08-19Use handy ALLOC_GROW macro in fast-import when possibleShawn O. Pearce
Instead of growing our buffer by hand during the inline variant of cmd_data() we can save a few lines of code and just use the nifty new ALLOC_GROW macro already available to us. Signed-off-by: Shawn O. Pearce <>
2007-08-19Actually allow TAG_FIXUP branches in fast-importShawn O. Pearce
Michael Haggerty <> noticed while debugging a Git backend for cvs2svn that fast-import was barfing when he tried to use "TAG_FIXUP" as a branch name for temporary work needed to cleanup the tree prior to creating an annotated tag object. The reason we were rejecting the branch name was check_ref_format() returns -2 when there are less than 2 '/' characters in the input name. TAG_FIXUP has 0 '/' characters, but is technically just as valid of a ref as HEAD and MERGE_HEAD, so we really should permit it (and any other similar looking name) during import. New test cases have been added to make sure we still detect very wrong branch names (e.g. containing [ or starting with .) and yet still permit reasonable names (e.g. TAG_FIXUP). Signed-off-by: Shawn O. Pearce <>
2007-08-19Fix whitespace in "Format of STDIN stream" of fast-importAlex Riesen
Something probably assumed that HT indentation is 4 characters. Signed-off-by: Alex Riesen <> Signed-off-by: Shawn O. Pearce <>
2007-08-19git-completion.bash - add support for git-bundleMark Levedahl
Signed-off-by: Mark Levedahl <> Signed-off-by: Shawn O. Pearce <>
2007-08-17Clarify commit-tree documentationMike Hommey
As per , clarify git-commit-tree documentation. Signed-off-by: Mike Hommey <> Signed-off-by: Junio C Hamano <>
2007-08-17Minor clarifications to git-filter-branch usage and docBrian Gernhardt
- Remove "DESTBRANCH" from usage, as it rewrites the branches given. - Remove an = from an example usage, as the script doesn't understand it. Signed-off-by: Brian Gernhardt <> Signed-off-by: Junio C Hamano <>
2007-08-17Fix small typo in git send-email man page.Sean Estabrooks
Signed-off-by: Sean Estabrooks <> Signed-off-by: Junio C Hamano <>
2007-08-17git-submodule: re-enable 'status' as the default subcommandLars Hjemli
This was broken as part of ecda072380. Signed-off-by: Lars Hjemli <> Acked-by: Sven Verdoolaege <> Signed-off-by: Junio C Hamano <>
2007-08-17[PATCH] gitk: Handle 'copy from' and 'copy to' in diff headers.Johannes Sixt
If a commit contained a copy operation, the file name was not correctly determined, and the corresponding part of the patch could not be navigated to from the list of files. Signed-off-by: Johannes Sixt <> Signed-off-by: Paul Mackerras <>
2007-08-17gitk: Fix bug in fix for warning when removing a branchPaul Mackerras
My fix in commit b1054ac985aebc90c0a78202dab8477b74d7818a was only half-right, since it ignored the case where the descendent heads of the head being removed correspond to two or more different commits. This fixes it. Reported by Mark Levedahl. Signed-off-by: Paul Mackerras <>
2007-08-17Clean-up read-tree error condition.Junio C Hamano
This is a follow-up to f34f2b0b; list_tree() function is where it first notices that the command line fed too many trees for us to handle, so move the error exit message to there, and raise the MAX_TREES to 8 (not that it matters very much in practice). Acked-by: Linus Torvalds <> Signed-off-by: Junio C Hamano <>
2007-08-16Clarify actual behavior of 'git add' and ignored filesBrian Downing
Signed-off-by: Brian Downing <> Signed-off-by: Junio C Hamano <>