@docupace/pipeline 1.0.81-alpha.7 → 1.0.81-alpha.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/merge/cli-merge.js +19 -0
package/package.json
CHANGED
package/src/merge/cli-merge.js
CHANGED
|
@@ -380,6 +380,25 @@ export function setupMerge(program) {
|
|
|
380
380
|
);
|
|
381
381
|
}
|
|
382
382
|
|
|
383
|
+
// Log current git head before validation
|
|
384
|
+
try {
|
|
385
|
+
const gitHead = execSync('git rev-parse HEAD', {
|
|
386
|
+
encoding: 'utf8',
|
|
387
|
+
stdio: 'pipe',
|
|
388
|
+
}).trim();
|
|
389
|
+
console.log(`📍 Current git HEAD: ${gitHead}`);
|
|
390
|
+
|
|
391
|
+
const gitDescribe = execSync('git describe --long', {
|
|
392
|
+
encoding: 'utf8',
|
|
393
|
+
stdio: 'pipe',
|
|
394
|
+
}).trim();
|
|
395
|
+
console.log(`🏷️ Git describe: ${gitDescribe}`);
|
|
396
|
+
} catch (error) {
|
|
397
|
+
console.log(
|
|
398
|
+
`📍 Current git HEAD: ${execSync('git rev-parse HEAD', { encoding: 'utf8', stdio: 'pipe' }).trim()}`,
|
|
399
|
+
);
|
|
400
|
+
}
|
|
401
|
+
|
|
383
402
|
// Check for uncommitted changesets in source branch
|
|
384
403
|
if (!mergeFail && !mergeSuccess) {
|
|
385
404
|
checkForUncommittedChangesets(sourceBranch, verbose);
|