aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'maint'Junio C Hamano2007-09-09
|\ | | | | | | | | | | | | | | | | * maint: git-svn: understand grafts when doing dcommit git-diff: don't squelch the new SHA1 in submodule diffs git-svn: fix "Malformed network data" with svn:// servers (cvs|svn)import: Ask git-tag to overwrite old tags. Documentation / grammer nit
| * git-svn: understand grafts when doing dcommitEric Wong2007-09-09
| | | | | | | | | | | | | | | | | | | | 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 <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * git-diff: don't squelch the new SHA1 in submodule diffsSven Verdoolaege2007-09-09
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 <skimo@kotnet.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * git-svn: fix "Malformed network data" with svn:// serversEric Wong2007-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * (cvs|svn)import: Ask git-tag to overwrite old tags.Michael Smith2007-09-07
| | | | | | | | | | | | | | 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 <gitster@pobox.com>
| * Documentation / grammer nitMike Ralphson2007-09-07
| | | | | | | | | | | | | | If we're counting, a smaller number is 'fewer' not 'less' Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git-rebase: fix -C optionJ. Bruce Fields2007-09-07
| | | | | | | | | | | | | | | | The extra shift here causes failure to parse any commandline including the -C option. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git-rebase: support --whitespace=<option>J. Bruce Fields2007-09-07
| | | | | | | | | | | | | | | | | | Pass --whitespace=<option> to git-apply. Since git-apply and git-am expect this, I'm always surprised when I try to give it to git-rebase and it doesn't work. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'master' of git://repo.or.cz/git/git-p4Junio C Hamano2007-09-06
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://repo.or.cz/git/git-p4: git-p4: Added support for automatically importing newly appearing perforce branches. git-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ref (for example foo -> refs/remotes/p4/<project>/foo) into a separate method. git-p4: Cleanup; moved the code for the initial #head or revision import into a separate function, out of P4Sync.run. git-p4: Cleanup; Turn self.revision into a function local variable (it's not used anywhere outside the function). git-p4: Cleanup; moved the code to import a list of p4 changes using fast-import into a separate member function of P4Sync. git-p4: Cleanup; moved the code for getting a sorted list of p4 changes for a list of given depot paths into a standalone method. git-p4: After submission to p4 always synchronize from p4 again (into refs/remotes). Whether to rebase HEAD or not is still left as question to the end-user. git-p4: Always call 'p4 sync ...' before submitting to Perforce.
| * | git-p4: Added support for automatically importing newly appearing perforce ↵Simon Hausmann2007-09-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branches. If a change in a p4 "branch" appears that hasn't seen any previous commit and that has a known branch mapping we now try to import it properly. First we find the p4 change of the source branch that the new p4 branch is based on. Then we using git rev-list --bisect to locate the corresponding git commit to that change. Finally we import all changes in the new p4 branch up to the current change and resume with the regular import. Signed-off-by: Simon Hausmann <simon@lst.de>
| * | git-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ↵Simon Hausmann2007-09-03
| | | | | | | | | | | | | | | | | | ref (for example foo -> refs/remotes/p4/<project>/foo) into a separate method. Signed-off-by: Simon Hausmann <simon@lst.de>
| * | git-p4: Cleanup; moved the code for the initial #head or revision import ↵Simon Hausmann2007-09-03
| | | | | | | | | | | | | | | | | | into a separate function, out of P4Sync.run. Signed-off-by: Simon Hausmann <simon@lst.de>
| * | git-p4: Cleanup; Turn self.revision into a function local variable (it's not ↵Simon Hausmann2007-09-03
| | | | | | | | | | | | | | | | | | used anywhere outside the function). Signed-off-by: Simon Hausmann <simon@lst.de>
| * | git-p4: Cleanup; moved the code to import a list of p4 changes using ↵Simon Hausmann2007-09-03
| | | | | | | | | | | | | | | | | | fast-import into a separate member function of P4Sync. Signed-off-by: Simon Hausmann <simon@lst.de>
| * | git-p4: Cleanup; moved the code for getting a sorted list of p4 changes for ↵Simon Hausmann2007-09-03
| | | | | | | | | | | | | | | | | | a list of given depot paths into a standalone method. Signed-off-by: Simon Hausmann <simon@lst.de>
| * | git-p4: After submission to p4 always synchronize from p4 again (into ↵Simon Hausmann2007-09-03
| | | | | | | | | | | | | | | | | | refs/remotes). Whether to rebase HEAD or not is still left as question to the end-user. Signed-off-by: Simon Hausmann <simon@lst.de>
| * | git-p4: Always call 'p4 sync ...' before submitting to Perforce.Simon Hausmann2007-09-03
| | | | | | | | | | | | | | | Acked-by: Marius Storm-Olsen <marius@trolltech.com> Acked-by: Thiago Macieira <thiago@kde.org>
* | | Merge branch 'maint'Junio C Hamano2007-09-05
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | * maint: Include a git-push example for creating a remote branch Cleanup unnecessary file modifications in t1400-update-ref Makefile: Add cache-tree.h to the headers list Don't allow contrib/workdir/git-new-workdir to trash existing dirs git-apply: do not read past the end of buffer
| * | Include a git-push example for creating a remote branchShawn O. Pearce2007-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Cleanup unnecessary file modifications in t1400-update-refShawn O. Pearce2007-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Makefile: Add cache-tree.h to the headers listDmitry V. Levin2007-09-05
| | | | | | | | | | | | | | | | | | | | | The dependency was missing. Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Don't allow contrib/workdir/git-new-workdir to trash existing dirsShawn O. Pearce2007-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | git-apply: do not read past the end of bufferJunio C Hamano2007-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <gitster@pobox.com>
* | | Merge branch 'ds/sendmail'Junio C Hamano2007-09-05
|\ \ \ | | | | | | | | | | | | | | | | * ds/sendmail: send-email: Add support for SSL and SMTP-AUTH
| * | | send-email: Add support for SSL and SMTP-AUTHDouglas Stockwell2007-09-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows username and password to be given using --smtp-user and --smtp-pass. SSL use is flagged by --smtp-ssl. These are backed by corresponding defaults in the git configuration file. This implements Junio's 'mail identity' suggestion in a slightly more generalised manner. --identity=$identity, backed by sendemail.identity indicates that the configuration subsection [sendemail "$identity"] should take priority over the [sendemail] section for all configuration values. Signed-off-by: Douglas Stockwell <doug@11011.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Function for updating refs.Carlos Rica2007-09-05
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A function intended to be called from builtins updating refs by locking them before write, specially those that came from scripts using "git update-ref". [jc: with minor fixups] Signed-off-by: Carlos Rica <jasampler@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Start 1.5.4 cycleJunio C Hamano2007-09-03
|/ / | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | GIT 1.5.3.1: obsolete git-p4 in RPM spec file.v1.5.3.1Junio C Hamano2007-09-03
| | | | | | | | | | | | | | | | | | | | | | 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 <gitster@pobox.com>
* | Typofix: 1.5.3 release notesJunio C Hamano2007-09-02
|/
* GIT 1.5.3v1.5.3Junio C Hamano2007-09-02
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'jp/send-email-cc'Junio C Hamano2007-09-01
|\ | | | | | | | | * jp/send-email-cc: git-send-email --cc-cmd
| * git-send-email --cc-cmdJoe Perches2007-08-17
| | | | | | | | | | | | | | | | This new option allows an arbitrary "cmd" to generate per patch file specific "Cc:"s. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Mention -m as an abbreviation for --mergeRobin Rosenberg2007-09-01
| | | | | | | | | | Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Update my contact address as the maintainer.Junio C Hamano2007-09-01
| |
* | Documentation: minor AsciiDoc mark-up fixes.Junio C Hamano2007-09-01
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | URL: allow port specification in ssh:// URLsLuben Tuikov2007-09-01
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Avoid one-or-more (\+) non BRE in sed scripts.Junio C Hamano2007-09-01
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | rebase -m: Fix incorrect short-logs of already applied commits.Johannes Sixt2007-09-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git-diff: resurrect the traditional empty "diff --git" behaviourJunio C Hamano2007-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <gitster@pobox.com>
* | git-tag: Fix -l option to use better shell style globs.Carlos Rica2007-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 git-tag.sh 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 <jasampler@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git-svn: fix dcommit clobbering upstream when committing multiple changesEric Wong2007-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <gitster@pobox.com>
* | git-svn: Protect against "diff.color = true".Junio C Hamano2007-08-31
| | | | | | | | | | | | | | | | | | | | 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 <gitster@pobox.com> Tested-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Acked-by: Eric Wong <normalperson@yhbt.net>
* | filter-branch: introduce convenience function "skip_commit"Johannes Schindelin2007-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | filter-branch: provide the convenience functions also for commit filtersJohannes Schindelin2007-08-31
| | | | | | | | | | | | | | | | | | | | | | | | Move the convenience functions to the top of git-filter-branch.sh, 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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | rebase -i: mention the option to split commits in the man pageJohannes Schindelin2007-08-31
| | | | | | | | | | | | | | | | 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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | filter-branch: fix remnants of old syntax in documentationJohannes Schindelin2007-08-31
| | | | | | | | | | | | | | | | | | | | | | | | 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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Teach bash about completing arguments for git-tagShawn O. Pearce2007-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <spearce@spearce.org>
* | Hopefully the final update to draft release notes for 1.5.3.Junio C Hamano2007-08-31
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Make "git-log --" without paths behave the same as "git-log" without --Junio C Hamano2007-08-31
| | | | | | | | | | | | | | | | | | | | | | | | "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 <gitster@pobox.com>
* | git-init: autodetect core.symlinksJunio C Hamano2007-08-31
| | | | | | | | | | | | | | | | 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 <gitster@pobox.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-25 15:05:54 +0000