mhagger / git-when-merged Goto Github PK
View Code? Open in Web Editor NEWDetermine when a particular commit was merged into a git branch
License: GNU General Public License v2.0
Determine when a particular commit was merged into a git branch
License: GNU General Public License v2.0
Hi, I'm trying to run your script, and I get the error below. Any help would be appreciated. Thanks.
$ git when-merged 93be742
File "C:\Program Files (x86)\DST\SCM\Git\bin\git-when-merged", line 163
except re.error, e:
^
SyntaxError: invalid syntax
I installed this using linuxbrew brew install git-when-merged
and then ran
rje@ubuntut$ git log --full-history --name-status db/migrate/20161020143200_add_franchise_group_to_parties.rb
commit 0455ddf225b61849b640065bf7ff5850ea02f8cb
Author: Richard Cooke
Date: Tue Oct 11 16:36:03 2016 +0200
Fixing confirm users logic, email and styles
A db/migrate/20161020143200_add_franchise_group_to_parties.rb
rje@ubuntut$ git when-merged 0455ddf225b61849b640065bf7ff5850ea02f8cb
refs/heads/bugfix_confirmingusers Does not contain commit.
So the file is in my history, but git-when-merged tells me it's not. Why is this please?
It should be git-when-merged
in the examples
not git when-merged
Make it easy to install
I would like to test this out, but also with as little effort as possible.
Would it be possible to publish this on pypi? That way to try it out is just:
$ pip install --user git-when-merged
It would imply adding a setup.py file.
For extra points, adding an entrypoints section, like this:
entry_points={
'console_scripts': [
'git-merged-when=git-merged-when:main',
],
},
...would make it work in windows as well.
def name_commit(sha1, options):
and
name = name_commit(sha1)
It seems like git-when-merged
incorrectly returns Does not contain commit.
if commit is a head of the branch. It's easy to reproduce in any repo:
$ mkdir test-when-merged
$ cd test-when-merged
$ git init .
$ echo "line1" > README
$ git add README
$ git commit -m 'Commit 1'
$ echo "line2" >> README
$ git commit -a -m 'Commit 2'
$ git log
commit 57e74529c0ea3c8c4beaeb62cfb6ddaff1068400 (HEAD -> master)
Author: Rushan Shaymardanov <[email protected]>
Date: Fri Apr 21 14:55:03 2023 +0700
Commit 2
commit 243a2ac0fd4a7486ad4478bdcad68cd84a035198
Author: Rushan Shaymardanov <[email protected]>
Date: Fri Apr 21 14:54:36 2023 +0700
Commit 1
$ git when-merged 57e74529c0ea3c8c4beaeb62cfb6ddaff1068400
refs/heads/master Does not contain commit.
$ git when-merged 243a2ac0fd4a7486ad4478bdcad68cd84a035198
refs/heads/master Commit is directly on this branch.
Expected result: Commit is directly on this branch.
is returned for 57e74529c0ea3c8c4beaeb62cfb6ddaff1068400
Could you please clarify if it is an expected behavior or a bug?
When I use 'git-when-merged' on the "k-9" (https://github.com/k9mail/k-9), I find that something may be wrong.
There is a screenshot from gitk attached, which is a part of the commits graph.
I want to find when the bottom commit is merged into the branch 'master' and I input the command "git-when-merged 15ca92414b1dfb5e365528ce9e9308296aab5085 master". However, the returned result shows that the commit is directly on this branch. Is there something wrong?
A declarative, efficient, and flexible JavaScript library for building user interfaces.
๐ Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. ๐๐๐
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google โค๏ธ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.