aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin/git.pm
Commit message (Collapse)AuthorAge
* only_committed_changes could fail in a git repository merged with git merge ↵Joey Hess2014-04-05
| | | | -s ours.
* Merge remote-tracking branch 'remotes/smcv/ready/git-push-origin-master'Joey Hess2014-02-23
|\
| * git: explicitly specify the branch to push to originSimon McVittie2014-02-21
| | | | | | | | | | | | | | | | | | | | git's behaviour when doing "git push origin" is configurable, and the default is going to change in 2.0. In particular, if you've set push.default to "nothing", the regression test will warn: fatal: You didn't specify any refspecs to push, and push.default is "nothing". 'git push origin' failed: at .../lib/IkiWiki/Plugin/git.pm line 220.
* | Do not UTF8-escape "/" in Git's diffurl: cgit does not support this.intrigeri2013-12-31
|/
* deal with the case where oldrev is the same as newrevJoey Hess2013-11-16
|
* fix eqJoey Hess2013-11-16
|
* Added only_committed_changes config setting, which speeds up wiki refresh by ↵Joey Hess2013-11-16
| | | | querying git to find the files that were changed, rather than looking at the work tree. Not enabled by default as it can break some setups where not all files get committed to git.
* Pass --no-edit when used with git 1.7.8 and newer.Joey Hess2013-07-10
| | | | | | | | | Not sure if this is needed to avoid it trying to run an editor. Probably there is never a controlling terminal and probably git notices and does nothing. But I'm just copying what I have in git-annex assistant here. (Although with a much worse git version comparion, that only really works due to luck.)
* Deal with git behavior change in 1.7.8 and newer that broke support for ↵Joey Hess2013-07-10
| | | | commits with an empty commit message.
* Fix some warnigns in recent perls.Shlomi Fish2012-12-17
| | | | All existing tests pass.
* remove debug messageJoey Hess2012-03-22
| | | | | | A file may have no git sha1 if it's in the underlay, or just is not checked into git. This debug message doesn't add any value and is potentially confusing.
* URI escape filename when generating the diffurl.Joey Hess2012-03-13
| | | | | ikiwiki source files can contain at least one character that needs to be escaped in an url: +
* fix display of page name in recentchanges after a revertJoey Hess2012-02-07
| | | | | | | | | | | When the wiki is in a subdir of the git repo, a web revert would show in recentchanges as eg, doc/index, instead of just index. This happened because decode_git_file caches a $prefix that is dependant on the $git_dir setting, and the revert code runs with a different $git_dir, which polluted the $prefix for later. Fix this by adding a with_git_dir that juggles the variables properly.
* Fix web revert of a file deletion.Joey Hess2011-09-05
| | | | When reverting, an add is a remove, and a remove is an add.
* git: Fix bug involving attempting to web revert a commit that included ↵Joey Hess2010-12-29
| | | | changes to attachments.
* bugfixJoey Hess2010-12-29
|
* Add a second parameter to the rcs_diff hook, and avoid bloating memory ↵Joey Hess2010-12-29
| | | | reading in enormous commits.
* git: Avoid adding files when committing, so as not to implicitly add files ↵Joey Hess2010-11-29
| | | | like recentchanges files that are not normally checked in, when fixing links after rename.
* git: Fix temp file location.Joey Hess2010-11-29
|
* Use author date instead of commit dateTuomas Jormola2010-10-31
| | | | Signed-off-by: Tuomas Jormola <tj@solitudo.net>
* nice message if someone tries to revert a merge commitJoey Hess2010-10-23
|
* bugfixJoey Hess2010-10-23
|
* fix web reversion when the srcdir is in a subdir of the git repo.Joey Hess2010-10-23
|
* taint handling for revJoey Hess2010-10-08
|
* remove todo itemJoey Hess2010-10-08
| | | | | | | I understand the need to avoid chdir when running git_parse_changes for receive now. At that point, the changes have not been pushed to the srcdir's repo yet. When running the same code for preprevert, chdir to the srcdir is ok, and necessary.
* fix rcs_prepedit implementation to match specJoey Hess2010-10-08
|
* convert rcs_revert to only stage the reversionJoey Hess2010-10-06
|
* remove rcs_showpatchJoey Hess2010-10-06
|
* fix $git_root cachingJoey Hess2010-10-04
|
* fix indentationJoey Hess2010-10-04
|
* document new rcs reversion support functionsJoey Hess2010-10-04
|
* indentationJoey Hess2010-10-04
|
* fix bug if git_root is "0"Joey Hess2010-10-04
|
* Minor tidy-ups.Peter Gammie2010-10-01
|
* Complete rcs_preprevert and lightly test.Peter Gammie2010-10-01
|
* First cut at the revert plugin.Peter Gammie2010-09-29
|
* git: When updating from remote, use git pull --prune, to avoid possible ↵Joey Hess2010-09-14
| | | | errors from conflicting obsolete remote branches.
* avoid generating receive wrapper if there are no untrusted committersJoey Hess2010-07-26
| | | | | The wrapper is pointless in that configuration. Also, the code for it doesn't compile w/o untrusted commiters to test. :)
* git: Fix gitweb historyurl examples so "diff to current" links work. (Thanks ↵Joey Hess2010-07-24
| | | | jrayhawk)
* move nickname sanitization outJoey Hess2010-07-04
| | | | | | Probably best to store it unsanitized and sanitize as needed on use. And it already was for comments, leaving only the need to sanitize the nickname when git committing, to ensure the email address is legal.
* git: Added git_wrapper_background_command option. Can be used to eg, make ↵Joey Hess2010-07-01
| | | | the git wrapper push to github in the background after ikiwiki runs.
* bugfixJoey Hess2010-06-23
|
* finializing openid nickname supportJoey Hess2010-06-23
| | | | | | | Renamed usershort => nickname. Note that this means existing user login sessions will not have the nickname recorded, and so it won't be used for those.
* git: Record the username from openid in the git author email. (This avoids ↵Joey Hess2010-06-23
| | | | display of ugly google openids.)
* rcs_getctime and rcs_getmtime take relative filenamesJoey Hess2010-06-23
| | | | | | | | | | There was some confusion about whether the filename was relative to srcdir or not. Some test cases, and the bzr plugin assumed it was relative to the srcdir. Most everything else assumed it was absolute. Changed it to relative, for consistency with the rest of the rcs_ functions.
* rcs_commit and rcs_commit_staged api changesJoey Hess2010-06-23
| | | | | | | | | | | Using named parameters for these is overdue. Passing the session in a parameter instead of passing username and IP separately will later allow storing other session info, like username or part of the email. Note that these functions are not part of the exported API, and the prototype change will catch (most) skew, so I am not changing API versions. Any third-party plugins that call them will need updated though.
* API: rcs_commit and rcs_commit_staged are passed a new parameterJoey Hess2010-06-23
| | | | | that may contain the username component of the email address of the user making the commit.
* Add new optional field usershort to rcs_recentchanges.Joey Hess2010-06-23
| | | | | | | | | | Now the git plugin supports commits with author fields that look like: Author: http://my.openid/ <me@web> Then in recentchanges, the short username will be displayed, linking to the openid. Particularly useful for the horrible google openids, of course.
* force list contextJoey Hess2010-06-16
| | | | run_or_die returns a status code in scalar context
* git: Gix --gettime to properly support utf8 filenames.Joey Hess2010-06-15
| | | | | In passing, fixed a bug where the srcdir was in a subdir of a repository named "0".
generated by cgit v1.2.3 (git 2.45.0) at 2024-12-01 02:18:57 +0000