diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-08 20:07:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-08 20:07:57 -0800 |
| commit | ad416ed433fdcf838916a84177fe9e810be19eff (patch) | |
| tree | dcba56533726b1e791b4c9ab8f44c7f8fd4a1b2e /t | |
| parent | caa99829a24bc4decf86278c3478c88f564a795a (diff) | |
| parent | 56d5fe285583b5177ffc65dbe7df636ed5b8cc6b (diff) | |
| download | git-ad416ed433fdcf838916a84177fe9e810be19eff.tar.gz git-ad416ed433fdcf838916a84177fe9e810be19eff.tar.xz | |
Merge branch 'maint' to sync with 1.5.4.4
* maint:
GIT 1.5.4.4
ident.c: reword error message when the user name cannot be determined
Fix dcommit, rebase when rewriteRoot is in use
Really make the LF after reset in fast-import optional
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9300-fast-import.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index cceedbb2b..c4f4465dc 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -869,6 +869,8 @@ zcommits COMMIT reset refs/tags/O3-2nd from :5 +reset refs/tags/O3-3rd +from :5 INPUT_END cat >expect <<INPUT_END |