diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2012-02-28 12:23:26 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-02-28 12:23:26 +0800 |
| commit | 508d1244dc8d38188c70e98207efa8a97d16b47c (patch) | |
| tree | fc8688b80be453755f8135df11bf1db2d247725a /builtin/merge.c | |
| parent | 0ad9e96d2e2f42f4d2ce7cd612bf741913242bc0 (diff) | |
| parent | 25a7850a106ed0f27b88b8ce0b89fd326120dff4 (diff) | |
| download | git-508d1244dc8d38188c70e98207efa8a97d16b47c.tar.gz | |
Merge branch 'master' into git-po
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 7e6db3bb35..d3e1e8dc9e 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1129,7 +1129,7 @@ static int default_edit_option(void) /* Use editor if stdin and stdout are the same and is a tty */ return (!fstat(0, &st_stdin) && !fstat(1, &st_stdout) && - isatty(0) && + isatty(0) && isatty(1) && st_stdin.st_dev == st_stdout.st_dev && st_stdin.st_ino == st_stdout.st_ino && st_stdin.st_mode == st_stdout.st_mode); @@ -1324,7 +1324,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix) merge_remote_util(commit) && merge_remote_util(commit)->obj && merge_remote_util(commit)->obj->type == OBJ_TAG) { - option_edit = 1; + if (option_edit < 0) + option_edit = 1; allow_fast_forward = 0; } } |