diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-10-15 22:31:47 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-15 22:31:47 -0400 |
| commit | d55e7c3acf72413563e695a19f7f66efac442064 (patch) | |
| tree | b12d163ceb3e56e36a90c82b9c075a3401cd00d3 /t | |
| parent | 03618b9df84a0e94e36fdb27060e605e85b956e9 (diff) | |
| parent | 8492f00b4f28471af84d3887096257822c4d2bc9 (diff) | |
| download | git-d55e7c3acf72413563e695a19f7f66efac442064.tar.gz git-d55e7c3acf72413563e695a19f7f66efac442064.tar.xz | |
Merge branch 'maint'
* maint:
Whip post 1.5.3.4 maintenance series into shape.
rebase -i: use diff plumbing instead of porcelain
Do not remove distributed configure script
git-archive: document --exec
git-reflog: document --verbose
git-config: handle --file option with relative pathname properly
clear_commit_marks(): avoid deep recursion
git add -i: Remove unused variables
git add -i: Fix parsing of abbreviated hunk headers
git-config: don't silently ignore options after --list
Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
Fix embarrassing "git log --follow" bug
Conflicts:
RelNotes
git-rebase--interactive.sh
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3900-i18n-commit.sh | 2 | ||||
| -rw-r--r-- | t/t4013/diff.log_-SF_master | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh index fcbabe8ec..94b1c24b0 100755 --- a/t/t3900-i18n-commit.sh +++ b/t/t3900-i18n-commit.sh @@ -8,7 +8,7 @@ test_description='commit and log output encodings' . ./test-lib.sh compare_with () { - git show -s $1 | sed -e '1,/^$/d' -e 's/^ //' -e '$d' >current && + git show -s $1 | sed -e '1,/^$/d' -e 's/^ //' >current && git diff current "$2" } diff --git a/t/t4013/diff.log_-SF_master b/t/t4013/diff.log_-SF_master index 6162ed201..c1599f2f5 100644 --- a/t/t4013/diff.log_-SF_master +++ b/t/t4013/diff.log_-SF_master @@ -4,5 +4,4 @@ Author: A U Thor <author@example.com> Date: Mon Jun 26 00:02:00 2006 +0000 Third - $ |