diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-02-14 15:58:05 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-02-14 16:09:55 -0400 |
| commit | 2286280b4462d56117f221ff1555f299c74ffc3b (patch) | |
| tree | d65b9799e6a99b0a3249f5ea74939793c5275b46 /CHANGELOG | |
| parent | 81a4bf492f4c34707143aeec614c246f2a2bd394 (diff) | |
sync, merge: Fail when the current branch has no commits yet, instead of not merging in anything from remotes and appearing to succeed.
At first I wanted to make it go ahead and merge into the newborn branch,
so made it use Git.Branch.currentUnsafe to get the current branch. But that
failed:
fatal: ambiguous argument 'refs/heads/master..refs/heads/synced/master':
unknown revision or path not in the working tree.
A whole nother code path to handle merging into newborn branches seemed
excessive, so went with displaying a warning and propigating failure
status.
This commit was sponsored by Brock Spratlen on Patreon.
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,10 @@ +git-annex (6.20170215) UNRELEASED; urgency=medium + + * sync, merge: Fail when the current branch has no commits yet, instead + of not merging in anything from remotes and appearing to succeed. + + -- Joey Hess <id@joeyh.name> Tue, 14 Feb 2017 15:54:25 -0400 + git-annex (6.20170214) unstable; urgency=medium * Increase default cost for p2p remotes from 200 to 1000. |