undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/am-quiet'

Browse Source 
* jc/am-quiet:
  git-am: fix typo in the previous one.
  git-am: make the output quieter.
This commit is contained in:
Shawn O. Pearce 2007-10-18 03:45:05 -04:00
commit de61e42b53
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-am.sh
View File

@ -394,9 +394,7 @@ do
stop_here $this stop_here $this
fi fi
echo
printf 'Applying %s\n' "$SUBJECT" printf 'Applying %s\n' "$SUBJECT"
echo
case "$resolved" in case "$resolved" in
'') '')
@ -452,10 +450,8 @@ do
fi fi
tree=$(git write-tree) && tree=$(git write-tree) &&
echo Wrote tree $tree &&
parent=$(git rev-parse --verify HEAD) && parent=$(git rev-parse --verify HEAD) &&
commit=$(git commit-tree $tree -p $parent <"$dotest/final-commit") && commit=$(git commit-tree $tree -p $parent <"$dotest/final-commit") &&
echo Committed: $commit &&
git update-ref -m "$GIT_REFLOG_ACTION: $SUBJECT" HEAD $commit $parent || git update-ref -m "$GIT_REFLOG_ACTION: $SUBJECT" HEAD $commit $parent ||
stop_here $this stop_here $this