push chained after commit does nothing, 'Everything up to date'

[air]

push chained after commit does nothing, 'Everything up to date'

[air]

Another example. If I try to checkout then merge:

// FIXME merge fails, seems to happen before checkout is complete
gulp.task('publish', ['test'], function() {
  var version = require('./package.json').version;

  return gulp.src('.')
    .pipe(git.checkout('gh-pages'))
    .pipe(git.merge('master'))
    .pipe(git.commit('merged master ' + version + ' to gh-pages'))
    .pipe(git.push('origin', 'gh-pages'))
    .pipe(git.checkout('master'))
    .end();
});

The merge seems to fail early ('Already up to date') before the checkout has been done:

[gulp] Starting 'publish'...
[gulp] 'publish' errored after 13 ms Object #<ChildProcess> has no method 'pipe'
[gulp] Already up-to-date.
[gulp] Your branch is up-to-date with 'origin/gh-pages'.
 Switched to branch 'gh-pages'

[stephenlacy]

What happens when you isolate the push into the on end?

gulp.task('release', function() {
  var version = require('./package.json').version;
  return gulp.src('.')
    .pipe(git.commit('released version ' + version))
    .on('end', function(){
      .pipe(git.push('origin', 'master'))
      .end();
    });

});

Merge is not a stream, it is a function. #3

[stephenlacy]

Closing, I will reopen if needed.

[air]

Hi, thanks for responding. The code above needs a this added to work, so this is successful:

gulp.task('release', ['bump-version'], function() {
  var version = require('./package.json').version;

  return gulp.src('.')
    .pipe(git.commit('released version ' + version))
    .on('end', function(){
      this.pipe(git.push('origin', 'master'))
      .end();
    });
});

It sounds like there is a hard distinction between the stream tasks - like commit and checkout which are 'normal' gulp plugins and don't generate surprises - and the function ones, which need special treatment.

If the hard split is by design then the docs need to be much clearer about how you mix and match the task types.

[air]

No luck getting the merge workflow functional (checkout, merge, push, checkout). Can you confirm the below is how you envision real-world use?

gulp.task('checkoutPages', function() {
  return gulp.src('.').pipe(git.checkout('gh-pages'));
});

gulp.task('mergeMaster', function() {
  git.merge('master');
});

gulp.task('pushPages', function() {
  var version = require('./package.json').version;
  return gulp.src('.')
    .pipe(git.commit('merged master ' + version + ' to gh-pages'))
    .on('end', function(){
      this.pipe(git.push('origin', 'gh-pages'))
      .end();
    });
});

gulp.task('checkoutMaster', function() {
  return gulp.src('.').pipe(git.checkout('master'));
});

// merge master into gh-pages and push it
gulp.task('publish', ['checkoutPages', 'mergeMaster', 'pushPages', 'checkoutMaster'], function() {
  // no op  
});

n.b. My test project is at https://github.com/air/gulp-test