Bug 7439 - Mailmap for git shortlog
Summary: Mailmap for git shortlog
Status: CLOSED FIXED
Alias: None
Product: Koha
Classification: Unclassified
Component: Developer documentation (show other bugs)
Version: Main
Hardware: All All
: P5 - low enhancement
Assignee: Chris Nighswonger
QA Contact: Ian Walls
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-01-12 14:31 UTC by Jared Camins-Esakov
Modified: 2013-12-05 20:01 UTC (History)
3 users (show)

See Also:
Change sponsored?: ---
Patch complexity: ---
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:
Circulation function:

Attachments
Bug 7439: Add mailmap for jcamins (1.17 KB, patch)
2012-01-12 14:34 UTC, Jared Camins-Esakov 		Details | Diff | Splinter Review
[PASSED_QA][Rel 3.6.x] Bug 7439: Add mailmap for jcamins (1.20 KB, patch)
2012-01-13 03:52 UTC, Chris Cormack 		Details | Diff | Splinter Review
[UNSIGNED] [3.6.X] Follow up for marcel@libdevelop (924 bytes, patch)
2012-01-13 13:47 UTC, Marcel de Rooy 		Details | Diff | Splinter Review
[UNSIGNED] [MASTER] Add mailmap to master (3.41 KB, patch)
2012-01-18 13:57 UTC, Marcel de Rooy 		Details | Diff | Splinter Review
Bug 7439: Mailmap for master (3.48 KB, patch)
2012-01-22 15:06 UTC, Jared Camins-Esakov 		Details | Diff | Splinter Review
Show Obsolete (4) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Jared Camins-Esakov 2012-01-12 14:31:35 UTC 
The mailmap for 3.6.x is not complete. This bug is for tracking patches to fill in missing information.
Comment 1 Jared Camins-Esakov 2012-01-12 14:34:36 UTC Comment hidden (obsolete)
Comment 2 Chris Cormack 2012-01-13 03:50:39 UTC 
Simple mailmap change, signed off
Comment 3 Chris Cormack 2012-01-13 03:52:55 UTC Comment hidden (obsolete)
Comment 4 Marcel de Rooy 2012-01-13 11:31:01 UTC 
QA: Updating patch status.
Comment 5 Marcel de Rooy 2012-01-13 11:44:06 UTC 
Why don't we use .mailmap in master?
Suppose that you would like to see the same shortlog output in master too..
Comment 6 Marcel de Rooy 2012-01-13 13:47:32 UTC Comment hidden (obsolete)
Comment 7 Paul Poulain 2012-01-16 14:39:00 UTC 
mmm... am I doing something wrong, the patch does not apply for me, I get:


[PASSED_QA][Rel 3.6.x] Bug 7439: Add mailmap for jcamins
Apply? [yn] y

Applying: Bug 7439: Add mailmap for jcamins
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
error: refusing to lose untracked file at '.mailmap'
CONFLICT (delete/modify): .mailmap deleted in HEAD and modified in Bug 7439: Add mailmap for jcamins. Version Bug 7439: Add mailmap for jcamins of .mailmap left in tree.
Failed to merge in the changes.
Patch failed at 0001 Bug 7439: Add mailmap for jcamins
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".


.mailmap is not tracked by git (but exist... how can this happend ?
Comment 8 Marcel de Rooy 2012-01-16 17:32:37 UTC 
Sure that you are on 3.6.X  ?
Comment 9 Paul Poulain 2012-01-16 17:35:52 UTC 
(In reply to comment #8)
> Sure that you are on 3.6.X  ?

jcamins answered on IRC. No I wasn't, and totally missed the mail from chris_n about this file (dec, 4th) on koha-devel
Comment 10 Marcel de Rooy 2012-01-18 13:57:40 UTC Comment hidden (obsolete)
Comment 11 Marcel de Rooy 2012-01-19 11:41:13 UTC 
Chris N pushed the two patches for 3.6.X now.
For getting this to master, I change the status and version now, obsoleting the old patches..
Comment 12 Jared Camins-Esakov 2012-01-22 15:06:46 UTC 
Created attachment 7276 [details] [review]
Bug 7439: Mailmap for master

Adding mailmap for git shortlog to master. Already present in 3.6.X.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Comment 13 Jared Camins-Esakov 2012-12-03 13:32:03 UTC 
The mailmap is available on the Master branch.