Summary: | Mailmap for git shortlog | ||
---|---|---|---|
Product: | Koha | Reporter: | Jared Camins-Esakov <jcamins> |
Component: | Developer documentation | Assignee: | Chris Nighswonger <cnighswonger> |
Status: | CLOSED FIXED | QA Contact: | Ian Walls <koha.sekjal> |
Severity: | enhancement | ||
Priority: | P5 - low | CC: | chris, m.de.rooy, paul.poulain |
Version: | Main | ||
Hardware: | All | ||
OS: | All | ||
GIT URL: | 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
[PASSED_QA][Rel 3.6.x] Bug 7439: Add mailmap for jcamins [UNSIGNED] [3.6.X] Follow up for marcel@libdevelop [UNSIGNED] [MASTER] Add mailmap to master Bug 7439: Mailmap for master |
Description
Jared Camins-Esakov
2012-01-12 14:31:35 UTC
Created attachment 7113 [details] [review] Bug 7439: Add mailmap for jcamins Simple mailmap change, signed off Created attachment 7118 [details] [review] [PASSED_QA][Rel 3.6.x] Bug 7439: Add mailmap for jcamins Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> QA: Updating patch status. Why don't we use .mailmap in master? Suppose that you would like to see the same shortlog output in master too.. Created attachment 7136 [details] [review] [UNSIGNED] [3.6.X] Follow up for marcel@libdevelop 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 ? Sure that you are on 3.6.X ? (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 Created attachment 7217 [details] [review] [UNSIGNED] [MASTER] Add mailmap to master Adding .mailmap to master. File from 3.6.X after applying the latest two 3.6.X patches. 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.. 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> The mailmap is available on the Master branch. |