Skip to content

Commit

Permalink
Fix always-empty value for $DOT_GIT_DIR variable.
Browse files Browse the repository at this point in the history 
This fixes #53.
  • Loading branch information
@nvie
nvie committed Apr 17, 2011
1 parent e024fa4 commit a7a89cd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion gitflow-common
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ gitflow_is_initialized() {

# loading settings that can be overridden using git config
gitflow_load_settings() {
export DOT_GIT_DIR=$(git rev-parse --git-dir >/dev/null 2>&1)
export DOT_GIT_DIR=$(git rev-parse --git-dir 2>/dev/null)
export MASTER_BRANCH=$(git config --get gitflow.branch.master)
export DEVELOP_BRANCH=$(git config --get gitflow.branch.develop)
export ORIGIN=$(git config --get gitflow.origin || echo origin)
Expand Down

5 comments on commit a7a89cd

@plang
Copy link

@plang plang commented on a7a89cd Jul 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, this patch solves the problem I have under OSX, and which I reported here: https://trac.macports.org/ticket/44401

Shouldn't it be merged into the master branch maybe?

@B-Prod
Copy link

@B-Prod B-Prod commented on a7a89cd Aug 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using homebrew, this bug is still there...

@linw1995
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using homebrew, this bug is still there...

@zgypa
Copy link

@zgypa zgypa commented on a7a89cd Jan 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@B-Prod @linw1995, I don't think what is occuring now is specific to this commit. i'm getting the mkdir: /.gitflow: Read-only file system only when i have a merge which was resolve using previous resolutions. Otherwise works fine.

@abonny
Copy link

@abonny abonny commented on a7a89cd Jul 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using very recent software (git version 2.32.0) here's my complete error:

$ git flow feature finish 12887-get-app-working
Switched to branch 'develop'
fatal: refusing to merge unrelated histories
mkdir: /.gitflow: Read-only file system
/usr/local/Cellar/git-flow/0.4.1/libexec/bin/git-flow-feature: line 320: /.gitflow/MERGE_BASE: No such file or directory

There were merge conflicts. To resolve the merge conflict manually, use:
    git mergetool
    git commit

You can then complete the finish by running it again:
    git flow feature finish 12887-get-app-working
$

Please sign in to comment.