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

Merge branch 'ef/maint-rebase-error-message' into maint

Browse Source 
When "git rebase" was given a bad commit to replay the history on,
its error message did not correctly give the command line argument
it had trouble parsing.

By Erik Faye-Lund
* ef/maint-rebase-error-message:
  rebase: report invalid commit correctly
This commit is contained in:
Junio C Hamano 2012-06-03 15:52:18 -07:00
commit 06de561830
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase.sh
View File

@ -418,7 +418,7 @@ case "$onto_name" in
;; ;;
*) *)
onto=$(git rev-parse --verify "${onto_name}^0") || onto=$(git rev-parse --verify "${onto_name}^0") ||
die "Does not point to a valid commit: $1" die "Does not point to a valid commit: $onto_name"
;; ;;
esac esac

5
t/t3406-rebase-message.sh
View File

@ -62,4 +62,9 @@ test_expect_success 'rebase -n overrides config rebase.stat config' '
! grep "^ fileX | *1 +$" diffstat.txt ! grep "^ fileX | *1 +$" diffstat.txt
' '
test_expect_success 'rebase --onto outputs the invalid ref' '
test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
grep "invalid-ref" err
'
test_done test_done