GNU Astronomy Utilities - Bugs: bug #49932, alphabetical and numerical order...
You are not allowed to post comments on this tracker with your current authentication level.
bug #49932: alphabetical and numerical order do not always match
Submitter: | Boud Roukema <boud> | ||
Submitted: | Mon 26 Dec 2016 02:31:56 AM UTC | ||
Category: | Installation | Severity: | 2 - Minor |
Item Group: | Configuration file | Status: | Fixed |
Privacy: | Public | Assigned to: | boud |
Open/Closed: | Closed |
Mon 26 Dec 2016 02:50:25 PM UTC, comment #5: |
Mohammad Akhlaghi <makhlaghi>![]() |
Mon 26 Dec 2016 02:40:35 PM UTC, comment #4: Thank you very much, the commit has been merged with master and pushed to the main repo.
Thanks also for the TODO in the commit message, it is an interesting idea and worth thinking and discussing about. A better and more transparent/managable place to keep such "tasks" is in the Savannah task tracker. Could you kindly define this TODO as a task in that list? |
Mohammad Akhlaghi <makhlaghi>![]() |
Mon 26 Dec 2016 03:42:28 AM UTC, comment #3: I fully agree that I messed up - I was trying to delete the
The .mailmap file sounds like a nice solution for my TODO :),
I took the brutal approach and now hopefully have a clean branch
https://bitbucket.org/broukema/gnuastro/commits/61b120a6b9de907a26b4cd292707194aec14798a
There's still another possible TODO in the commit comment.
|
Boud Roukema <boud>![]() ![]() |
Mon 26 Dec 2016 03:12:07 AM UTC, comment #2: Thank you very much Boud, it was an interesting observation and correction.
I wanted to merge it into the main master branch, but there was a complication in the history. It now looks like this on my system:
Apparently, you hadn't synced/pulled from the main repo before this commit and pushing it (and your master branch) to your fork. Because I corrected the message in the typo commit (originally f1e4e12), its hash (and thus the whole commit object) was changed to 4a0f674 (ofcourse, the author and date information haven't changed). The new/corrected commit was pushed to the main repo, not the original one.
But since you didn't pull from the main repository before the commit, you merged the original (f1e4e12) typos branch with your master locally on your system. This has caused this strange history on my system.
The solution to this is that you should never merge your branches with the master branch yourself. In this workflow, only the main maintainer should merge with the master branch. After you make the announcement that there is a branch ready to merge, I will do the merging and push the merged result to the main repo. Then I will reply/comment on the bug/task, confirming that the branch has been merged with master.
You can then pull from the main repo and see that the job of merging has been done and you can simply delete the old branch name. A working example with explanations is given in the Forking tutorial section of the book.
I also had a comment about the `TODO' in the comments above the Git command: Fortunately Git does have a mechanism for this (developers with multiple email addresses) and it is implemented in Gnuastro's .mailmap file (which is in the top Gnuastro source directory). The issue currently only occurs for me: my first commits in Gnuastro were before it was accepted as a GNU project, so I used a different email.
I also had another comment: Savannah converts any text in the format of `task #XXXXXX', or `bug #XXXXXX' to a link to the respective bug/task. But in the previous comment, since you hadn't included the `bug', it hasn't been converted to a link.
Sorry for this long comment, as soon as you correct the issue above about the mixed history (and remove the `.mailmap' issue in the TODO), I will merge it into master. Maybe the easiest way would be to just clone the full repository again and make the correction and commit it (You can just copy the `.git/config' file from the old clone to the new one to have all your remotes set as before).
Bu the way, I personally agree with your first choice of defining a new bug report for this issue. The correction is small, but it is specific. |
Mohammad Akhlaghi <makhlaghi>![]() |
Mon 26 Dec 2016 02:37:42 AM UTC, comment #1: Sorry, I should have put that under #47866 - I'm putting in
|
Boud Roukema <boud>![]() ![]() |
Mon 26 Dec 2016 02:31:56 AM UTC, original submission:
In the AUTHORS file, the alphabetical author ordering happened
https://bitbucket.org/broukema/gnuastro/commits/5d35f4a6e1d090c0c0979f63484cde159303e265?at=master
A non-git hack would be | sort -nr -k1,1 .
Cheers
|
Boud Roukema <boud>![]() ![]() |
No files currently attached
Depends on the following items: None found
Items that depend on this one: None found
There are 0 votes so far. Votes easily highlight which items people would like to see resolved in priority, independently of the priority of the item set by tracker managers.
Follow 7 latest changes.
Date | Changed by | Updated Field | Previous Value | => | Replaced by |
---|---|---|---|---|---|
2016-12-26 | makhlaghi | Status | In Progress | ![]() |
Fixed |
Open/Closed | Open | ![]() |
Closed | ||
2016-12-26 | boud | Dependencies | Removed dependency to bugs #47866 | ![]() |
- |
2016-12-26 | boud | Dependencies | Removed dependency to bugs #47866 | ![]() |
- |
2016-12-26 | makhlaghi | Status | None | ![]() |
In Progress |
Assigned to | None | ![]() |
boud | ||
2016-12-26 | boud | Dependencies | - | ![]() |
Depends on bugs #47866 |
Sorry, I just noticed these after pushing the commit, but it would be great if they could be applied in future commits, the full guidelines are also available in the book: