AgeCommit message (Collapse)Author
2007-09-14diff --no-index: do not forget to run diff_setup_done()Junio C Hamano
Code inspection by Linus found this. Signed-off-by: Junio C Hamano <>
2007-09-14git-format-patch --in-reply-to: accept <message@id> with angle bracketsJunio C Hamano
This will allow RFC-literate users to say: format-patch --in-reply-to='<>' without forcing them to strip the surrounding angle brackets like this: format-patch --in-reply-to='' We accept both forms, and the latter gets necessary < and > around it as before. Signed-off-by: Junio C Hamano <>
2007-09-14git-add -u: do not barf on type changesJunio C Hamano
Signed-off-by: Junio C Hamano <>
2007-09-14Remove duplicate note about removing commits with git-filter-branchUlrik Sverdrup
A duplicate of an already existing section in the documentation of git-filter-branch was added in commit f95eef15f2f8a336b9a42749f5458c841a5a5d63. This patch removes that redundant section. Signed-off-by: Ulrik Sverdrup <> Signed-off-by: Junio C Hamano <>
2007-09-14git-clone: improve error message if curl program is missing or not executableGerrit Pape
If the curl program is not available (or not executable), and git clone is started to clone a repository through http, this is the output Initialized empty Git repository in /tmp/puppet/.git/ /usr/bin/git-clone: line 37: curl: command not found Cannot get remote repository information. Perhaps git-update-server-info needs to be run there? This patch improves the error message by checking the return code when running curl to exit immediately if it's 126 or 127; the error output now is Initialized empty Git repository in /tmp/puppet/.git/ /usr/bin/git-clone: line 37: curl: command not found Adrian Bridgett noticed this and reported through Signed-off-by: Gerrit Pape <> Signed-off-by: Junio C Hamano <>
2007-09-14hooks--update: Explicitly check for all zeros for a deleted ref.Alexandre Julliard
The previous check caused the hook to reject as unannotated any tag whose SHA1 starts with a zero. Signed-off-by: Alexandre Julliard <> Signed-off-by: Junio C Hamano <>
2007-09-12Merge branch 'sp/maint-no-thin' into maintJunio C Hamano
* sp/maint-no-thin: Make --no-thin the default in git-push to save server resources
2007-09-12stash: end index commit log with a newlineJean-Luc Herren
There was no newline at the end of the index commit message, putting the shell prompt at its end after a 'git cat-file commit $id'. This is similar to what was fixed in 843103d69388a5c74ed99753e1c162a66835b04d. Signed-off-by: Jean-Luc Herren <> Signed-off-by: Junio C Hamano <>
2007-09-12git-commit: Disallow amend if it is going to produce an empty non-merge commitDmitry V. Levin
Right now one can amend the last non-merge commit using a dirty index and in the process maybe cause the last commit to have the same tree as its parent. In such a case one would want to discard the last commit instead of amending it. This reverts commit 8588452ceb78b1da17652ba03f9942ef740e07ea. Signed-off-by: Dmitry V. Levin <> Signed-off-by: Junio C Hamano <>
2007-09-12git-send-email.perl: Add angle brackets to In-Reply-To if necessaryDavid Kastrup
Although message-id by defintion should have surrounding angle brackets, there is no point forcing people to type them in. Signed-off-by: David Kastrup <> Signed-off-by: Junio C Hamano <>
2007-09-12Fix a test failure (t9500-*.sh) on cygwinRamsay Jones
On filesystems where it is appropriate to set core.filemode to false, test 29 ("commitdiff(0): mode change") fails when git-commit does not notice a file (execute) permission change. A fix requires noting the new file execute permission in the index with a "git update-index --chmod=+x", prior to the commit. Add a function (note_chmod) which implements this idea, and insert a call in each test that modifies the x permission. Signed-off-by: Ramsay Jones <> Signed-off-by: Junio C Hamano <>
2007-09-10Make --no-thin the default in git-push to save server resourcesShawn O. Pearce
1) pushes happen less often than fetches, so the bandwidth saving is much less visible in that case overall. 2) thin packs have to be complemented with missing delta bases to be valid, so many received thin packs will take more disk space. 3) the bother of repacking should be distributed amongst "clients" i.e. fetchers and pushers as much as possible, and not the server being fetched or pushed, to keep disk and CPU usage low on the server. This is why a fetch should get thin packs but a push should not. Both Nico and I have been assuming that --no-thin was the default behavior of git-push ever since Nico introduced --fix-thin into the index-pack process, which allowed fetch and receive-pack to avoid exploding packfiles received during transfer. This patch finally makes it so. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2007-09-10fix doc for --compression argument to pack-objectsNicolas Pitre
Remove obsolete details (core.legacyheaders is always true now). Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2007-09-10git-tag -s must fail if gpg cannot sign the tag.Carlos Rica
Most of this patch code and message was written by Shawn O. Pearce. I made some tests to know what the problem was, and then I changed the code related with the SIGPIPE signal. If the user has misconfigured `user.signingkey` in their .git/config or just doesn't have any secret keys on their keyring and they ask for a signed tag with `git tag -s` we better make sure the resulting tag was actually signed by gpg. Prior versions of builtin git-tag allowed this failure to slip by without error as they were not checking the return value of the finish_command() so they did not notice when gpg exited with an error exit status. They also did not fail if gpg produced an empty output or if read_in_full received an error from the read system call while trying to read the pipe back from gpg. Finally, we did not actually honor any return value from the do_sign function as it returns ssize_t but was being stored into an unsigned long. This caused the compiler to optimize out the die condition, allowing git-tag to continue along and create the tag object. However, when gpg gets a wrong username, it exits before any read was done and then the writing process receives SIGPIPE and program is terminated. By ignoring this signal, anyway, the function write_or_die gets EPIPE from write_in_full and exits returning 0 to the system without a message. Here we better call to write_in_full directly so we can fail printing a message and return safely to the caller. With these issues fixed `git-tag -s` will now fail to create the tag and will report a non-zero exit status to its caller, thereby allowing automated helper scripts to detect (and recover from) failure if gpg is not working properly. Proposed-by: Shawn O. Pearce <> Signed-off-by: Carlos Rica <> Signed-off-by: Junio C Hamano <>
2007-09-09git-svn: understand grafts when doing dcommitEric Wong
Use the rev-list --parents functionality to read the parents of the commit. cat-file only shows the raw object with the original parents and doesn't take into account grafts; so we'll rely on rev-list machinery for the smarts here. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2007-09-09git-diff: don't squelch the new SHA1 in submodule diffsSven Verdoolaege
The code to squelch empty diffs introduced by commit fb13227e089f22dc31a3b1624559153821056848 would inadvertently populate filespec "two" of a submodule change using the uninitialized (null) SHA1, thereby replacing the submodule SHA1 by 0{40} in the output. This change teaches diffcore_skip_stat_unmatch to handle submodule changes correctly. Signed-off-by: Sven Verdoolaege <> Signed-off-by: Junio C Hamano <>
2007-09-08git-svn: fix "Malformed network data" with svn:// serversEric Wong
We have a workaround for the reparent function not working correctly on the SVN native protocol servers. This workaround opens a new connection (SVN::Ra object) to the new URL/directory. Since libsvn appears limited to only supporting one connection at a time, this workaround invalidates the Git::SVN::Ra object that is $self inside gs_fetch_loop_common(). So we need to restart that connection once all the fetching is done for each loop iteration to be able to run get_log() successfully. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2007-09-08(cvs|svn)import: Ask git-tag to overwrite old tags.Michael Smith
If the tag was moved in CVS or SVN history, it will be moved in the imported history as well. Tag history is not tracked. Signed-off-by: Junio C Hamano <>
2007-09-08Documentation / grammer nitMike Ralphson
If we're counting, a smaller number is 'fewer' not 'less' Signed-off-by: Mike Ralphson <> Signed-off-by: Junio C Hamano <>
2007-09-06Include a git-push example for creating a remote branchShawn O. Pearce
Many users get confused when `git push origin master:foo` works when foo already exists on the remote repository but are confused when foo doesn't exist as a branch and this form does not create the branch foo. This new example highlights the trick of including refs/heads/ in front of the desired branch name to create a branch. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2007-09-06Cleanup unnecessary file modifications in t1400-update-refShawn O. Pearce
Kristian Høgsberg pointed out that the two file modifications we were doing during the 'creating initial files' step are not even used within the test suite. This was actually confusing as we do not even need these changes for the tests to pass. All that really matters here is the specific commit dates are used so that these appear in the branch's reflog, and that the dates are different so that the branch will update when asked and the reflog entry is also updated. There is no need for the file modification. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2007-09-06Makefile: Add cache-tree.h to the headers listDmitry V. Levin
The dependency was missing. Signed-off-by: Dmitry V. Levin <> Signed-off-by: Junio C Hamano <>
2007-09-06Don't allow contrib/workdir/git-new-workdir to trash existing dirsShawn O. Pearce
Recently I found that doing a sequence like the following: git-new-workdir a b ... git-new-workdir a b by accident will cause a (and now also b) to have an infinite cycle in its refs directory. This is caused by git-new-workdir trying to create the "refs" symlink over again, only during the second time it is being created within a's refs directory and is now also pointing back at a's refs. This causes confusion in git as suddenly branches are named things like "refs/refs/refs/refs/refs/refs/refs/heads/foo" instead of the more commonly accepted "refs/heads/foo". Plenty of commands start to see ambiguous ref names and others just take ages to compute. git-clone has the same safety check, so git-new-workdir should behave just like it. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2007-09-06git-apply: do not read past the end of bufferJunio C Hamano
When the preimage we are patching is shorter than what the patch text expects, we tried to match the buffer contents at the "original" line with the fragment in full, without checking we have enough data to match in the preimage. This caused the size of a later memmove() to wrap around and attempt to scribble almost the entire address space. Not good. The code that follows the part this patch touches tries to match the fragment with line offsets. Curiously, that code does not have the problem --- it guards against reading past the end of the preimage. Signed-off-by: Junio C Hamano <>
2007-09-03GIT obsolete git-p4 in RPM spec file.v1.5.3.1Junio C Hamano
HPA noticed that yum does not like the newer git RPM set; it turns out that we do not ship git-p4 anymore but existing installations do not realize the package is gone if we do not tell anything about it. David Kastrup suggests using Obsoletes in the spec file of the new RPM to replace the old package, so here is a try. Signed-off-by: Junio C Hamano <>
2007-09-02Typofix: 1.5.3 release notesJunio C Hamano
2007-09-02GIT 1.5.3v1.5.3Junio C Hamano
Signed-off-by: Junio C Hamano <>
2007-09-01Merge branch 'jp/send-email-cc'Junio C Hamano
* jp/send-email-cc: git-send-email --cc-cmd
2007-09-01Mention -m as an abbreviation for --mergeRobin Rosenberg
Signed-off-by: Robin Rosenberg <> Signed-off-by: Junio C Hamano <>
2007-09-01Update my contact address as the maintainer.Junio C Hamano
2007-09-01Documentation: minor AsciiDoc mark-up fixes.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2007-09-01URL: allow port specification in ssh:// URLsLuben Tuikov
Allow port specification in ssh:// URLs in the usual notation: ssh://[user@]host.domain[:<port>]/<path> This allows git to be used over ssh-tunneling networks. Signed-off-by: Luben Tuikov <> Signed-off-by: Junio C Hamano <>
2007-09-01Avoid one-or-more (\+) non BRE in sed scripts.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2007-09-01rebase -m: Fix incorrect short-logs of already applied commits.Johannes Sixt
When a topic branch is rebased, some of whose commits are already cherry-picked upstream: o--X--A--B--Y <- master \ A--B--Z <- topic then 'git rebase -m master' would report: Already applied: 0001 Y Already applied: 0002 Y With this fix it reports the expected: Already applied: 0001 A Already applied: 0002 B As an added bonus, this change also avoids 'echo' of a commit message, which might contain escapements. Signed-off-by: Johannes Sixt <> Signed-off-by: Junio C Hamano <>
2007-09-01git-diff: resurrect the traditional empty "diff --git" behaviourJunio C Hamano
The warning message to suggest "Consider running git-status" from "git-diff" that we experimented with during the 1.5.3 cycle turns out to be a bad idea. It robbed cache-dirty information from people who valued it, while still asking users to run "update-index --refresh". It was hoped that the new behaviour would at least have some educational value, but not showing the cache-dirty paths like before meant that the user would not even know easily which paths were cache-dirty, and it made the need to refresh the index look like even more unnecessary chore. This commit reinstates the traditional behaviour, but with a twist. By default, the empty "diff --git" output is totally squelched out from "git diff" output. At the end of the command, it automatically runs "update-index --refresh" as needed, without even bothering the user. In other words, people who do not care about the cache-dirtyness do not even have to see the warning. The traditional behaviour to see the stat-dirty output and to bypassing the overhead of content comparison can be specified by setting the configuration variable diff.autorefreshindex to false. Signed-off-by: Junio C Hamano <>
2007-09-01git-tag: Fix -l option to use better shell style globs.Carlos Rica
This patch removes certain behaviour of "git tag -l foo", currently listing every tag name having "foo" as a substring. The same thing now could be achieved doing "git tag -l '*foo*'". This feature was added recently when got the -n option for showing tag annotations, because that commit also replaced the old "grep pattern" behaviour with a more preferable "shell pattern" behaviour (although slightly modified as you can see). Thus, the following builtin-tag.c implemented it in order to ensure that tests were passing unchanged with both programs. Since common "shell patterns" match names with a given substring _only_ when * is inserted before and after (as in "*substring*"), and the "plain" behaviour cannot be achieved easily with the current implementation, this is mostly the right thing to do, in order to make it more flexible and consistent. Tests for "git tag" were also changed to reflect this. Signed-off-by: Carlos Rica <> Signed-off-by: Junio C Hamano <>
2007-09-01git-svn: fix dcommit clobbering upstream when committing multiple changesEric Wong
Although dcommit could detect if the first commit in the series would conflict with the HEAD revision in SVN, it could not detect conflicts in further commits it made. Now we rebase each uncommitted change after each revision is committed to SVN to ensure that we are up-to-date. git-rebase will bail out on conflict errors if our next change cannot be applied and committed to SVN cleanly, preventing accidental clobbering of changes on the SVN-side. --no-rebase users will have trouble with this, and are thus warned if they are committing more than one commit. Fixing this for (hopefully uncommon) --no-rebase users would be more complex and will probably happen at a later date. Thanks to David Watson for finding this and the original test. Signed-off-by: Junio C Hamano <>
2007-09-01git-svn: Protect against "diff.color = true".Junio C Hamano
If the configuration of the user has "diff.color = true", the output from "log" we invoke internally added color codes, which broke the parser. Signed-off-by: Junio C Hamano <> Tested-by: Johannes Schindelin <> Acked-by: Eric Wong <>
2007-09-01filter-branch: introduce convenience function "skip_commit"Johannes Schindelin
With this function, a commit filter can leave out unwanted commits (such as temporary commits). It does _not_ undo the changeset corresponding to that commit, but it _skips_ the revision. IOW no tree object is changed by this. If you like to commit early and often, but want to filter out all intermediate commits, marked by "@@@" in the commit message, you can now do this with git filter-branch --commit-filter ' if git cat-file commit $GIT_COMMIT | grep '@@@' > /dev/null; then skip_commit "$@"; else git commit-tree "$@"; fi' newbranch Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2007-09-01filter-branch: provide the convenience functions also for commit filtersJohannes Schindelin
Move the convenience functions to the top of, and return from the script when the environment variable SOURCE_FUNCTIONS is set. By sourcing git-filter-branch with that variable set automatically, all commit filters may access the convenience functions like "map". Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2007-09-01rebase -i: mention the option to split commits in the man pageJohannes Schindelin
The interactive mode of rebase can be used to split commits. Tell the interested parties about it, with a dedicated section in the man page. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2007-09-01filter-branch: fix remnants of old syntax in documentationJohannes Schindelin
Some time ago, filter-branch's syntax changed so that more than one ref can be rewritten at the same time. This involved the removal of the ref name for the result; instead, the refs are rewritten in-place. This updates the last leftovers in the documentation to reflect the new behavior. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2007-09-01Teach bash about completing arguments for git-tagShawn O. Pearce
Lately I have been doing a lot of calls to `git tag -d` and also to `git tag -v`. In both such cases being able to complete the names of existing tags saves the fingers some typing effort. We now look for the -d or -v option to git-tag in the bash completion support and offer up existing tag names as possible choices for these. When creating a new tag we now also offer bash completion support for the second argument to git-tag (the object to be tagged) as this can often be a specific existing branch name and is not necessarily the current HEAD. If the -f option is being used to recreate an existing tag we now also offer completion support on the existing tag names for the first argument of git-tag, helping to the user to reselect the prior tag name that they are trying to replace. Signed-off-by: Shawn O. Pearce <>
2007-08-31Hopefully the final update to draft release notes for 1.5.3.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2007-08-31Make "git-log --" without paths behave the same as "git-log" without --Junio C Hamano
"git log" family of commands, even when run from a subdirectory, do not limit the revision range with the current directory as the path limiter, but with double-dash without any paths after it, i.e. "git log --" do so. It was a mistake to have a difference between "git log --" and "git log" introduced in commit ae563542bf10fa8c33abd2a354e4b28aca4264d7 (First cut at libifying revlist generation). Signed-off-by: Junio C Hamano <>
2007-08-31git-init: autodetect core.symlinksJunio C Hamano
We already autodetect if filemode is reliable on the filesystem to deal with VFAT and friends. Do the same for symbolic link support. Signed-off-by: Junio C Hamano <>
2007-08-31Make git-archimport log entries more consistentMiles Bader
When appending the "git-archimport-id:" line to the end of log entries, git-archimport would use two blank lines as a separator when there was no body in the arch log (only a Summary: line), and zero blank lines when there was a body (making it hard to see the break between the actual log message and the git-archimport-id: line). This patch makes git-archimport generate one blank line as a separator in all cases. Signed-off-by: Junio C Hamano <>
2007-08-31fix same sized delta logicNicolas Pitre
The code favoring shallower deltas when size is equal was triggered only when previous delta was also cached. There should be no relation between cached deltas and same sized deltas. Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2007-08-31filter-branch: make sure orig_namespace ends with a single slash.Junio C Hamano
Later in a loop any existing ref whose path begins with it is removed. It would be a disaster if you allowed it to say refs/head for example. Signed-off-by: Junio C Hamano <>
2007-08-31git-filter-branch: document --original optionGiuseppe Bilotta
Signed-off-by: Giuseppe Bilotta <> Signed-off-by: Junio C Hamano <>