[commit] branch 'wip/next' reset

2017-04-01 Thread Oswald Buddenhagen
The branch 'wip/next', previously at b22cdc7, has been rewound by 43 revision(s) and subsequently fast-forwarded by 57 revision(s) to 1727c44. -- Check out the vibrant tech community on one of the world's most engaging tec

[commit] master: Merge remote-tracking branch 'origin/1.2'

2017-04-01 Thread Oswald Buddenhagen
Skipped 7 existing revision(s) on branch 'master'. commit 71ced65fccb51d9ad42a248b8ac5dedb0defdeca Merge: 77acc26 62808c9 Author: Oswald Buddenhagen Date: Sat Apr 1 20:31:51 2017 +0200 Merge remote-tracking branch 'origin/1.2' Conflicts: src/sync.c src/driver.h | 4

[commit] 1.2: don't populate sync record map with invalid UIDs

2017-04-01 Thread Oswald Buddenhagen
commit f934e995d6f871c3ca269835b2f990f63055c9fc Author: Oswald Buddenhagen Date: Sat Mar 11 13:27:53 2017 +0100 don't populate sync record map with invalid UIDs this would obviously just bloat the hash with nonsense, slowing down the actual lookup later. src/sync.c | 2 ++ 1

[commit] 1.2: autotest: use warnings

2017-04-01 Thread Oswald Buddenhagen
commit 62808c900367d8019c249513a9cfcbc81d053fdc Author: Oswald Buddenhagen Date: Tue Mar 14 11:10:35 2017 +0100 autotest: use warnings src/run-tests.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/src/run-tests.pl b/src/run-tests.pl index d8ff1b6..d1121c5 100755 --- a/src/run-tests

[commit] 1.2: autotest: remove stray close() call from printstate()

2017-04-01 Thread Oswald Buddenhagen
commit b45e711da588c5111c64345c50afa76a1b6ceeda Author: Oswald Buddenhagen Date: Tue Mar 14 11:09:38 2017 +0100 autotest: remove stray close() call from printstate() src/run-tests.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/src/run-tests.pl b/src/run-tests.pl index 829791c..d8ff