allow for commit reverts

mastercoms · mastercoms · commit a2d5d7652f74 · 2023-07-15T18:08:03.000Z
diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh
@@ -5,7 +5,9 @@ PS1="$"
 
 function changelog() {
     base=$(git ls-tree HEAD $1  | cut -d' ' -f3 | cut -f1)
-    cd $1 && git log --oneline ${base}..HEAD -- patches/api
+    current=$(cd $1 && git rev-parse HEAD)
+    msg=$(cd $1 && git --no-pager log --oneline ${base}..${current})
+    echo ${msg:-"Reverting from ${base} to ${current}"}
 }
 paper=$(changelog work/Paper)
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@ PS1="$"`
`5`	`5`
`6`	`6`	`function changelog() {`
`7`	`7`	`base=$(git ls-tree HEAD $1 \| cut -d' ' -f3 \| cut -f1)`
`8`		`- cd $1 && git log --oneline ${base}..HEAD -- patches/api`
	`8`	`+ current=$(cd $1 && git rev-parse HEAD)`
	`9`	`+ msg=$(cd $1 && git --no-pager log --oneline ${base}..${current})`
	`10`	`+ echo ${msg:-"Reverting from ${base} to ${current}"}`
`9`	`11`	`}`
`10`	`12`	`paper=$(changelog work/Paper)`
`11`	`13`