https://github.com/JuliaLang/julia
Revision ea8b6238ab14239a601cd2ab1b343d85adf2f401 authored by Simon Byrne on 19 December 2016, 00:41:30 UTC, committed by Tony Kelman on 01 March 2017, 10:48:25 UTC
* Fixes broken LibGit2.rebase!

LibGit2 was not rebasing correctly, causing problems with `Pkg.update()`
after `PkgDev.tag()`, see
https://discourse.julialang.org/t/how-to-properly-add-releases-with-pkgdev/961/15?u=simonbyrne

There were two problems:
- `upstream` was used as a variable name and a function call
- if the patch was redundant (`EAPPLIED` return code), `rebase!` would
throw an error.

* alignment

* revert check macro to avoid incompatibilities

* add docstring

* add testcase

* add TODO

(cherry picked from commit 474210f7932b26c0bbff1d9b4783bd9578356731)
1 parent 78a1132
History
Tip revision: ea8b6238ab14239a601cd2ab1b343d85adf2f401 authored by Simon Byrne on 19 December 2016, 00:41:30 UTC
Fixes broken LibGit2.rebase! (#19624)
Tip revision: ea8b623
File Mode Size
base
contrib
deps
doc
etc
examples
src
test
ui
.gitignore -rw-r--r-- 207 bytes
.mailmap -rw-r--r-- 9.5 KB
.travis.yml -rw-r--r-- 5.9 KB
CONTRIBUTING.md -rw-r--r-- 18.9 KB
DISTRIBUTING.md -rw-r--r-- 8.3 KB
HISTORY.md -rw-r--r-- 73.8 KB
LICENSE.md -rw-r--r-- 5.2 KB
Make.inc -rw-r--r-- 32.7 KB
Makefile -rw-r--r-- 27.8 KB
NEWS.md -rw-r--r-- 30.4 KB
README.arm.md -rw-r--r-- 4.3 KB
README.md -rw-r--r-- 28.9 KB
README.windows.md -rw-r--r-- 17.6 KB
VERSION -rw-r--r-- 10 bytes
Windows.inc -rw-r--r-- 1.5 KB
appveyor.yml -rw-r--r-- 2.1 KB

README.md

back to top